diff options
| author | Andreas Sandberg <andreas@sandberg.pp.se> | 2013-05-14 15:06:50 +0200 |
|---|---|---|
| committer | Andreas Sandberg <andreas@sandberg.pp.se> | 2013-05-14 15:06:50 +0200 |
| commit | 1ae30c68c1f5159a5e1c557ee33a33aa695d7da5 (patch) | |
| tree | da5c230cda5adef21a222fdeb8acbd83f53fb3f1 | |
| parent | e1cbe33c724f46b53ae1d4843883a848d6bb9d20 (diff) | |
| download | gem5-1ae30c68c1f5159a5e1c557ee33a33aa695d7da5.tar.xz | |
arm: Add support for the m5fail pseudo-op
| -rw-r--r-- | src/arch/arm/isa/formats/m5ops.isa | 1 | ||||
| -rw-r--r-- | src/arch/arm/isa/insts/m5ops.isa | 11 | ||||
| -rw-r--r-- | util/m5/m5op_arm.S | 1 |
3 files changed, 13 insertions, 0 deletions
diff --git a/src/arch/arm/isa/formats/m5ops.isa b/src/arch/arm/isa/formats/m5ops.isa index 1eb7d3f65..26210af0b 100644 --- a/src/arch/arm/isa/formats/m5ops.isa +++ b/src/arch/arm/isa/formats/m5ops.isa @@ -53,6 +53,7 @@ def format M5ops() {{ case 0x11: return new Deprecated_ivle(machInst); case 0x20: return new Deprecated_exit (machInst); case 0x21: return new M5exit(machInst); + case 0x22: return new M5fail(machInst); case 0x31: return new Loadsymbol(machInst); case 0x30: return new Initparam(machInst); case 0x40: return new Resetstats(machInst); diff --git a/src/arch/arm/isa/insts/m5ops.isa b/src/arch/arm/isa/insts/m5ops.isa index 272f16b17..06ed34af8 100644 --- a/src/arch/arm/isa/insts/m5ops.isa +++ b/src/arch/arm/isa/insts/m5ops.isa @@ -179,6 +179,17 @@ let {{ decoder_output += BasicConstructor.subst(m5exitIop) exec_output += PredOpExecute.subst(m5exitIop) + m5fail_code = ''' + PseudoInst::m5fail(xc->tcBase(), join32to64(R1, R0), join32to64(R3, R2)); + ''' + m5failIop = InstObjParams("m5fail", "M5fail", "PredOp", + { "code": m5fail_code, + "predicate_test": predicateTest }, + ["No_OpClass", "IsNonSpeculative"]) + header_output += BasicDeclare.subst(m5failIop) + decoder_output += BasicConstructor.subst(m5failIop) + exec_output += PredOpExecute.subst(m5failIop) + loadsymbolCode = ''' PseudoInst::loadsymbol(xc->tcBase()); ''' diff --git a/util/m5/m5op_arm.S b/util/m5/m5op_arm.S index 115c7a017..3a43913f7 100644 --- a/util/m5/m5op_arm.S +++ b/util/m5/m5op_arm.S @@ -90,6 +90,7 @@ SIMPLE_OP(quiesceTime, quiescetime_func, 0) SIMPLE_OP(rpns, rpns_func, 0) SIMPLE_OP(wakeCPU, wakecpu_func, 0) SIMPLE_OP(m5_exit, exit_func, 0) +SIMPLE_OP(m5_fail, fail_func, 0) SIMPLE_OP(m5_initparam, initparam_func, 0) SIMPLE_OP(m5_loadsymbol, loadsymbol_func, 0) SIMPLE_OP(m5_reset_stats, resetstats_func, 0) |