summaryrefslogtreecommitdiff
path: root/dev/alpha_console.cc
diff options
context:
space:
mode:
authorAli Saidi <saidi@eecs.umich.edu>2006-04-06 14:57:51 -0400
committerAli Saidi <saidi@eecs.umich.edu>2006-04-06 14:57:51 -0400
commit6240f8c4bcf12e3367905adfba066bb14f79262a (patch)
treee2e80d694535522023114f20ce97419b2b2ee71e /dev/alpha_console.cc
parentbb80f71f213625e0b33db5cf2256f93caf3d5967 (diff)
downloadgem5-6240f8c4bcf12e3367905adfba066bb14f79262a.tar.xz
fixes for newmem
ALPHA_FS finally compiles again SConscript: Use a couple more FS sources, still don't compile that much arch/alpha/faults.hh: the unimp fault should probably exist in nonfs too. dev/alpha_console.cc: dev/alpha_console.hh: dev/simconsole.cc: dev/simple_disk.cc: dev/simple_disk.hh: dev/uart.cc: dev/uart.hh: dev/uart8250.cc: dev/uart8250.hh: sim/process.cc: sim/system.cc: fixes for newmem dev/io_device.hh: a system pointer is probably useful for every device to have mem/bus.hh: mem/physical.cc: new address ranges function python/m5/objects/SimpleDisk.py: simple disk now has a system pointer rather than physmem directly --HG-- extra : convert_revision : d8c0a5c6510a6210aec5e8adfb0a4a06ec0dcebf
Diffstat (limited to 'dev/alpha_console.cc')
-rw-r--r--dev/alpha_console.cc8
1 files changed, 5 insertions, 3 deletions
diff --git a/dev/alpha_console.cc b/dev/alpha_console.cc
index 91cfc0ec3..8c097fdd0 100644
--- a/dev/alpha_console.cc
+++ b/dev/alpha_console.cc
@@ -53,7 +53,7 @@ using namespace AlphaISA;
AlphaConsole::AlphaConsole(Params *p)
: BasicPioDevice(p), disk(p->disk),
- console(params()->cons), system(params()->sys), cpu(params()->cpu)
+ console(params()->cons), system(params()->alpha_sys), cpu(params()->cpu)
{
pioSize = sizeof(struct AlphaAccess);
@@ -99,7 +99,6 @@ AlphaConsole::addressRanges(AddrRangeList &range_list)
Tick
AlphaConsole::read(Packet &pkt)
{
- pkt.time = curTick + pioDelay;
/** XXX Do we want to push the addr munging to a bus brige or something? So
* the device has it's physical address and then the bridge adds on whatever
@@ -108,6 +107,8 @@ AlphaConsole::read(Packet &pkt)
assert(pkt.result == Unknown);
assert(pkt.addr >= pioAddr && pkt.addr < pioAddr + pioSize);
+
+ pkt.time = curTick + pioDelay;
Addr daddr = pkt.addr - pioAddr;
uint32_t *data32;
@@ -355,7 +356,8 @@ CREATE_SIM_OBJECT(AlphaConsole)
p->pio_delay = pio_latency;
p->cons = sim_console;
p->disk = disk;
- p->sys = system;
+ p->alpha_sys = system;
+ p->system = system;
p->cpu = cpu;
return new AlphaConsole(p);
}