diff options
| author | Gabe Black <gblack@eecs.umich.edu> | 2006-03-04 03:19:58 -0500 |
|---|---|---|
| committer | Gabe Black <gblack@eecs.umich.edu> | 2006-03-04 03:19:58 -0500 |
| commit | 1e3b221fe38a09d477f306ac837e9f816bcea029 (patch) | |
| tree | c093f375a5a0a177e74c2fe92a60f6c5a087602c /dev/alpha_console.hh | |
| parent | 62d149d9be9627593dc3e89505daa20b349ec116 (diff) | |
| parent | 9ad917858763bb44c8e6e22b7bb370fd50d518df (diff) | |
| download | gem5-1e3b221fe38a09d477f306ac837e9f816bcea029.tar.xz | |
Merge gblack@m5.eecs.umich.edu:/bk/multiarch
into ewok.(none):/home/gblack/m5/multiarch
--HG--
extra : convert_revision : cb6de8d050ac5abb8f61eb5780deeb06e93b1a0c
Diffstat (limited to 'dev/alpha_console.hh')
| -rw-r--r-- | dev/alpha_console.hh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/dev/alpha_console.hh b/dev/alpha_console.hh index 2d1c1e634..86ef021e9 100644 --- a/dev/alpha_console.hh +++ b/dev/alpha_console.hh @@ -41,7 +41,7 @@ class BaseCPU; class SimConsole; -class System; +class AlphaSystem; class SimpleDisk; /** @@ -90,7 +90,7 @@ class AlphaConsole : public PioDevice SimConsole *console; /** a pointer to the system we are running in */ - System *system; + AlphaSystem *system; /** a pointer to the CPU boot cpu */ BaseCPU *cpu; @@ -101,7 +101,7 @@ class AlphaConsole : public PioDevice public: /** Standard Constructor */ AlphaConsole(const std::string &name, SimConsole *cons, SimpleDisk *d, - System *s, BaseCPU *c, Platform *platform, + AlphaSystem *s, BaseCPU *c, Platform *platform, MemoryController *mmu, Addr addr, HierParams *hier, Bus *pio_bus); |