diff options
| -rw-r--r-- | src/arch/arm/isa/formats/mem.isa | 20 | ||||
| -rw-r--r-- | src/arch/arm/isa/formats/util.isa | 6 |
2 files changed, 3 insertions, 23 deletions
diff --git a/src/arch/arm/isa/formats/mem.isa b/src/arch/arm/isa/formats/mem.isa index 0c736f947..df1d067dc 100644 --- a/src/arch/arm/isa/formats/mem.isa +++ b/src/arch/arm/isa/formats/mem.isa @@ -358,20 +358,12 @@ def template StoreMemAccExecute {{ EA = xc->getEA(); if (fault == NoFault) { - %(postacc_code)s; - } - - if (fault == NoFault) { fault = xc->write((uint%(mem_acc_size)d_t&)Mem, EA, memAccessFlags, NULL); if (traceData) { traceData->setData(Mem); } } if (fault == NoFault) { - %(postacc_code)s; - } - - if (fault == NoFault) { %(op_wb)s; } } @@ -406,10 +398,6 @@ def template StoreExecute {{ } if (fault == NoFault) { - %(postacc_code)s; - } - - if (fault == NoFault) { %(op_wb)s; } } @@ -466,10 +454,6 @@ def template StoreCompleteAcc {{ if (arm_predicate(xc->readMiscReg(ArmISA::CPSR), condCode)) { if (fault == NoFault) { - %(postacc_code)s; - } - - if (fault == NoFault) { %(op_wb)s; } } @@ -491,10 +475,6 @@ def template StoreCondCompleteAcc {{ if (arm_predicate(xc->readMiscReg(ArmISA::CPSR), condCode)) { if (fault == NoFault) { - %(postacc_code)s; - } - - if (fault == NoFault) { %(op_wb)s; } } diff --git a/src/arch/arm/isa/formats/util.isa b/src/arch/arm/isa/formats/util.isa index ee6339c02..354f936d7 100644 --- a/src/arch/arm/isa/formats/util.isa +++ b/src/arch/arm/isa/formats/util.isa @@ -39,7 +39,7 @@ def ArmGenericCodeSubs(code): return new_code def LoadStoreBase(name, Name, ea_code, memacc_code, mem_flags, inst_flags, - postacc_code = '', base_class = 'Memory', + base_class = 'Memory', decode_template = BasicDecode, exec_template_base = ''): # Make sure flags are in lists (convert to lists if not). mem_flags = makeList(mem_flags) @@ -58,13 +58,13 @@ def LoadStoreBase(name, Name, ea_code, memacc_code, mem_flags, inst_flags, # they differ only in the set of code objects contained (which in # turn affects the object's overall operand list). iop = InstObjParams(name, Name, base_class, - { 'ea_code':ea_code, 'memacc_code':memacc_code, 'postacc_code':postacc_code }, + { 'ea_code':ea_code, 'memacc_code':memacc_code}, inst_flags) ea_iop = InstObjParams(name, Name, base_class, { 'ea_code':ea_code }, inst_flags) memacc_iop = InstObjParams(name, Name, base_class, - { 'memacc_code':memacc_code, 'postacc_code':postacc_code }, + { 'memacc_code':memacc_code}, inst_flags) if mem_flags: |