little fixes i noticed while searching for reason for address range issues (but these weren't the cause of the problem).
RangeSize as a function takes a start address, and a SIZE, and will make the range (start, start+size-1) for you.
src/cpu/memtest/memtest.hh:
src/cpu/o3/fetch.hh:
src/cpu/o3/lsq.hh:
src/cpu/ozone/front_end.hh:
src/cpu/ozone/lw_lsq.hh:
src/cpu/simple/atomic.hh:
src/cpu/simple/timing.hh:
Fix RangeSize arguments
src/dev/alpha/tsunami_cchip.cc:
src/dev/alpha/tsunami_io.cc:
src/dev/alpha/tsunami_pchip.cc:
src/dev/baddev.cc:
pioSize indicates SIZE, not a mask
--HG--
extra : convert_revision : d385521fcfe58f8dffc8622260937e668a47a948
This commit is contained in:
@@ -116,7 +116,7 @@ class MemTest : public MemObject
|
||||
|
||||
virtual void getDeviceAddressRanges(AddrRangeList &resp,
|
||||
AddrRangeList &snoop)
|
||||
{ resp.clear(); snoop.clear(); snoop.push_back(RangeSize(0,-1)); }
|
||||
{ resp.clear(); snoop.clear(); snoop.push_back(RangeSize(0,0)); }
|
||||
};
|
||||
|
||||
CpuPort cachePort;
|
||||
|
||||
@@ -98,7 +98,7 @@ class DefaultFetch
|
||||
/** Returns the address ranges of this device. */
|
||||
virtual void getDeviceAddressRanges(AddrRangeList &resp,
|
||||
AddrRangeList &snoop)
|
||||
{ resp.clear(); snoop.clear(); snoop.push_back(RangeSize(0,-1)); }
|
||||
{ resp.clear(); snoop.clear(); snoop.push_back(RangeSize(0,0)); }
|
||||
|
||||
/** Timing version of receive. Handles setting fetch to the
|
||||
* proper status to start fetching. */
|
||||
|
||||
@@ -313,7 +313,7 @@ class LSQ {
|
||||
/** Returns the address ranges of this device. */
|
||||
virtual void getDeviceAddressRanges(AddrRangeList &resp,
|
||||
AddrRangeList &snoop)
|
||||
{ resp.clear(); snoop.clear(); snoop.push_back(RangeSize(0,-1)); }
|
||||
{ resp.clear(); snoop.clear(); snoop.push_back(RangeSize(0,0)); }
|
||||
|
||||
/** Timing version of receive. Handles writing back and
|
||||
* completing the load or store that has returned from
|
||||
|
||||
@@ -92,7 +92,7 @@ class FrontEnd
|
||||
/** Returns the address ranges of this device. */
|
||||
virtual void getDeviceAddressRanges(AddrRangeList &resp,
|
||||
AddrRangeList &snoop)
|
||||
{ resp.clear(); snoop.clear(); snoop.push_back(RangeSize(0,-1)); }
|
||||
{ resp.clear(); snoop.clear(); snoop.push_back(RangeSize(0,0)); }
|
||||
|
||||
/** Timing version of receive. Handles setting fetch to the
|
||||
* proper status to start fetching. */
|
||||
|
||||
@@ -258,7 +258,7 @@ class OzoneLWLSQ {
|
||||
|
||||
virtual void getDeviceAddressRanges(AddrRangeList &resp,
|
||||
AddrRangeList &snoop)
|
||||
{ resp.clear(); snoop.clear(); snoop.push_back(RangeSize(0,-1)); }
|
||||
{ resp.clear(); snoop.clear(); snoop.push_back(RangeSize(0,0)); }
|
||||
|
||||
virtual bool recvTiming(PacketPtr pkt);
|
||||
|
||||
|
||||
@@ -106,7 +106,7 @@ class AtomicSimpleCPU : public BaseSimpleCPU
|
||||
|
||||
virtual void getDeviceAddressRanges(AddrRangeList &resp,
|
||||
AddrRangeList &snoop)
|
||||
{ resp.clear(); snoop.clear(); snoop.push_back(RangeSize(0,-1)); }
|
||||
{ resp.clear(); snoop.clear(); snoop.push_back(RangeSize(0,0)); }
|
||||
|
||||
};
|
||||
CpuPort icachePort;
|
||||
|
||||
@@ -94,7 +94,7 @@ class TimingSimpleCPU : public BaseSimpleCPU
|
||||
|
||||
virtual void getDeviceAddressRanges(AddrRangeList &resp,
|
||||
AddrRangeList &snoop)
|
||||
{ resp.clear(); snoop.clear(); snoop.push_back(RangeSize(0,-1)); }
|
||||
{ resp.clear(); snoop.clear(); snoop.push_back(RangeSize(0,0)); }
|
||||
|
||||
struct TickEvent : public Event
|
||||
{
|
||||
|
||||
@@ -57,7 +57,7 @@ using namespace TheISA;
|
||||
TsunamiCChip::TsunamiCChip(Params *p)
|
||||
: BasicPioDevice(p), tsunami(p->tsunami)
|
||||
{
|
||||
pioSize = 0xfffffff;
|
||||
pioSize = 0x10000000;
|
||||
|
||||
drir = 0;
|
||||
ipint = 0;
|
||||
|
||||
@@ -430,7 +430,7 @@ TsunamiIO::TsunamiIO(Params *p)
|
||||
: BasicPioDevice(p), tsunami(p->tsunami), pitimer(p->name + "pitimer"),
|
||||
rtc(p->name + ".rtc", p->tsunami, p->frequency)
|
||||
{
|
||||
pioSize = 0xff;
|
||||
pioSize = 0x100;
|
||||
|
||||
// set the back pointer from tsunami to myself
|
||||
tsunami->io = this;
|
||||
|
||||
@@ -53,7 +53,7 @@ using namespace TheISA;
|
||||
TsunamiPChip::TsunamiPChip(Params *p)
|
||||
: BasicPioDevice(p)
|
||||
{
|
||||
pioSize = 0xfff;
|
||||
pioSize = 0x1000;
|
||||
|
||||
for (int i = 0; i < 4; i++) {
|
||||
wsba[i] = 0;
|
||||
|
||||
@@ -49,7 +49,7 @@ using namespace TheISA;
|
||||
BadDevice::BadDevice(Params *p)
|
||||
: BasicPioDevice(p), devname(p->device_name)
|
||||
{
|
||||
pioSize = 0xf;
|
||||
pioSize = 0x10;
|
||||
}
|
||||
|
||||
Tick
|
||||
|
||||
Reference in New Issue
Block a user