97,103c97,103
< SIMPLE_OP(arm, ARM(16))
< SIMPLE_OP(quiesce, QUIESCE)
< SIMPLE_OP(quiesceNs, QUIESCENS(16))
< SIMPLE_OP(quiesceCycle, QUIESCECYC(16))
< SIMPLE_OP(quiesceTime, QUIESCETIME)
< SIMPLE_OP(rpns, RPNS)
< SIMPLE_OP(wakeCPU, WAKE_CPU(16))
---
> SIMPLE_OP(m5_arm, ARM(16))
> SIMPLE_OP(m5_quiesce, QUIESCE)
> SIMPLE_OP(m5_quiesce_ns, QUIESCENS(16))
> SIMPLE_OP(m5_quiesce_cycle, QUIESCECYC(16))
> SIMPLE_OP(m5_quiesce_time, QUIESCETIME)
> SIMPLE_OP(m5_rpns, RPNS)
> SIMPLE_OP(m5_wake_cpu, WAKE_CPU(16))
105,106c105,106
< SIMPLE_OP(m5_initparam, INITPARAM(0))
< SIMPLE_OP(m5_loadsymbol, LOADSYMBOL(0))
---
> SIMPLE_OP(m5_init_param, INITPARAM(0))
> SIMPLE_OP(m5_load_symbol, LOADSYMBOL(0))
109c109
< SIMPLE_OP(m5_dumpreset_stats, DUMPRST_STATS(16, 17))
---
> SIMPLE_OP(m5_dump_reset_stats, DUMPRST_STATS(16, 17))
111,114c111,114
< SIMPLE_OP(m5_readfile, READFILE)
< SIMPLE_OP(m5_debugbreak, DEBUGBREAK)
< SIMPLE_OP(m5_switchcpu, SWITCHCPU)
< SIMPLE_OP(m5_addsymbol, ADDSYMBOL(16, 17))
---
> SIMPLE_OP(m5_read_file, READFILE)
> SIMPLE_OP(m5_debug_break, DEBUGBREAK)
> SIMPLE_OP(m5_switch_cpu, SWITCHCPU)
> SIMPLE_OP(m5_add_symbol, ADDSYMBOL(16, 17))