summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configs/test/test.py2
-rw-r--r--src/arch/mips/isa/formats/trap.isa8
2 files changed, 4 insertions, 6 deletions
diff --git a/configs/test/test.py b/configs/test/test.py
index 2ece9e675..9ab5f6e00 100644
--- a/configs/test/test.py
+++ b/configs/test/test.py
@@ -50,5 +50,5 @@ m5.instantiate(root)
# simulate until program terminates
exit_event = m5.simulate()
-print 'Exiting @', m5.curTick(), 'because', exit_event.getCause()
+print 'Exiting @ cycle', m5.curTick(), 'because', exit_event.getCause()
diff --git a/src/arch/mips/isa/formats/trap.isa b/src/arch/mips/isa/formats/trap.isa
index 6692e8ef8..8a9c5822a 100644
--- a/src/arch/mips/isa/formats/trap.isa
+++ b/src/arch/mips/isa/formats/trap.isa
@@ -70,11 +70,9 @@ def template TrapExecute {{
}};
def format Trap(code, *flags) {{
- warn_code = 'warn(\"'
- warn_code += 'Trap Exception Handler Is Currently Not Implemented.'
- warn_code += '\");'
- code = warn_code + "bool " + code
-
+ code = 'warn(\"'
+ code += 'Trap Exception Handler Is Currently Not Implemented.'
+ code += '\");'
iop = InstObjParams(name, Name, 'MipsStaticInst', CodeBlock(code), flags)
header_output = BasicDeclare.subst(iop)
decoder_output = BasicConstructor.subst(iop)