From: Gabe Black <gblack@eecs.umich.edu>
Date: Wed, 2 Jun 2010 17:58:03 +0000 (-0500)
Subject: ARM: Make macroops panic if executed directly.
X-Git-Tag: stable_2012_02_02~1324
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=7b62e9ad7180bd6365c096040114a2f1dfc19fa8;p=gem5.git

ARM: Make macroops panic if executed directly.
The macroop should never be executed, only it's microops will.
---

diff --git a/src/arch/arm/isa/insts/macromem.isa b/src/arch/arm/isa/insts/macromem.isa
index b6d6b6b5d..3e466c70d 100644
--- a/src/arch/arm/isa/insts/macromem.isa
+++ b/src/arch/arm/isa/insts/macromem.isa
@@ -127,5 +127,4 @@ let {{
     iop = InstObjParams("ldmstm", "LdmStm", 'PredMacroOp', "", [])
     header_output = MacroMemDeclare.subst(iop)
     decoder_output = MacroMemConstructor.subst(iop)
-    exec_output = MacroMemExecute.subst(iop)
 }};
diff --git a/src/arch/arm/isa/templates/macromem.isa b/src/arch/arm/isa/templates/macromem.isa
index c474da0c8..c626bdec8 100644
--- a/src/arch/arm/isa/templates/macromem.isa
+++ b/src/arch/arm/isa/templates/macromem.isa
@@ -116,7 +116,7 @@ class %(class_name)s : public %(base_class)s
         %(class_name)s(ExtMachInst machInst, IntRegIndex rn,
                 bool index, bool up, bool user, bool writeback, bool load,
                 uint32_t reglist);
-        %(BasicExecDeclare)s
+        %(BasicExecPanic)s
 };
 }};
 
@@ -192,21 +192,3 @@ inline %(class_name)s::%(class_name)s(ExtMachInst machInst, IntRegIndex rn,
 }
 
 }};
-
-def template MacroMemExecute {{
-Fault %(class_name)s::execute(%(CPU_exec_context)s *xc, Trace::InstRecord *traceData) const
-{
-    Fault fault = NoFault;
-
-    %(fp_enable_check)s;
-    %(op_decl)s;
-    %(op_rd)s;
-    %(code)s;
-    if (fault == NoFault)
-    {
-        %(op_wb)s;
-    }
-
-    return fault;
-}
-}};