diff options
author | Ali Saidi <saidi@eecs.umich.edu> | 2006-04-06 14:57:51 -0400 |
---|---|---|
committer | Ali Saidi <saidi@eecs.umich.edu> | 2006-04-06 14:57:51 -0400 |
commit | 6240f8c4bcf12e3367905adfba066bb14f79262a (patch) | |
tree | e2e80d694535522023114f20ce97419b2b2ee71e /mem | |
parent | bb80f71f213625e0b33db5cf2256f93caf3d5967 (diff) | |
download | gem5-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 'mem')
-rw-r--r-- | mem/bus.hh | 2 | ||||
-rw-r--r-- | mem/physical.cc | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/mem/bus.hh b/mem/bus.hh index 54de8aa1e..eff42c55a 100644 --- a/mem/bus.hh +++ b/mem/bus.hh @@ -120,7 +120,7 @@ class Bus : public MemObject // downstream from this bus, yes? That is, the union of all // the 'owned' address ranges of all the other interfaces on // this bus... - virtual void addressRanges(AddrRangeList &range_list, bool &owner); + virtual void addressRanges(AddrRangeList &resp, AddrRangeList &snoop); // Hack to make translating port work without changes virtual int deviceBlockSize() { return 32; } diff --git a/mem/physical.cc b/mem/physical.cc index 046fad868..4087f3e32 100644 --- a/mem/physical.cc +++ b/mem/physical.cc @@ -184,18 +184,18 @@ PhysicalMemory::MemoryPort::recvStatusChange(Port::Status status) } void -PhysicalMemory::MemoryPort::getDeviceAddressRanges(AddrRangeList &range_list, - bool &owner) +PhysicalMemory::MemoryPort::getDeviceAddressRanges(AddrRangeList &resp, + AddrRangeList &snoop) { - memory->getAddressRanges(range_list, owner); + memory->getAddressRanges(resp, snoop); } void -PhysicalMemory::getAddressRanges(AddrRangeList &range_list, bool &owner) +PhysicalMemory::getAddressRanges(AddrRangeList &resp, AddrRangeList &snoop) { - owner = true; - range_list.clear(); - range_list.push_back(RangeSize(base_addr, pmem_size)); + snoop.clear(); + resp.clear(); + resp.push_back(RangeSize(base_addr, pmem_size)); } int |