diff options
author | Gabe Black <gabeblack@google.com> | 2018-10-12 05:06:26 -0700 |
---|---|---|
committer | Gabe Black <gabeblack@google.com> | 2018-10-17 20:17:44 +0000 |
commit | 2bcb2b031d4419e87337b25936a09228955dc715 (patch) | |
tree | 1da2953b4764a66bca23dfcf1656f4af205206d5 /src/dev/storage | |
parent | 2701fcb2ffe76e2cb087807e87a9114d0009b7db (diff) | |
download | gem5-2bcb2b031d4419e87337b25936a09228955dc715.tar.xz |
dev: Explicitly specify the endianness for packet accessors.
Generally speaking, the endianness of the data devices provide or
accept is dependent on the device and not the ISA the system
executes. This change makes the devices in dev pick an endianness
rather than using the guest's.
For the ISA bus and the UART, accesses are byte sized and so endianness
doesn't matter. The ISA and PCI busses and the devices which use them
are defined to be little endian.
Change-Id: Ib0aa70f192e1d6f3b886d9f3ad41ae03bddb583f
Reviewed-on: https://gem5-review.googlesource.com/c/13462
Reviewed-by: Andreas Sandberg <andreas.sandberg@arm.com>
Maintainer: Andreas Sandberg <andreas.sandberg@arm.com>
Diffstat (limited to 'src/dev/storage')
-rw-r--r-- | src/dev/storage/ide_ctrl.cc | 64 |
1 files changed, 32 insertions, 32 deletions
diff --git a/src/dev/storage/ide_ctrl.cc b/src/dev/storage/ide_ctrl.cc index 12d606bee..91f27bea3 100644 --- a/src/dev/storage/ide_ctrl.cc +++ b/src/dev/storage/ide_ctrl.cc @@ -185,67 +185,67 @@ IdeController::readConfig(PacketPtr pkt) case sizeof(uint8_t): switch (offset) { case DeviceTiming: - pkt->set<uint8_t>(deviceTiming); + pkt->setLE<uint8_t>(deviceTiming); break; case UDMAControl: - pkt->set<uint8_t>(udmaControl); + pkt->setLE<uint8_t>(udmaControl); break; case PrimaryTiming + 1: - pkt->set<uint8_t>(bits(htole(primaryTiming), 15, 8)); + pkt->setLE<uint8_t>(bits(htole(primaryTiming), 15, 8)); break; case SecondaryTiming + 1: - pkt->set<uint8_t>(bits(htole(secondaryTiming), 15, 8)); + pkt->setLE<uint8_t>(bits(htole(secondaryTiming), 15, 8)); break; case IDEConfig: - pkt->set<uint8_t>(bits(htole(ideConfig), 7, 0)); + pkt->setLE<uint8_t>(bits(htole(ideConfig), 7, 0)); break; case IDEConfig + 1: - pkt->set<uint8_t>(bits(htole(ideConfig), 15, 8)); + pkt->setLE<uint8_t>(bits(htole(ideConfig), 15, 8)); break; default: panic("Invalid PCI configuration read for size 1 at offset: %#x!\n", offset); } DPRINTF(IdeCtrl, "PCI read offset: %#x size: 1 data: %#x\n", offset, - (uint32_t)pkt->get<uint8_t>()); + (uint32_t)pkt->getLE<uint8_t>()); break; case sizeof(uint16_t): switch (offset) { case UDMAControl: - pkt->set<uint16_t>(udmaControl); + pkt->setLE<uint16_t>(udmaControl); break; case PrimaryTiming: - pkt->set<uint16_t>(primaryTiming); + pkt->setLE<uint16_t>(primaryTiming); break; case SecondaryTiming: - pkt->set<uint16_t>(secondaryTiming); + pkt->setLE<uint16_t>(secondaryTiming); break; case UDMATiming: - pkt->set<uint16_t>(udmaTiming); + pkt->setLE<uint16_t>(udmaTiming); break; case IDEConfig: - pkt->set<uint16_t>(ideConfig); + pkt->setLE<uint16_t>(ideConfig); break; default: panic("Invalid PCI configuration read for size 2 offset: %#x!\n", offset); } DPRINTF(IdeCtrl, "PCI read offset: %#x size: 2 data: %#x\n", offset, - (uint32_t)pkt->get<uint16_t>()); + (uint32_t)pkt->getLE<uint16_t>()); break; case sizeof(uint32_t): switch (offset) { case PrimaryTiming: - pkt->set<uint32_t>(primaryTiming); + pkt->setLE<uint32_t>(primaryTiming); break; case IDEConfig: - pkt->set<uint32_t>(ideConfig); + pkt->setLE<uint32_t>(ideConfig); break; default: panic("No 32bit reads implemented for this device."); } DPRINTF(IdeCtrl, "PCI read offset: %#x size: 4 data: %#x\n", offset, - (uint32_t)pkt->get<uint32_t>()); + (uint32_t)pkt->getLE<uint32_t>()); break; default: panic("invalid access size(?) for PCI configspace!\n"); @@ -266,40 +266,40 @@ IdeController::writeConfig(PacketPtr pkt) case sizeof(uint8_t): switch (offset) { case DeviceTiming: - deviceTiming = pkt->get<uint8_t>(); + deviceTiming = pkt->getLE<uint8_t>(); break; case UDMAControl: - udmaControl = pkt->get<uint8_t>(); + udmaControl = pkt->getLE<uint8_t>(); break; case IDEConfig: - replaceBits(ideConfig, 7, 0, pkt->get<uint8_t>()); + replaceBits(ideConfig, 7, 0, pkt->getLE<uint8_t>()); break; case IDEConfig + 1: - replaceBits(ideConfig, 15, 8, pkt->get<uint8_t>()); + replaceBits(ideConfig, 15, 8, pkt->getLE<uint8_t>()); break; default: panic("Invalid PCI configuration write " "for size 1 offset: %#x!\n", offset); } DPRINTF(IdeCtrl, "PCI write offset: %#x size: 1 data: %#x\n", - offset, (uint32_t)pkt->get<uint8_t>()); + offset, (uint32_t)pkt->getLE<uint8_t>()); break; case sizeof(uint16_t): switch (offset) { case UDMAControl: - udmaControl = pkt->get<uint16_t>(); + udmaControl = pkt->getLE<uint16_t>(); break; case PrimaryTiming: - primaryTiming = pkt->get<uint16_t>(); + primaryTiming = pkt->getLE<uint16_t>(); break; case SecondaryTiming: - secondaryTiming = pkt->get<uint16_t>(); + secondaryTiming = pkt->getLE<uint16_t>(); break; case UDMATiming: - udmaTiming = pkt->get<uint16_t>(); + udmaTiming = pkt->getLE<uint16_t>(); break; case IDEConfig: - ideConfig = pkt->get<uint16_t>(); + ideConfig = pkt->getLE<uint16_t>(); break; default: panic("Invalid PCI configuration write " @@ -307,15 +307,15 @@ IdeController::writeConfig(PacketPtr pkt) offset); } DPRINTF(IdeCtrl, "PCI write offset: %#x size: 2 data: %#x\n", - offset, (uint32_t)pkt->get<uint16_t>()); + offset, (uint32_t)pkt->getLE<uint16_t>()); break; case sizeof(uint32_t): switch (offset) { case PrimaryTiming: - primaryTiming = pkt->get<uint32_t>(); + primaryTiming = pkt->getLE<uint32_t>(); break; case IDEConfig: - ideConfig = pkt->get<uint32_t>(); + ideConfig = pkt->getLE<uint32_t>(); break; default: panic("Write of unimplemented PCI config. register: %x\n", offset); @@ -537,11 +537,11 @@ IdeController::dispatchAccess(PacketPtr pkt, bool read) #ifndef NDEBUG uint32_t data; if (pkt->getSize() == 1) - data = pkt->get<uint8_t>(); + data = pkt->getLE<uint8_t>(); else if (pkt->getSize() == 2) - data = pkt->get<uint16_t>(); + data = pkt->getLE<uint16_t>(); else - data = pkt->get<uint32_t>(); + data = pkt->getLE<uint32_t>(); DPRINTF(IdeCtrl, "%s from offset: %#x size: %#x data: %#x\n", read ? "Read" : "Write", pkt->getAddr(), pkt->getSize(), data); #endif |