diff options
| author | Ali Saidi <saidi@eecs.umich.edu> | 2007-02-06 18:47:42 -0500 |
|---|---|---|
| committer | Ali Saidi <saidi@eecs.umich.edu> | 2007-02-06 18:47:42 -0500 |
| commit | 8ffd12e807bd05a57bbe8857dbff0ecaf217fe64 (patch) | |
| tree | 6515ebc54b8b0647259f06ed0aa836d5424042c3 /src/dev/sparc/mm_disk.hh | |
| parent | 310d8f0992637d69e270cac727ba0ff968cdb6ea (diff) | |
| parent | c7a1fdacd6f378dcd1245aab289d497f801398f6 (diff) | |
| download | gem5-8ffd12e807bd05a57bbe8857dbff0ecaf217fe64.tar.xz | |
merge my index fix and lisa's fix
--HG--
extra : convert_revision : 5f2c7d46c96fa061bbfb66edf188d405ca600020
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__ |