diff options
| author | Andreas Sandberg <andreas.sandberg@arm.com> | 2017-07-27 14:59:31 +0100 |
|---|---|---|
| committer | Andreas Sandberg <andreas.sandberg@arm.com> | 2017-08-01 18:27:06 +0000 |
| commit | 644e8cdf5ee7fcfe14faf6404ca42c18282dfceb (patch) | |
| tree | 3a6bf9cff099992672a6c7952653171bbf1c75b3 /util/m5/m5op_x86.S | |
| parent | db85b8ff32c46796aa91fecb04ea1ae3411c077e (diff) | |
| download | gem5-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_x86.S')
| -rw-r--r-- | util/m5/m5op_x86.S | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/util/m5/m5op_x86.S b/util/m5/m5op_x86.S index f38803a25..c09e51e25 100644 --- a/util/m5/m5op_x86.S +++ b/util/m5/m5op_x86.S @@ -30,7 +30,7 @@ * Ali Saidi */ -#include "m5ops.h" +#include <gem5/asm/generic/m5ops.h> #ifdef M5OP_ADDR /* Use the memory mapped m5op interface */ @@ -61,26 +61,26 @@ name: \ #endif -TWO_BYTE_OP(arm, arm_func) -TWO_BYTE_OP(quiesce, quiesce_func) -TWO_BYTE_OP(quiesceNs, quiescens_func) -TWO_BYTE_OP(quiesceCycle, quiescecycle_func) -TWO_BYTE_OP(quiesceTime, quiescetime_func) -TWO_BYTE_OP(rpns, rpns_func) -TWO_BYTE_OP(m5_exit, exit_func) -TWO_BYTE_OP(m5_fail, fail_func) -TWO_BYTE_OP(m5_initparam, initparam_func) -TWO_BYTE_OP(m5_loadsymbol, loadsymbol_func) -TWO_BYTE_OP(m5_reset_stats, resetstats_func) -TWO_BYTE_OP(m5_dump_stats, dumpstats_func) -TWO_BYTE_OP(m5_dumpreset_stats, dumprststats_func) -TWO_BYTE_OP(m5_checkpoint, ckpt_func) -TWO_BYTE_OP(m5_readfile, readfile_func) -TWO_BYTE_OP(m5_writefile, writefile_func) -TWO_BYTE_OP(m5_debugbreak, debugbreak_func) -TWO_BYTE_OP(m5_switchcpu, switchcpu_func) -TWO_BYTE_OP(m5_addsymbol, addsymbol_func) -TWO_BYTE_OP(m5_panic, panic_func) -TWO_BYTE_OP(m5_work_begin, work_begin_func) -TWO_BYTE_OP(m5_work_end, work_end_func) -TWO_BYTE_OP(m5_togglesync, togglesync_func) +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_exit, M5OP_EXIT) +TWO_BYTE_OP(m5_fail, M5OP_FAIL) +TWO_BYTE_OP(m5_initparam, M5OP_INIT_PARAM) +TWO_BYTE_OP(m5_loadsymbol, M5OP_LOAD_SYMBOL) +TWO_BYTE_OP(m5_reset_stats, M5OP_RESET_STATS) +TWO_BYTE_OP(m5_dump_stats, M5OP_DUMP_STATS) +TWO_BYTE_OP(m5_dumpreset_stats, M5OP_DUMP_RESET_STATS) +TWO_BYTE_OP(m5_checkpoint, M5OP_CHECKPOINT) +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_panic, M5OP_PANIC) +TWO_BYTE_OP(m5_work_begin, M5OP_WORK_BEGIN) +TWO_BYTE_OP(m5_work_end, M5OP_WORK_END) +TWO_BYTE_OP(m5_togglesync, M5OP_DIST_TOGGLE_SYNC) |