util: Remove the subfunc arg from M5OP_FOREACH.

[gem5.git] / util / m5 / m5op_arm.S

diff --git a/util/m5/m5op_arm.S b/util/m5/m5op_arm.S
index 2176ec6ef7aaae6d67cd5b246fd76065551d764d..b4f7fb3ccaa99a43e6631648a5f5b3a9f1ac2e99 100644 (file)
--- a/util/m5/m5op_arm.S
+++ b/util/m5/m5op_arm.S
@@ -46,22 +46,19 @@
 
 .text
 
-.macro m5op_func name, func, subfunc
+.macro m5op_func name, func
         .align 2
         .globl \name
 \name:
 #ifdef __thumb__
         .short 0xEE00 | \func
-        .short 0x0110 | (\subfunc << 12)
+        .short 0x0110
 #else
-        .long 0xEE000110 | (\func << 16) | (\subfunc << 12)
+        .long 0xEE000110 | (\func << 16)
 #endif
         mov pc,lr
 .endm
 
 .text
-#define M5OP(name, func, subfunc) m5op_func name, func, subfunc
+#define M5OP(name, func) m5op_func name, func
         M5OP_FOREACH
-
-#define M5_ANNOTATION(name, ann) m5op_func name, M5OP_ANNOTATE, ann
-        M5OP_FOREACH_ANNOTATION