64,69c64,69
< TWO_BYTE_OP(arm, M5OP_ARM)
< TWO_BYTE_OP(quiesce, M5OP_QUIESCE)
< TWO_BYTE_OP(quiesceNs, M5OP_QUIESCE_NS)
< TWO_BYTE_OP(quiesceCycle, M5OP_QUIESCE_CYCLE)
< TWO_BYTE_OP(quiesceTime, M5OP_QUIESCE_TIME)
< TWO_BYTE_OP(rpns, M5OP_RPNS)
---
> TWO_BYTE_OP(m5_arm, M5OP_ARM)
> TWO_BYTE_OP(m5_quiesce, M5OP_QUIESCE)
> TWO_BYTE_OP(m5_quiesce_ns, M5OP_QUIESCE_NS)
> TWO_BYTE_OP(m5_quiesce_cycle, M5OP_QUIESCE_CYCLE)
> TWO_BYTE_OP(m5_quiesce_time, M5OP_QUIESCE_TIME)
> TWO_BYTE_OP(m5_rpns, M5OP_RPNS)
72,73c72,73
< TWO_BYTE_OP(m5_initparam, M5OP_INIT_PARAM)
< TWO_BYTE_OP(m5_loadsymbol, M5OP_LOAD_SYMBOL)
---
> TWO_BYTE_OP(m5_init_param, M5OP_INIT_PARAM)
> TWO_BYTE_OP(m5_load_symbol, M5OP_LOAD_SYMBOL)
76c76
< TWO_BYTE_OP(m5_dumpreset_stats, M5OP_DUMP_RESET_STATS)
---
> TWO_BYTE_OP(m5_dump_reset_stats, M5OP_DUMP_RESET_STATS)
78,82c78,82
< TWO_BYTE_OP(m5_readfile, M5OP_READ_FILE)
< TWO_BYTE_OP(m5_writefile, M5OP_WRITE_FILE)
< TWO_BYTE_OP(m5_debugbreak, M5OP_DEBUG_BREAK)
< TWO_BYTE_OP(m5_switchcpu, M5OP_SWITCH_CPU)
< TWO_BYTE_OP(m5_addsymbol, M5OP_ADD_SYMBOL)
---
> TWO_BYTE_OP(m5_read_file, M5OP_READ_FILE)
> TWO_BYTE_OP(m5_write_file, M5OP_WRITE_FILE)
> TWO_BYTE_OP(m5_debug_break, M5OP_DEBUG_BREAK)
> TWO_BYTE_OP(m5_switch_cpu, M5OP_SWITCH_CPU)
> TWO_BYTE_OP(m5_add_symbol, M5OP_ADD_SYMBOL)
86c86
< TWO_BYTE_OP(m5_togglesync, M5OP_DIST_TOGGLE_SYNC)
---
> TWO_BYTE_OP(m5_dist_toggle_sync, M5OP_DIST_TOGGLE_SYNC)