diff options
| author | Steve Reinhardt <stever@eecs.umich.edu> | 2007-02-07 22:33:44 -0500 |
|---|---|---|
| committer | Steve Reinhardt <stever@eecs.umich.edu> | 2007-02-07 22:33:44 -0500 |
| commit | 2ec4a6c07132488abab62f6236406707d4388b2f (patch) | |
| tree | 752c6e2a67894f34fb173d534bc7432e0221b2d0 /src/dev/sparc/mm_disk.hh | |
| parent | 6b37bb67101803f12b6ed2bef714af583d03f814 (diff) | |
| parent | fdaff2b1088446325dcb3c270b350b3314dca99a (diff) | |
| download | gem5-2ec4a6c07132488abab62f6236406707d4388b2f.tar.xz | |
Merge zizzer.eecs.umich.edu:/z/m5/Bitkeeper/newmem
into zizzer.eecs.umich.edu:/z/stever/bk/newmem-head
--HG--
extra : convert_revision : c56b8160b403fde235636ca5b5b4cecd206ffa4c
Diffstat (limited to 'src/dev/sparc/mm_disk.hh')
| -rw-r--r-- | src/dev/sparc/mm_disk.hh | 7 |
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__ |