summaryrefslogtreecommitdiff
path: root/dev/alpha_console.cc
diff options
context:
space:
mode:
authorAli Saidi <saidi@eecs.umich.edu>2006-03-03 14:24:15 -0500
committerAli Saidi <saidi@eecs.umich.edu>2006-03-03 14:24:15 -0500
commit0bf25c595364f7ca9b5e632c84fcf0d35dc3490a (patch)
tree2bb67579d3c562ee23990dcc8d889feece7177e3 /dev/alpha_console.cc
parent51647e7bec8e8607fc5713b4ace2c24ce8a7455a (diff)
downloadgem5-0bf25c595364f7ca9b5e632c84fcf0d35dc3490a.tar.xz
First cut at moving alpha specefic stuff out of /sim/system* into
arch/alpha/system*. SConscript: dev/alpha_console.cc: dev/alpha_console.hh: kern/freebsd/freebsd_system.cc: kern/freebsd/freebsd_system.hh: kern/kernel_stats.cc: kern/linux/linux_system.cc: kern/linux/linux_system.hh: kern/tru64/tru64_system.cc: kern/tru64/tru64_system.hh: sim/pseudo_inst.cc: sim/system.cc: sim/system.hh: First cut at moving alpha specefic stuff out of /sim/system* --HG-- extra : convert_revision : eba58f537fc04e605af4fc216e184b074a44c8a0
Diffstat (limited to 'dev/alpha_console.cc')
-rw-r--r--dev/alpha_console.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/dev/alpha_console.cc b/dev/alpha_console.cc
index 2e8bbd1dd..94f834b4f 100644
--- a/dev/alpha_console.cc
+++ b/dev/alpha_console.cc
@@ -34,6 +34,7 @@
#include <cstdio>
#include <string>
+#include "arch/alpha/system.hh"
#include "base/inifile.hh"
#include "base/str.hh"
#include "base/trace.hh"
@@ -50,13 +51,12 @@
#include "mem/functional/physical.hh"
#include "sim/builder.hh"
#include "sim/sim_object.hh"
-#include "sim/system.hh"
using namespace std;
using namespace AlphaISA;
AlphaConsole::AlphaConsole(const string &name, SimConsole *cons, SimpleDisk *d,
- System *s, BaseCPU *c, Platform *p,
+ AlphaSystem *s, BaseCPU *c, Platform *p,
MemoryController *mmu, Addr a,
HierParams *hier, Bus *pio_bus)
: PioDevice(name, p), disk(d), console(cons), system(s), cpu(c), addr(a)
@@ -323,7 +323,7 @@ BEGIN_DECLARE_SIM_OBJECT_PARAMS(AlphaConsole)
SimObjectParam<SimpleDisk *> disk;
SimObjectParam<MemoryController *> mmu;
Param<Addr> addr;
- SimObjectParam<System *> system;
+ SimObjectParam<AlphaSystem *> system;
SimObjectParam<BaseCPU *> cpu;
SimObjectParam<Platform *> platform;
SimObjectParam<Bus*> pio_bus;