diff options
author | Gabe Black <gabeblack@google.com> | 2018-10-12 05:01:06 -0700 |
---|---|---|
committer | Gabe Black <gabeblack@google.com> | 2018-10-12 23:47:36 +0000 |
commit | cc33e2e3494b1aef3649e25456437aa9eb8cf767 (patch) | |
tree | 918be9ec96ccdbb764c282884f5d784fd1a25a6c /src/dev | |
parent | 9125a43f624653e6238dbb8713658cae2c5d43cd (diff) | |
download | gem5-cc33e2e3494b1aef3649e25456437aa9eb8cf767.tar.xz |
sparc: Use big endian packet accessors.
We know data is big endian, so we can use those accessors
explicitly.
Change-Id: I06fe35254433b20db05f5f10d0ca29a44d47c301
Reviewed-on: https://gem5-review.googlesource.com/c/13458
Reviewed-by: Andreas Sandberg <andreas.sandberg@arm.com>
Maintainer: Gabe Black <gabeblack@google.com>
Diffstat (limited to 'src/dev')
-rw-r--r-- | src/dev/sparc/dtod.cc | 2 | ||||
-rw-r--r-- | src/dev/sparc/iob.cc | 30 | ||||
-rw-r--r-- | src/dev/sparc/mm_disk.cc | 24 |
3 files changed, 28 insertions, 28 deletions
diff --git a/src/dev/sparc/dtod.cc b/src/dev/sparc/dtod.cc index b87d2813a..9a709730f 100644 --- a/src/dev/sparc/dtod.cc +++ b/src/dev/sparc/dtod.cc @@ -64,7 +64,7 @@ DumbTOD::read(PacketPtr pkt) assert(pkt->getAddr() >= pioAddr && pkt->getAddr() < pioAddr + pioSize); assert(pkt->getSize() == 8); - pkt->set(todTime); + pkt->setBE(todTime); todTime += 1000; pkt->makeAtomicResponse(); diff --git a/src/dev/sparc/iob.cc b/src/dev/sparc/iob.cc index 28d384212..f14653615 100644 --- a/src/dev/sparc/iob.cc +++ b/src/dev/sparc/iob.cc @@ -96,7 +96,7 @@ Iob::readIob(PacketPtr pkt) if (accessAddr < IntManAddr + IntManSize) { int index = (accessAddr - IntManAddr) >> 3; uint64_t data = intMan[index].cpu << 8 | intMan[index].vector << 0; - pkt->set(data); + pkt->setBE(data); return; } @@ -104,12 +104,12 @@ Iob::readIob(PacketPtr pkt) int index = (accessAddr - IntCtlAddr) >> 3; uint64_t data = intCtl[index].mask ? 1 << 2 : 0 | intCtl[index].pend ? 1 << 0 : 0; - pkt->set(data); + pkt->setBE(data); return; } if (accessAddr == JIntVecAddr) { - pkt->set(jIntVec); + pkt->setBE(jIntVec); return; } @@ -129,23 +129,23 @@ Iob::readJBus(PacketPtr pkt) if (accessAddr >= JIntData0Addr && accessAddr < JIntData1Addr) { index = (accessAddr - JIntData0Addr) >> 3; - pkt->set(jBusData0[index]); + pkt->setBE(jBusData0[index]); return; } if (accessAddr >= JIntData1Addr && accessAddr < JIntDataA0Addr) { index = (accessAddr - JIntData1Addr) >> 3; - pkt->set(jBusData1[index]); + pkt->setBE(jBusData1[index]); return; } if (accessAddr == JIntDataA0Addr) { - pkt->set(jBusData0[cpuid]); + pkt->setBE(jBusData0[cpuid]); return; } if (accessAddr == JIntDataA1Addr) { - pkt->set(jBusData1[cpuid]); + pkt->setBE(jBusData1[cpuid]); return; } @@ -153,13 +153,13 @@ Iob::readJBus(PacketPtr pkt) index = (accessAddr - JIntBusyAddr) >> 3; data = jIntBusy[index].busy ? 1 << 5 : 0 | jIntBusy[index].source; - pkt->set(data); + pkt->setBE(data); return; } if (accessAddr == JIntABusyAddr) { data = jIntBusy[cpuid].busy ? 1 << 5 : 0 | jIntBusy[cpuid].source; - pkt->set(data); + pkt->setBE(data); return; }; @@ -191,7 +191,7 @@ Iob::writeIob(PacketPtr pkt) assert(IntManAddr == 0); if (accessAddr < IntManAddr + IntManSize) { index = (accessAddr - IntManAddr) >> 3; - data = pkt->get<uint64_t>(); + data = pkt->getBE<uint64_t>(); intMan[index].cpu = bits(data,12,8); intMan[index].vector = bits(data,5,0); DPRINTF(Iob, "Wrote IntMan %d cpu %d, vec %d\n", index, @@ -201,7 +201,7 @@ Iob::writeIob(PacketPtr pkt) if (accessAddr >= IntCtlAddr && accessAddr < IntCtlAddr + IntCtlSize) { index = (accessAddr - IntCtlAddr) >> 3; - data = pkt->get<uint64_t>(); + data = pkt->getBE<uint64_t>(); intCtl[index].mask = bits(data,2,2); if (bits(data,1,1)) intCtl[index].pend = false; @@ -211,7 +211,7 @@ Iob::writeIob(PacketPtr pkt) } if (accessAddr == JIntVecAddr) { - jIntVec = bits(pkt->get<uint64_t>(), 5,0); + jIntVec = bits(pkt->getBE<uint64_t>(), 5,0); DPRINTF(Iob, "Wrote jIntVec %d\n", jIntVec); return; } @@ -221,7 +221,7 @@ Iob::writeIob(PacketPtr pkt) int cpu_id; int vector; index = (accessAddr - IntManAddr) >> 3; - data = pkt->get<uint64_t>(); + data = pkt->getBE<uint64_t>(); type = (Type)bits(data,17,16); cpu_id = bits(data, 12,8); vector = bits(data,5,0); @@ -242,14 +242,14 @@ Iob::writeJBus(PacketPtr pkt) if (accessAddr >= JIntBusyAddr && accessAddr < JIntBusyAddr + JIntBusySize) { index = (accessAddr - JIntBusyAddr) >> 3; - data = pkt->get<uint64_t>(); + data = pkt->getBE<uint64_t>(); jIntBusy[index].busy = bits(data,5,5); DPRINTF(Iob, "Wrote jIntBusy index %d busy: %d\n", index, jIntBusy[index].busy); return; } if (accessAddr == JIntABusyAddr) { - data = pkt->get<uint64_t>(); + data = pkt->getBE<uint64_t>(); jIntBusy[cpuid].busy = bits(data,5,5); DPRINTF(Iob, "Wrote jIntBusy index %d busy: %d\n", cpuid, jIntBusy[cpuid].busy); diff --git a/src/dev/sparc/mm_disk.cc b/src/dev/sparc/mm_disk.cc index b3223e859..12773ae2a 100644 --- a/src/dev/sparc/mm_disk.cc +++ b/src/dev/sparc/mm_disk.cc @@ -83,23 +83,23 @@ MmDisk::read(PacketPtr pkt) } switch (pkt->getSize()) { case sizeof(uint8_t): - pkt->set(diskData[accessAddr % SectorSize]); - DPRINTF(IdeDisk, "reading byte %#x value= %#x\n", accessAddr, diskData[accessAddr % - SectorSize]); + pkt->setRaw(diskData[accessAddr % SectorSize]); + DPRINTF(IdeDisk, "reading byte %#x value= %#x\n", + accessAddr, diskData[accessAddr % SectorSize]); break; case sizeof(uint16_t): memcpy(&d16, diskData + (accessAddr % SectorSize), 2); - pkt->set(htobe(d16)); + pkt->setRaw(d16); DPRINTF(IdeDisk, "reading word %#x value= %#x\n", accessAddr, d16); break; case sizeof(uint32_t): memcpy(&d32, diskData + (accessAddr % SectorSize), 4); - pkt->set(htobe(d32)); + pkt->setRaw(d32); DPRINTF(IdeDisk, "reading dword %#x value= %#x\n", accessAddr, d32); break; case sizeof(uint64_t): memcpy(&d64, diskData + (accessAddr % SectorSize), 8); - pkt->set(htobe(d64)); + pkt->setRaw(d64); DPRINTF(IdeDisk, "reading qword %#x value= %#x\n", accessAddr, d64); break; default: @@ -143,22 +143,22 @@ MmDisk::write(PacketPtr pkt) switch (pkt->getSize()) { case sizeof(uint8_t): - diskData[accessAddr % SectorSize] = htobe(pkt->get<uint8_t>()); - DPRINTF(IdeDisk, "writing byte %#x value= %#x\n", accessAddr, diskData[accessAddr % - SectorSize]); + diskData[accessAddr % SectorSize] = htobe(pkt->getRaw<uint8_t>()); + DPRINTF(IdeDisk, "writing byte %#x value= %#x\n", + accessAddr, diskData[accessAddr % SectorSize]); break; case sizeof(uint16_t): - d16 = htobe(pkt->get<uint16_t>()); + d16 = pkt->getRaw<uint16_t>(); memcpy(diskData + (accessAddr % SectorSize), &d16, 2); DPRINTF(IdeDisk, "writing word %#x value= %#x\n", accessAddr, d16); break; case sizeof(uint32_t): - d32 = htobe(pkt->get<uint32_t>()); + d32 = pkt->getRaw<uint32_t>(); memcpy(diskData + (accessAddr % SectorSize), &d32, 4); DPRINTF(IdeDisk, "writing dword %#x value= %#x\n", accessAddr, d32); break; case sizeof(uint64_t): - d64 = htobe(pkt->get<uint64_t>()); + d64 = pkt->getRaw<uint64_t>(); memcpy(diskData + (accessAddr % SectorSize), &d64, 8); DPRINTF(IdeDisk, "writing qword %#x value= %#x\n", accessAddr, d64); break; |