From ebb6972dd3a6b9343c79fd022756523a2992a264 Mon Sep 17 00:00:00 2001 From: Ali Saidi Date: Tue, 6 Feb 2007 15:52:33 -0500 Subject: more fp fixes fix unaligned accesses in mmaped disk device src/arch/sparc/isa/decoder.isa: get (ld|st)fsr ops working right. In reality the fp enable check needs to go higher up in the emitted code src/arch/sparc/isa/formats/basic.isa: move the cexec into the aexec field src/cpu/exetrace.cc: copy the exception state from legion when we get it wrong. We aren't going to get it right without an fp emulation layer src/dev/sparc/mm_disk.cc: src/dev/sparc/mm_disk.hh: fix unaligned accesses in the memory mapped disk device --HG-- extra : convert_revision : aaa33096b08cf0563fe291d984a87493a117e528 --- src/dev/sparc/mm_disk.cc | 103 +++++++++++++++++++++++++++++++++++++++-------- src/dev/sparc/mm_disk.hh | 7 ++-- 2 files changed, 90 insertions(+), 20 deletions(-) (limited to 'src/dev/sparc') diff --git a/src/dev/sparc/mm_disk.cc b/src/dev/sparc/mm_disk.cc index 018415f6c..b8cabd0cf 100644 --- a/src/dev/sparc/mm_disk.cc +++ b/src/dev/sparc/mm_disk.cc @@ -47,7 +47,7 @@ MmDisk::MmDisk(Params *p) : BasicPioDevice(p), image(p->image), curSector((uint64_t)-1), dirty(false) { - std::memset(&bytes, 0, SectorSize); + std::memset(&diskData, 0, SectorSize); pioSize = image->size() * SectorSize; } @@ -57,9 +57,9 @@ MmDisk::read(PacketPtr pkt) Addr accessAddr; off_t sector; off_t bytes_read; - uint16_t *d16; - uint32_t *d32; - uint64_t *d64; + uint16_t d16; + uint32_t d32; + uint64_t d64; assert(pkt->result == Packet::Unknown); assert(pkt->getAddr() >= pioAddr && pkt->getAddr() < pioAddr + pioSize); @@ -68,26 +68,34 @@ MmDisk::read(PacketPtr pkt) sector = accessAddr / SectorSize; if (sector != curSector) { - if (dirty) - bytes_read = image->write(bytes, curSector); - bytes_read = image->read(bytes, sector); + if (dirty) { + bytes_read = image->write(diskData, curSector); + assert(bytes_read == SectorSize); + } + bytes_read = image->read(diskData, sector); + assert(bytes_read == SectorSize); curSector = sector; } switch (pkt->getSize()) { case sizeof(uint8_t): - pkt->set(bytes[accessAddr % SectorSize]); + pkt->set(diskData[accessAddr % SectorSize]); + DPRINTF(IdeDisk, "reading byte %#x value= %#x\n", accessAddr, diskData[accessAddr % + SectorSize]); break; case sizeof(uint16_t): - d16 = (uint16_t*)bytes + (accessAddr % SectorSize)/2; - pkt->set(htobe(*d16)); + memcpy(&d16, diskData + (accessAddr % SectorSize), 2); + pkt->set(htobe(d32)); + DPRINTF(IdeDisk, "reading word %#x value= %#x\n", accessAddr, d16); break; case sizeof(uint32_t): - d32 = (uint32_t*)bytes + (accessAddr % SectorSize)/4; - pkt->set(htobe(*d32)); + memcpy(&d32, diskData + (accessAddr % SectorSize), 4); + pkt->set(htobe(d32)); + DPRINTF(IdeDisk, "reading dword %#x value= %#x\n", accessAddr, d32); break; case sizeof(uint64_t): - d64 = (uint64_t*)bytes + (accessAddr % SectorSize)/8; - pkt->set(htobe(*d64)); + memcpy(&d64, diskData + (accessAddr % SectorSize), 8); + pkt->set(htobe(d64)); + DPRINTF(IdeDisk, "reading qword %#x value= %#x\n", accessAddr, d64); break; default: panic("Invalid access size\n"); @@ -100,11 +108,74 @@ MmDisk::read(PacketPtr pkt) Tick MmDisk::write(PacketPtr pkt) { - panic("need to implement\n"); - M5_DUMMY_RETURN + Addr accessAddr; + off_t sector; + off_t bytes_read; + uint16_t d16; + uint32_t d32; + uint64_t d64; + + assert(pkt->result == Packet::Unknown); + assert(pkt->getAddr() >= pioAddr && pkt->getAddr() < pioAddr + pioSize); + accessAddr = pkt->getAddr() - pioAddr; + + sector = accessAddr / SectorSize; + + if (sector != curSector) { + if (dirty) { + bytes_read = image->write(diskData, curSector); + assert(bytes_read == SectorSize); + } + bytes_read = image->read(diskData, sector); + assert(bytes_read == SectorSize); + curSector = sector; + } + dirty = true; + + switch (pkt->getSize()) { + case sizeof(uint8_t): + diskData[accessAddr % SectorSize] = htobe(pkt->get()); + DPRINTF(IdeDisk, "writing byte %#x value= %#x\n", accessAddr, diskData[accessAddr % + SectorSize]); + break; + case sizeof(uint16_t): + d16 = htobe(pkt->get()); + 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()); + 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()); + memcpy(diskData + (accessAddr % SectorSize), &d64, 8); + DPRINTF(IdeDisk, "writing qword %#x value= %#x\n", accessAddr, d64); + break; + default: + panic("Invalid access size\n"); + } + + pkt->result = Packet::Success; + return pioDelay; +} + +void +MmDisk::serialize(std::ostream &os) +{ + // just write any dirty changes to the cow layer it will take care of + // serialization + int bytes_read; + if (dirty) { + bytes_read = image->write(diskData, curSector); + assert(bytes_read == SectorSize); + } } + + BEGIN_DECLARE_SIM_OBJECT_PARAMS(MmDisk) Param pio_addr; Param pio_latency; diff --git a/src/dev/sparc/mm_disk.hh b/src/dev/sparc/mm_disk.hh index 0a4626067..30028d2b6 100644 --- a/src/dev/sparc/mm_disk.hh +++ b/src/dev/sparc/mm_disk.hh @@ -46,10 +46,7 @@ class MmDisk : public BasicPioDevice DiskImage *image; off_t curSector; bool dirty; - union { - uint8_t bytes[SectorSize]; - uint32_t words[SectorSize/4]; - }; + uint8_t diskData[SectorSize]; public: struct Params : public BasicPioDevice::Params @@ -64,6 +61,8 @@ class MmDisk : public BasicPioDevice virtual Tick read(PacketPtr pkt); virtual Tick write(PacketPtr pkt); + + virtual void serialize(std::ostream &os); }; #endif //__DEV_SPARC_MM_DISK_HH__ -- cgit v1.2.3