diff options
author | Gabe Black <gblack@eecs.umich.edu> | 2010-06-02 12:58:03 -0500 |
---|---|---|
committer | Gabe Black <gblack@eecs.umich.edu> | 2010-06-02 12:58:03 -0500 |
commit | 7b62e9ad7180bd6365c096040114a2f1dfc19fa8 (patch) | |
tree | c534b5d047529627f9e4793f5ba51d16733a44ca /src/arch/arm/isa/templates | |
parent | 8fadf2691d8e2724c1bd175c2f505786a50bf12e (diff) | |
download | gem5-7b62e9ad7180bd6365c096040114a2f1dfc19fa8.tar.xz |
ARM: Make macroops panic if executed directly.
The macroop should never be executed, only it's microops will.
Diffstat (limited to 'src/arch/arm/isa/templates')
-rw-r--r-- | src/arch/arm/isa/templates/macromem.isa | 20 |
1 files changed, 1 insertions, 19 deletions
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; -} -}}; |