diff options
Diffstat (limited to 'src/arch')
| -rw-r--r-- | src/arch/arm/isa/templates/mem.isa | 12 | ||||
| -rw-r--r-- | src/arch/generic/memhelpers.hh | 4 | ||||
| -rw-r--r-- | src/arch/x86/memhelpers.hh | 4 |
3 files changed, 10 insertions, 10 deletions
diff --git a/src/arch/arm/isa/templates/mem.isa b/src/arch/arm/isa/templates/mem.isa index 422d37326..a00114409 100644 --- a/src/arch/arm/isa/templates/mem.isa +++ b/src/arch/arm/isa/templates/mem.isa @@ -209,7 +209,7 @@ def template NeonLoadExecute {{ if (%(predicate_test)s) { if (fault == NoFault) { - fault = xc->readBytes(EA, dataPtr, %(size)d, memAccessFlags); + fault = xc->readMem(EA, dataPtr, %(size)d, memAccessFlags); %(memacc_code)s; } @@ -280,8 +280,8 @@ def template NeonStoreExecute {{ } if (fault == NoFault) { - fault = xc->writeBytes(dataPtr, %(size)d, EA, - memAccessFlags, NULL); + fault = xc->writeMem(dataPtr, %(size)d, EA, + memAccessFlags, NULL); } if (fault == NoFault) { @@ -413,8 +413,8 @@ def template NeonStoreInitiateAcc {{ } if (fault == NoFault) { - fault = xc->writeBytes(memUnion.bytes, %(size)d, EA, - memAccessFlags, NULL); + fault = xc->writeMem(memUnion.bytes, %(size)d, EA, + memAccessFlags, NULL); } } else { xc->setPredicate(false); @@ -467,7 +467,7 @@ def template NeonLoadInitiateAcc {{ if (%(predicate_test)s) { if (fault == NoFault) { - fault = xc->readBytes(EA, dataPtr, %(size)d, memAccessFlags); + fault = xc->readMem(EA, dataPtr, %(size)d, memAccessFlags); } } else { xc->setPredicate(false); diff --git a/src/arch/generic/memhelpers.hh b/src/arch/generic/memhelpers.hh index f66a1a20c..c753aaf2a 100644 --- a/src/arch/generic/memhelpers.hh +++ b/src/arch/generic/memhelpers.hh @@ -42,7 +42,7 @@ Fault readMemTiming(XC *xc, Trace::InstRecord *traceData, Addr addr, MemT &mem, unsigned flags) { - return xc->readBytes(addr, (uint8_t *)&mem, sizeof(MemT), flags); + return xc->readMem(addr, (uint8_t *)&mem, sizeof(MemT), flags); } /// Extract the data returned from a timing mode read. @@ -81,7 +81,7 @@ writeMemTiming(XC *xc, Trace::InstRecord *traceData, MemT mem, Addr addr, traceData->setData(mem); } mem = TheISA::htog(mem); - return xc->writeBytes((uint8_t *)&mem, sizeof(MemT), addr, flags, res); + return xc->writeMem((uint8_t *)&mem, sizeof(MemT), addr, flags, res); } /// Write to memory in atomic mode. diff --git a/src/arch/x86/memhelpers.hh b/src/arch/x86/memhelpers.hh index 9dd54b937..43612c9be 100644 --- a/src/arch/x86/memhelpers.hh +++ b/src/arch/x86/memhelpers.hh @@ -44,7 +44,7 @@ Fault readMemTiming(XC *xc, Trace::InstRecord *traceData, Addr addr, uint64_t &mem, unsigned dataSize, unsigned flags) { - return xc->readBytes(addr, (uint8_t *)&mem, dataSize, flags); + return xc->readMem(addr, (uint8_t *)&mem, dataSize, flags); } static inline uint64_t @@ -99,7 +99,7 @@ writeMemTiming(XC *xc, Trace::InstRecord *traceData, uint64_t mem, traceData->setData(mem); } mem = TheISA::htog(mem); - return xc->writeBytes((uint8_t *)&mem, dataSize, addr, flags, res); + return xc->writeMem((uint8_t *)&mem, dataSize, addr, flags, res); } template <class XC> |