sanchayanmaity/gem5
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ARM: Make macroops panic if executed directly.

Browse source 
The macroop should never be executed, only it's microops will.
This commit is contained in:
Gabe Black 2010-06-02 12:58:03 -05:00
parent 8fadf2691d
commit 7b62e9ad71
2 changed files with 1 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/arch/arm/isa/insts/macromem.isa
View file

@ -127,5 +127,4 @@ let {{
iop = InstObjParams("ldmstm", "LdmStm", 'PredMacroOp', "", []) iop = InstObjParams("ldmstm", "LdmStm", 'PredMacroOp', "", [])
header_output = MacroMemDeclare.subst(iop) header_output = MacroMemDeclare.subst(iop)
decoder_output = MacroMemConstructor.subst(iop) decoder_output = MacroMemConstructor.subst(iop)
exec_output = MacroMemExecute.subst(iop)
}}; }};

20
src/arch/arm/isa/templates/macromem.isa
View file

@ -116,7 +116,7 @@ class %(class_name)s : public %(base_class)s
%(class_name)s(ExtMachInst machInst, IntRegIndex rn, %(class_name)s(ExtMachInst machInst, IntRegIndex rn,
bool index, bool up, bool user, bool writeback, bool load, bool index, bool up, bool user, bool writeback, bool load,
uint32_t reglist); 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;
}
}};