misc: Tidy up M5OP_FOREACH and the constants in m5ops.h.

Make sure all the operations that have constants (and aren't deprecated
or reserved) and present in M5OP_FOREACH in order of their constants.
Also move M5OP_ANNOTATE up so that all the constants are also in order.

Change-Id: I8d9f69b020aeb39311a24606a286a76de10a51cc
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/27234
Reviewed-by: Jason Lowe-Power <power.jg@gmail.com>
Maintainer: Jason Lowe-Power <power.jg@gmail.com>
Tested-by: kokoro <noreply+kokoro@google.com>

diff --git a/include/gem5/asm/generic/m5ops.h b/include/gem5/asm/generic/m5ops.h
index ca85e9caff43718b61d5b069c5abbfd49904cba2..38eaeb175c4ddc1b75bb8663240fc248dc1e2d3f 100644 (file)
--- a/include/gem5/asm/generic/m5ops.h
+++ b/include/gem5/asm/generic/m5ops.h
@@ -66,6 +66,7 @@
 #define M5OP_ADD_SYMBOL         0x53
 #define M5OP_PANIC              0x54
 
+#define M5OP_ANNOTATE           0x55 // deprecated annotate function
 #define M5OP_RESERVED2          0x56 // Reserved for user
 #define M5OP_RESERVED3          0x57 // Reserved for user
 #define M5OP_RESERVED4          0x58 // Reserved for user
@@ -78,8 +79,6 @@
 #define M5OP_SE_PAGE_FAULT      0x61
 #define M5OP_DIST_TOGGLE_SYNC   0x62
 
-// These operations are for critical path annotation
-#define M5OP_ANNOTATE           0x55
 
 #define M5OP_FOREACH                                            \
     M5OP(m5_arm, M5OP_ARM);                                     \
@@ -97,14 +96,16 @@
     M5OP(m5_dump_stats, M5OP_DUMP_STATS);                       \
     M5OP(m5_dump_reset_stats, M5OP_DUMP_RESET_STATS);           \
     M5OP(m5_checkpoint, M5OP_CHECKPOINT);                       \
-    M5OP(m5_read_file, M5OP_READ_FILE);                         \
     M5OP(m5_write_file, M5OP_WRITE_FILE);                       \
+    M5OP(m5_read_file, M5OP_READ_FILE);                         \
     M5OP(m5_debug_break, M5OP_DEBUG_BREAK);                     \
     M5OP(m5_switch_cpu, M5OP_SWITCH_CPU);                       \
     M5OP(m5_add_symbol, M5OP_ADD_SYMBOL);                       \
     M5OP(m5_panic, M5OP_PANIC);                                 \
     M5OP(m5_work_begin, M5OP_WORK_BEGIN);                       \
     M5OP(m5_work_end, M5OP_WORK_END);                           \
+    M5OP(m5_se_syscall, M5OP_SE_SYSCALL);                       \
+    M5OP(m5_se_page_fault, M5OP_SE_PAGE_FAULT);                 \
     M5OP(m5_dist_toggle_sync, M5OP_DIST_TOGGLE_SYNC);
 
 #endif //  __GEM5_ASM_GENERIC_M5OPS_H__