diff options
| author | Gabe Black <gblack@eecs.umich.edu> | 2006-04-06 15:00:11 -0400 |
|---|---|---|
| committer | Gabe Black <gblack@eecs.umich.edu> | 2006-04-06 15:00:11 -0400 |
| commit | 6a962f8343d0e7f138baa4034633c986eecc9edf (patch) | |
| tree | f16fdcc7455b0e7cd14af660ebdeb029db3c669a /dev/simple_disk.hh | |
| parent | 3124c5b7bb0cdcb3b16b52533c6a3e50a5970152 (diff) | |
| parent | 6240f8c4bcf12e3367905adfba066bb14f79262a (diff) | |
| download | gem5-6a962f8343d0e7f138baa4034633c986eecc9edf.tar.xz | |
Merge m5.eecs.umich.edu:/bk/newmem
into ewok.(none):/home/gblack/m5/newmem
--HG--
extra : convert_revision : bd6352647798275a12d52d55a129cdddd8e25423
Diffstat (limited to 'dev/simple_disk.hh')
| -rw-r--r-- | dev/simple_disk.hh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/dev/simple_disk.hh b/dev/simple_disk.hh index 57f81c5a9..19967f208 100644 --- a/dev/simple_disk.hh +++ b/dev/simple_disk.hh @@ -37,7 +37,7 @@ #include "arch/isa_traits.hh" class DiskImage; -class PhysicalMemory; +class System; /* * Trivial interface to a disk image used by the System Console @@ -48,11 +48,11 @@ class SimpleDisk : public SimObject typedef uint64_t baddr_t; protected: - PhysicalMemory *physmem; + System *system; DiskImage *image; public: - SimpleDisk(const std::string &name, PhysicalMemory *pmem, DiskImage *img); + SimpleDisk(const std::string &name, System *sys, DiskImage *img); ~SimpleDisk(); void read(Addr addr, baddr_t block, int count) const; |