Merge zizzer:/bk/sparcfs

into  zed.eecs.umich.edu:/z/hsul/work/m5/newmem

--HG--
extra : convert_revision : 68e9bb607fbeb1ed0ea4192411e804dc8e6ddd95

3 files changed, 3 insertions, 3 deletions

diff --git a/src/dev/alpha/tsunami_cchip.cc b/src/dev/alpha/tsunami_cchip.cc
index 924e1d462..eb51d4e49 100644
--- 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 def214a95..8430856ef 100644
--- 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 94a7f96e5..f30199337 100644
--- 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;