diff options
| author | Gabe Black <gblack@eecs.umich.edu> | 2009-06-21 16:41:07 -0700 |
|---|---|---|
| committer | Gabe Black <gblack@eecs.umich.edu> | 2009-06-21 16:41:07 -0700 |
| commit | 47e71d674a1db7349b6aa21df529267f4fe2a0e7 (patch) | |
| tree | da18d0dad6a174e8a10fa0abac0736920f18bf35 /src/arch/arm/isa/formats/macromem.isa | |
| parent | f1657a890e49c1bcfb025258474b6c44725ee7c9 (diff) | |
| download | gem5-47e71d674a1db7349b6aa21df529267f4fe2a0e7.tar.xz | |
ARM: Don't downconvert ExtMachInsts to MachInsts.
Diffstat (limited to 'src/arch/arm/isa/formats/macromem.isa')
| -rw-r--r-- | src/arch/arm/isa/formats/macromem.isa | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/arch/arm/isa/formats/macromem.isa b/src/arch/arm/isa/formats/macromem.isa index 36a43de5e..cdbb14efd 100644 --- a/src/arch/arm/isa/formats/macromem.isa +++ b/src/arch/arm/isa/formats/macromem.isa @@ -57,7 +57,7 @@ output header {{ writeback, loadop; - ArmMacroMemoryOp(const char *mnem, MachInst _machInst, OpClass __opClass, + ArmMacroMemoryOp(const char *mnem, ExtMachInst _machInst, OpClass __opClass, StaticInstPtr _eaCompPtr = nullStaticInstPtr, StaticInstPtr _memAccPtr = nullStaticInstPtr) : PredMacroOp(mnem, _machInst, __opClass), @@ -86,7 +86,7 @@ output header {{ loadop; int32_t disp8; - ArmMacroFPAOp(const char *mnem, MachInst _machInst, OpClass __opClass) + ArmMacroFPAOp(const char *mnem, ExtMachInst _machInst, OpClass __opClass) : PredMacroOp(mnem, _machInst, __opClass), puswl(PUSWL), prepost(PREPOST), up(UP), psruser(PSRUSER), writeback(WRITEBACK), loadop(LOADOP), @@ -113,7 +113,7 @@ output header {{ count; int32_t disp8; - ArmMacroFMOp(const char *mnem, MachInst _machInst, OpClass __opClass) + ArmMacroFMOp(const char *mnem, ExtMachInst _machInst, OpClass __opClass) : PredMacroOp(mnem, _machInst, __opClass), punwl(PUNWL), prepost(PREPOST), up(UP), n1bit(OPCODE_22), writeback(WRITEBACK), loadop(LOADOP), @@ -143,13 +143,13 @@ def template MacroStoreDeclare {{ { public: // Constructor - %(class_name)s(MachInst machInst); + %(class_name)s(ExtMachInst machInst); %(BasicExecDeclare)s }; }}; def template MacroStoreConstructor {{ - inline %(class_name)s::%(class_name)s(MachInst machInst) + inline %(class_name)s::%(class_name)s(ExtMachInst machInst) : %(base_class)s("%(mnemonic)s", machInst, %(op_class)s) { %(constructor)s; @@ -275,7 +275,7 @@ def template MacroStoreExecute {{ }}; def template MacroFPAConstructor {{ - inline %(class_name)s::%(class_name)s(MachInst machInst) + inline %(class_name)s::%(class_name)s(ExtMachInst machInst) : %(base_class)s("%(mnemonic)s", machInst, %(op_class)s) { %(constructor)s; @@ -317,7 +317,7 @@ def template MacroFPAConstructor {{ def template MacroFMConstructor {{ - inline %(class_name)s::%(class_name)s(MachInst machInst) + inline %(class_name)s::%(class_name)s(ExtMachInst machInst) : %(base_class)s("%(mnemonic)s", machInst, %(op_class)s) { %(constructor)s; |