From 4ee3b0da452139289d7334816b4fc082e3ac4a3b Mon Sep 17 00:00:00 2001 From: Brad Beckmann Date: Sun, 21 Mar 2010 21:22:20 -0700 Subject: [PATCH] TimingSimpleCPU: Fixed uncacacheable request read bug Previously the recording of an uncached read occurred after the request was possibly deleted within the translateTiming function. --- src/cpu/simple/timing.cc | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/src/cpu/simple/timing.cc b/src/cpu/simple/timing.cc index db972d030..221cb0d0d 100644 --- a/src/cpu/simple/timing.cc +++ b/src/cpu/simple/timing.cc @@ -432,6 +432,10 @@ TimingSimpleCPU::read(Addr addr, T &data, unsigned flags) Addr split_addr = roundDown(addr + data_size - 1, block_size); assert(split_addr <= addr || split_addr - addr < block_size); + // This will need a new way to tell if it's hooked up to a cache or not. + if (req->isUncacheable()) + recordEvent("Uncached Write"); + _status = DTBWaitResponse; if (split_addr > addr) { RequestPtr req1, req2; @@ -461,10 +465,6 @@ TimingSimpleCPU::read(Addr addr, T &data, unsigned flags) traceData->setAddr(addr); } - // This will need a new way to tell if it has a dcache attached. - if (req->isUncacheable()) - recordEvent("Uncached Read"); - return NoFault; } @@ -510,7 +510,6 @@ TimingSimpleCPU::read(Addr addr, float &data, unsigned flags) return read(addr, *(uint32_t*)&data, flags); } - template<> Fault TimingSimpleCPU::read(Addr addr, int32_t &data, unsigned flags) @@ -555,6 +554,10 @@ TimingSimpleCPU::write(T data, Addr addr, unsigned flags, uint64_t *res) Addr split_addr = roundDown(addr + data_size - 1, block_size); assert(split_addr <= addr || split_addr - addr < block_size); + // This will need a new way to tell if it's hooked up to a cache or not. + if (req->isUncacheable()) + recordEvent("Uncached Write"); + T *dataP = new T; *dataP = TheISA::htog(data); _status = DTBWaitResponse; @@ -586,10 +589,6 @@ TimingSimpleCPU::write(T data, Addr addr, unsigned flags, uint64_t *res) traceData->setData(data); } - // This will need a new way to tell if it's hooked up to a cache or not. - if (req->isUncacheable()) - recordEvent("Uncached Write"); - // If the write needs to have a fault on the access, consider calling // changeStatus() and changing it to "bad addr write" or something. return NoFault; -- 2.30.2