little fixes i noticed while searching for reason for address range issues (but these...

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

diff --git a/src/cpu/memtest/memtest.hh b/src/cpu/memtest/memtest.hh
index 7bf34d827281c5b82f78109d41162f2708df9de6..264309fd767d188112c12fb34e2c848a29d1d7cf 100644 (file)
--- a/src/cpu/memtest/memtest.hh
+++ b/src/cpu/memtest/memtest.hh
@@ -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;

diff --git a/src/cpu/o3/fetch.hh b/src/cpu/o3/fetch.hh
index 04016347a4ef316c3f35cb0d4cf5475805b455f4..e880e14e4a9748a97f3afc3e04c448608d607b8a 100644 (file)
--- a/src/cpu/o3/fetch.hh
+++ b/src/cpu/o3/fetch.hh
@@ -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. */

diff --git a/src/cpu/o3/lsq.hh b/src/cpu/o3/lsq.hh
index 7559a36d57c14b3eb378c90e220ec49d81883fe3..e68085cfd8756d1667cbe075399c55d79a671152 100644 (file)
--- a/src/cpu/o3/lsq.hh
+++ b/src/cpu/o3/lsq.hh
@@ -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

diff --git a/src/cpu/ozone/front_end.hh b/src/cpu/ozone/front_end.hh
index e09e4de9c4a1dc7914b5d39679a8bf83c6f07c50..0acf99ead65d1cf1966ad42954135fd53d931914 100644 (file)
--- a/src/cpu/ozone/front_end.hh
+++ b/src/cpu/ozone/front_end.hh
@@ -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. */

diff --git a/src/cpu/ozone/lw_lsq.hh b/src/cpu/ozone/lw_lsq.hh
index 7e6849668afc5eab081262ddec7db10bf8533146..c981b8e63fa07b7ee55551e8046fa0b06b6cf2ab 100644 (file)
--- a/src/cpu/ozone/lw_lsq.hh
+++ b/src/cpu/ozone/lw_lsq.hh
@@ -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);
 

diff --git a/src/cpu/simple/atomic.hh b/src/cpu/simple/atomic.hh
index 0df6fe079df7d68274517968bfcfedf8568f905e..42c7bf23a611defb8e3e74bd7a2a44ff5095a7ef 100644 (file)
--- a/src/cpu/simple/atomic.hh
+++ b/src/cpu/simple/atomic.hh
@@ -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;

diff --git a/src/cpu/simple/timing.hh b/src/cpu/simple/timing.hh
index fe5d036662cc4f459efa44d0e21f1669de0bc568..abcb224bfce72fffb692d8b66b0a1d2594242171 100644 (file)
--- a/src/cpu/simple/timing.hh
+++ b/src/cpu/simple/timing.hh
@@ -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
         {

diff --git a/src/dev/alpha/tsunami_cchip.cc b/src/dev/alpha/tsunami_cchip.cc
index 924e1d4622152f145fc60aa4a749d56bc2352a93..eb51d4e49951a38efb8f5565cdb861ca3d9cdcd0 100644 (file)
--- a/src/dev/alpha/tsunami_cchip.cc
+++ b/src/dev/alpha/tsunami_cchip.cc
@@ -57,7 +57,7 @@ using namespace TheISA;
 TsunamiCChip::TsunamiCChip(Params *p)
     : BasicPioDevice(p), tsunami(p->tsunami)
 {
-    pioSize = 0xfffffff;
+    pioSize = 0x10000000;
 
     drir = 0;
     ipint = 0;

diff --git a/src/dev/alpha/tsunami_io.cc b/src/dev/alpha/tsunami_io.cc
index def214a95258c160f367759521df4e059a657ef4..8430856ef6fb1a1d6e441729265ae02f66087821 100644 (file)
--- a/src/dev/alpha/tsunami_io.cc
+++ b/src/dev/alpha/tsunami_io.cc
@@ -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;

diff --git a/src/dev/alpha/tsunami_pchip.cc b/src/dev/alpha/tsunami_pchip.cc
index 94a7f96e5bde7c7b873105a7a18bf4b9fd86c928..f30199337bf954673202c255611baf9f60f2a0d6 100644 (file)
--- a/src/dev/alpha/tsunami_pchip.cc
+++ b/src/dev/alpha/tsunami_pchip.cc
@@ -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;

diff --git a/src/dev/baddev.cc b/src/dev/baddev.cc
index 1bab9349262fa032c772a48edca0f266ec86456f..6a70604554ad8a8dc3f4bd4d171b25092cd7c591 100644 (file)
--- a/src/dev/baddev.cc
+++ b/src/dev/baddev.cc
@@ -49,7 +49,7 @@ using namespace TheISA;
 BadDevice::BadDevice(Params *p)
     : BasicPioDevice(p), devname(p->device_name)
 {
-    pioSize = 0xf;
+    pioSize = 0x10;
 }
 
 Tick