diff options
| author | Nilay Vaish <nilay@cs.wisc.edu> | 2011-07-03 11:38:25 -0500 |
|---|---|---|
| committer | Nilay Vaish <nilay@cs.wisc.edu> | 2011-07-03 11:38:25 -0500 |
| commit | 9b85b4b19a1f39927ce9d4f39e5815ec6c87fbf7 (patch) | |
| tree | 482974f9e6a85b6867ff5f9f3fb1f891f0fdf96d /src/arch/alpha/isa | |
| parent | 5e0851d554d55e4fa22240c803cc4b9ad5e293f5 (diff) | |
| parent | ec89fffb07318e50e90257ebeb17535bf6787952 (diff) | |
| download | gem5-9b85b4b19a1f39927ce9d4f39e5815ec6c87fbf7.tar.xz | |
Merged with Gabe's recent changes.
Diffstat (limited to 'src/arch/alpha/isa')
| -rw-r--r-- | src/arch/alpha/isa/main.isa | 1 | ||||
| -rw-r--r-- | src/arch/alpha/isa/mem.isa | 18 |
2 files changed, 10 insertions, 9 deletions
diff --git a/src/arch/alpha/isa/main.isa b/src/arch/alpha/isa/main.isa index 4b5678e81..c03a99970 100644 --- a/src/arch/alpha/isa/main.isa +++ b/src/arch/alpha/isa/main.isa @@ -73,6 +73,7 @@ output exec {{ #include "arch/alpha/registers.hh" #include "arch/alpha/regredir.hh" +#include "arch/generic/memhelpers.hh" #include "base/cp_annotate.hh" #include "base/fenv.hh" #include "config/ss_compatible_fp.hh" diff --git a/src/arch/alpha/isa/mem.isa b/src/arch/alpha/isa/mem.isa index fe72e049e..ed5128204 100644 --- a/src/arch/alpha/isa/mem.isa +++ b/src/arch/alpha/isa/mem.isa @@ -197,7 +197,7 @@ def template LoadExecute {{ %(ea_code)s; if (fault == NoFault) { - fault = xc->read(EA, (uint%(mem_acc_size)d_t&)Mem, memAccessFlags); + fault = readMemAtomic(xc, traceData, EA, Mem, memAccessFlags); %(memacc_code)s; } @@ -223,7 +223,7 @@ def template LoadInitiateAcc {{ %(ea_code)s; if (fault == NoFault) { - fault = xc->read(EA, (uint%(mem_acc_size)d_t &)Mem, memAccessFlags); + fault = readMemTiming(xc, traceData, EA, Mem, memAccessFlags); } return fault; @@ -241,7 +241,7 @@ def template LoadCompleteAcc {{ %(fp_enable_check)s; %(op_decl)s; - Mem = pkt->get<typeof(Mem)>(); + getMem(pkt, Mem, traceData); if (fault == NoFault) { %(memacc_code)s; @@ -273,8 +273,8 @@ def template StoreExecute {{ } if (fault == NoFault) { - fault = xc->write((uint%(mem_acc_size)d_t&)Mem, EA, - memAccessFlags, NULL); + fault = writeMemAtomic(xc, traceData, Mem, EA, + memAccessFlags, NULL); } if (fault == NoFault) { @@ -307,8 +307,8 @@ def template StoreCondExecute {{ } if (fault == NoFault) { - fault = xc->write((uint%(mem_acc_size)d_t&)Mem, EA, - memAccessFlags, &write_result); + fault = writeMemAtomic(xc, traceData, Mem, EA, + memAccessFlags, &write_result); } if (fault == NoFault) { @@ -340,8 +340,8 @@ def template StoreInitiateAcc {{ } if (fault == NoFault) { - fault = xc->write((uint%(mem_acc_size)d_t&)Mem, EA, - memAccessFlags, NULL); + fault = writeMemTiming(xc, traceData, Mem, EA, + memAccessFlags, NULL); } return fault; |