diff options
| author | Gabe Black <gblack@eecs.umich.edu> | 2011-07-05 16:52:57 -0700 |
|---|---|---|
| committer | Gabe Black <gblack@eecs.umich.edu> | 2011-07-05 16:52:57 -0700 |
| commit | 87b657278d5177a82a5b54918dab30afe37d1dac (patch) | |
| tree | 06364524fcf4542c97e69ea8857826eb920f8b3f | |
| parent | 63a934d152024c093dc02cc94ad6b29607615af4 (diff) | |
| download | gem5-87b657278d5177a82a5b54918dab30afe37d1dac.tar.xz | |
ISAs: Streamline some spots where Mem is used in the ISA descriptions.
| -rw-r--r-- | src/arch/power/isa/formats/mem.isa | 4 | ||||
| -rw-r--r-- | src/arch/sparc/isa/decoder.isa | 16 |
2 files changed, 9 insertions, 11 deletions
diff --git a/src/arch/power/isa/formats/mem.isa b/src/arch/power/isa/formats/mem.isa index ebf0bfa21..0361ee998 100644 --- a/src/arch/power/isa/formats/mem.isa +++ b/src/arch/power/isa/formats/mem.isa @@ -125,15 +125,13 @@ def template LoadCompleteAcc {{ { Addr EA; Fault fault = NoFault; - %(mem_acc_type)s val; %(op_decl)s; %(op_rd)s; EA = xc->getEA(); - getMem(pkt, val, traceData); - *((%(mem_acc_type)s*)&Mem) = val; + getMem(pkt, Mem, traceData); if (fault == NoFault) { %(memacc_code)s; diff --git a/src/arch/sparc/isa/decoder.isa b/src/arch/sparc/isa/decoder.isa index d15d1eb2b..82c712eb0 100644 --- a/src/arch/sparc/isa/decoder.isa +++ b/src/arch/sparc/isa/decoder.isa @@ -1125,10 +1125,10 @@ decode OP default Unknown::unknown() }}); } format Load { - 0x08: ldsw({{Rd = (int32_t)Mem.sw;}}); - 0x09: ldsb({{Rd = (int8_t)Mem.sb;}}); - 0x0A: ldsh({{Rd = (int16_t)Mem.shw;}}); - 0x0B: ldx({{Rd = (int64_t)Mem.sdw;}}); + 0x08: ldsw({{Rd = Mem.sw;}}); + 0x09: ldsb({{Rd = Mem.sb;}}); + 0x0A: ldsh({{Rd = Mem.shw;}}); + 0x0B: ldx({{Rd = Mem.sdw;}}); } 0x0D: Swap::ldstub({{Mem.ub = 0xFF;}}, {{ @@ -1223,10 +1223,10 @@ decode OP default Unknown::unknown() }}); } format LoadAlt { - 0x18: ldswa({{Rd = (int32_t)Mem.sw;}}); - 0x19: ldsba({{Rd = (int8_t)Mem.sb;}}); - 0x1A: ldsha({{Rd = (int16_t)Mem.shw;}}); - 0x1B: ldxa({{Rd = (int64_t)Mem.sdw;}}); + 0x18: ldswa({{Rd = Mem.sw;}}); + 0x19: ldsba({{Rd = Mem.sb;}}); + 0x1A: ldsha({{Rd = Mem.shw;}}); + 0x1B: ldxa({{Rd = Mem.sdw;}}); } 0x1D: SwapAlt::ldstuba({{Mem.ub = 0xFF;}}, {{ |