summaryrefslogtreecommitdiff
path: root/util/m5/m5op_sparc.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_sparc.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_sparc.S')
-rw-r--r--util/m5/m5op_sparc.S10
1 files changed, 5 insertions, 5 deletions
diff --git a/util/m5/m5op_sparc.S b/util/m5/m5op_sparc.S
index 40248ff8b..ba8f6841f 100644
--- a/util/m5/m5op_sparc.S
+++ b/util/m5/m5op_sparc.S
@@ -32,7 +32,7 @@
#define m5_op 0x2
#define m5_op3 0x37
-#include "m5ops.h"
+#include <gem5/asm/generic/m5ops.h>
#define INST(func, rs1, rs2, rd) \
.long (m5_op) << 30 | (rd) << 25 | (m5_op3) << 19 | (func) << 7 | \
@@ -49,10 +49,10 @@ func:
#define END(func) \
.size func, (.-func)
-#define DEBUGBREAK INST(debugbreak_func, 0, 0, 0)
-#define M5EXIT INST(exit_func, 0, 0, 0)
-#define PANIC INST(panic_func, 0, 0, 0)
-#define READFILE INST(readfile_func, 0, 0, 0)
+#define DEBUGBREAK INST(M5OP_DEBUG_BREAK, 0, 0, 0)
+#define M5EXIT INST(M5OP_EXIT, 0, 0, 0)
+#define PANIC INST(M5OP_PANIC, 0, 0, 0)
+#define READFILE INST(M5OP_READ_FILE, 0, 0, 0)
LEAF(m5_exit)
retl