diff options
| author | Ali Saidi <saidi@eecs.umich.edu> | 2006-04-10 14:14:25 -0400 |
|---|---|---|
| committer | Ali Saidi <saidi@eecs.umich.edu> | 2006-04-10 14:14:25 -0400 |
| commit | e17a15f4c5d9a0b65de5e4b0ddceac81385d5360 (patch) | |
| tree | a559a7023720aeb8f34e5e29875e6eb64f5eabcf /dev/alpha_console.cc | |
| parent | 5e11a1763dc0c30438e424938960f76d39742e0b (diff) | |
| parent | e8b6eb49bcaa768c40c10e354bb66cae0a65a2a1 (diff) | |
| download | gem5-e17a15f4c5d9a0b65de5e4b0ddceac81385d5360.tar.xz | |
Merge zizzer:/bk/newmem
into zeep.eecs.umich.edu:/z/saidi/work/m5.newmem
--HG--
extra : convert_revision : 36da0febc30675e955a10eb8bc45586b6242a8c3
Diffstat (limited to 'dev/alpha_console.cc')
| -rw-r--r-- | dev/alpha_console.cc | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/dev/alpha_console.cc b/dev/alpha_console.cc index 88219fcbc..f68f132c8 100644 --- a/dev/alpha_console.cc +++ b/dev/alpha_console.cc @@ -87,15 +87,6 @@ AlphaConsole::startup() alphaAccess->intrClockFrequency = params()->platform->intrFrequency(); } -void -AlphaConsole::addressRanges(AddrRangeList &range_list) -{ - assert(pioSize != 0); - range_list.clear(); - range_list.push_back(RangeSize(pioAddr, sizeof(struct AlphaAccess))); -} - - Tick AlphaConsole::read(Packet &pkt) { @@ -325,7 +316,7 @@ BEGIN_DECLARE_SIM_OBJECT_PARAMS(AlphaConsole) SimObjectParam<SimConsole *> sim_console; SimObjectParam<SimpleDisk *> disk; - Param<Addr> addr; + Param<Addr> pio_addr; SimObjectParam<AlphaSystem *> system; SimObjectParam<BaseCPU *> cpu; SimObjectParam<Platform *> platform; @@ -337,7 +328,7 @@ BEGIN_INIT_SIM_OBJECT_PARAMS(AlphaConsole) INIT_PARAM(sim_console, "The Simulator Console"), INIT_PARAM(disk, "Simple Disk"), - INIT_PARAM(addr, "Device Address"), + INIT_PARAM(pio_addr, "Device Address"), INIT_PARAM(system, "system object"), INIT_PARAM(cpu, "Processor"), INIT_PARAM(platform, "platform"), @@ -350,7 +341,7 @@ CREATE_SIM_OBJECT(AlphaConsole) AlphaConsole::Params *p = new AlphaConsole::Params; p->name = getInstanceName(); p->platform = platform; - p->pio_addr = addr; + p->pio_addr = pio_addr; p->pio_delay = pio_latency; p->cons = sim_console; p->disk = disk; |