summaryrefslogtreecommitdiff
path: root/src/dev/sparc/mm_disk.hh
diff options
context:
space:
mode:
authorAli Saidi <saidi@eecs.umich.edu>2007-02-06 15:52:33 -0500
committerAli Saidi <saidi@eecs.umich.edu>2007-02-06 15:52:33 -0500
commitebb6972dd3a6b9343c79fd022756523a2992a264 (patch)
tree07ed6b8d534fb90df53c360ea452d6f7a1be0187 /src/dev/sparc/mm_disk.hh
parentecef27f172523503eb64fc7b2d5e82c2f83b5210 (diff)
downloadgem5-ebb6972dd3a6b9343c79fd022756523a2992a264.tar.xz
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
Diffstat (limited to 'src/dev/sparc/mm_disk.hh')
-rw-r--r--src/dev/sparc/mm_disk.hh7
1 files changed, 3 insertions, 4 deletions
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__