summaryrefslogtreecommitdiff
path: root/util/m5/m5op_arm_A64.S
diff options
context:
space:
mode:
authorAndreas Sandberg <andreas.sandberg@arm.com>2017-07-27 14:59:31 +0100
committerAndreas Sandberg <andreas.sandberg@arm.com>2017-08-01 18:27:06 +0000
commit644e8cdf5ee7fcfe14faf6404ca42c18282dfceb (patch)
tree3a6bf9cff099992672a6c7952653171bbf1c75b3 /util/m5/m5op_arm_A64.S
parentdb85b8ff32c46796aa91fecb04ea1ae3411c077e (diff)
downloadgem5-644e8cdf5ee7fcfe14faf6404ca42c18282dfceb.tar.xz
util: Move the m5ops.h file to a shared directory
The header file m5ops.h contains a list of constants that should be shared between the simulator and utilities. Move this header file to a new top-level directory for shared files and rename constants to make them suitable for inclusion in the main simulator. The structure of the shared include directory is as follows: include/gem5: Files that can be included from C code. include/gem5/asm: Files that can be included from assembly code. asm/generic/: Files that aren't guest ISA specific asm/${isa}/: Files that are guest ISA specific Change-Id: I1aa511057bcaa80cc2d566109ff26581558c4a41 Signed-off-by: Andreas Sandberg <andreas.sandberg@arm.com> Reviewed-by: Jose Marinho <jose.marinho@arm.com> Reviewed-on: https://gem5-review.googlesource.com/4261 Reviewed-by: Jason Lowe-Power <jason@lowepower.com>
Diffstat (limited to 'util/m5/m5op_arm_A64.S')
-rw-r--r--util/m5/m5op_arm_A64.S8
1 files changed, 4 insertions, 4 deletions
diff --git a/util/m5/m5op_arm_A64.S b/util/m5/m5op_arm_A64.S
index f17c803d0..0076cf8ef 100644
--- a/util/m5/m5op_arm_A64.S
+++ b/util/m5/m5op_arm_A64.S
@@ -43,7 +43,7 @@
* Andreas Sandberg
*/
-#include "m5ops.h"
+#include <gem5/asm/generic/m5ops.h>
#ifdef M5OP_ADDR
.macro m5op_func, name, func, subfunc
@@ -65,7 +65,7 @@
.text
#define M5OP(name, func, subfunc) m5op_func name, func, subfunc
- FOREACH_M5OP
+ M5OP_FOREACH
-#define M5_ANNOTATION(name, ann) m5op_func name, annotate_func, ann
- FOREACH_M5_ANNOTATION
+#define M5_ANNOTATION(name, ann) m5op_func name, M5OP_ANNOTATE, ann
+ M5OP_FOREACH_ANNOTATION