Merge zizzer.eecs.umich.edu:/bk/newmem/

into  zeep.eecs.umich.edu:/home/gblack/m5/newmemmemops

--HG--
extra : convert_revision : dc165840841bdd88e40111b98d1be493441703f0

35 files changed, 593 insertions, 127 deletions

diff --git a/configs/common/Simulation.py b/configs/common/Simulation.py
index d88373d54..a67159a50 100644
--- a/configs/common/Simulation.py
+++ b/configs/common/Simulation.py
@@ -27,6 +27,7 @@
 # Authors: Lisa Hsu
 
 from os import getcwd
+from os.path import join as joinpath
 import m5
 from m5.objects import *
 m5.AddToPath('../common')
@@ -64,7 +65,7 @@ def run(options, root, testsys, cpu_class):
         print "simulating for: ", simtime
         maxtick = simtime
     else:
-        maxtick = -1
+        maxtick = m5.MaxTick
 
     if options.checkpoint_dir:
         cptdir = options.checkpoint_dir
@@ -149,7 +150,7 @@ def run(options, root, testsys, cpu_class):
             m5.panic('Checkpoint %d not found' % cpt_num)
 
         m5.restoreCheckpoint(root,
-                             "/".join([cptdir, "cpt.%s" % cpts[cpt_num - 1]]))
+                             joinpath(cptdir, "cpt.%s" % cpts[cpt_num - 1]))
 
     if options.standard_switch or cpu_class:
         exit_event = m5.simulate(10000)
@@ -184,13 +185,13 @@ def run(options, root, testsys, cpu_class):
             exit_event = m5.simulate(when - m5.curTick())
 
         if exit_event.getCause() == "simulate() limit reached":
-            m5.checkpoint(root, "/".join([cptdir,"cpt.%d"]))
+            m5.checkpoint(root, joinpath(cptdir, "cpt.%d"))
             num_checkpoints += 1
 
         sim_ticks = when
         exit_cause = "maximum %d checkpoints dropped" % max_checkpoints
         while num_checkpoints < max_checkpoints:
-            if (sim_ticks + period) > maxtick and maxtick != -1:
+            if (sim_ticks + period) > maxtick:
                 exit_event = m5.simulate(maxtick - sim_ticks)
                 exit_cause = exit_event.getCause()
                 break
@@ -200,24 +201,20 @@ def run(options, root, testsys, cpu_class):
                 while exit_event.getCause() == "checkpoint":
                     exit_event = m5.simulate(sim_ticks - m5.curTick())
                 if exit_event.getCause() == "simulate() limit reached":
-                    m5.checkpoint(root, "/".join([cptdir,"cpt.%d"]))
+                    m5.checkpoint(root, joinpath(cptdir, "cpt.%d"))
                     num_checkpoints += 1
 
     else: #no checkpoints being taken via this script
         exit_event = m5.simulate(maxtick)
 
         while exit_event.getCause() == "checkpoint":
-            m5.checkpoint(root, "/".join([cptdir,"cpt.%d"]))
+            m5.checkpoint(root, joinpath(cptdir, "cpt.%d"))
             num_checkpoints += 1
             if num_checkpoints == max_checkpoints:
                 exit_cause =  "maximum %d checkpoints dropped" % max_checkpoints
                 break
 
-            if maxtick == -1:
-                exit_event = m5.simulate(maxtick)
-            else:
-                exit_event = m5.simulate(maxtick - m5.curTick())
-
+            exit_event = m5.simulate(maxtick - m5.curTick())
             exit_cause = exit_event.getCause()
 
     if exit_cause == '':
diff --git a/configs/common/SysPaths.py b/configs/common/SysPaths.py
index 2070d11f8..c61c9962e 100644
--- a/configs/common/SysPaths.py
+++ b/configs/common/SysPaths.py
@@ -30,6 +30,9 @@ import os, sys
 from os.path import isdir, join as joinpath
 from os import environ as env
 
+config_path = os.path.dirname(os.path.abspath(__file__))
+config_root = os.path.dirname(config_path)
+
 def disk(file):
     system()
     return joinpath(disk.dir, file)
@@ -60,7 +63,7 @@ def system():
     if not disk.dir:
         disk.dir = joinpath(system.dir, 'disks')
     if not script.dir:
-        script.dir = joinpath(system.dir, 'boot')
+        script.dir = joinpath(config_root, 'boot')
 
 system.dir = None
 binary.dir = None
diff --git a/src/SConscript b/src/SConscript
index 7907dbb5d..b9664dd39 100644
--- a/src/SConscript
+++ b/src/SConscript
@@ -374,8 +374,15 @@ def makeEnv(label, objsfx, strip = False, **kwargs):
     envList.append(newEnv)
 
 # Debug binary
+# Solaris seems to have some issue with DWARF2 debugging information, it's ok
+# with stabs though
+if sys.platform == 'sunos5':
+   debug_flag = '-gstabs+'
+else:
+   debug_flag = '-ggdb3'
+
 makeEnv('debug', '.do',
-        CCFLAGS = Split('-g3 -gdwarf-2 -O0'),
+        CCFLAGS = Split('%s -O0' % debug_flag),
         CPPDEFINES = 'DEBUG')
 
 # Optimized binary
diff --git a/src/base/statistics.hh b/src/base/statistics.hh
index 59f219c07..577ea5eab 100644
--- a/src/base/statistics.hh
+++ b/src/base/statistics.hh
@@ -696,7 +696,7 @@ class ScalarBase : public DataAccess
 
   protected:
     /** The storage of this stat. */
-    char storage[sizeof(Storage)];
+    char storage[sizeof(Storage)] __attribute__ ((aligned (8)));
 
     /** The parameters for this stat. */
     Params params;
@@ -1637,7 +1637,7 @@ class DistBase : public DataAccess
 
   protected:
     /** The storage for this stat. */
-    char storage[sizeof(Storage)];
+    char storage[sizeof(Storage)] __attribute__ ((aligned (8)));
 
     /** The parameters for this stat. */
     Params params;
diff --git a/src/cpu/exetrace.cc b/src/cpu/exetrace.cc
index 9d85311bb..80b144e85 100644
--- a/src/cpu/exetrace.cc
+++ b/src/cpu/exetrace.cc
@@ -33,6 +33,8 @@
 
 #include <fstream>
 #include <iomanip>
+#include <sys/ipc.h>
+#include <sys/shm.h>
 
 #include "arch/regfile.hh"
 #include "base/loader/symtab.hh"
@@ -44,10 +46,15 @@
 
 //XXX This is temporary
 #include "arch/isa_specific.hh"
+#include "cpu/m5legion_interface.h"
 
 using namespace std;
 using namespace TheISA;
 
+namespace Trace {
+SharedData *shared_data = NULL;
+}
+
 ////////////////////////////////////////////////////////////////////////
 //
 //  Methods for the InstRecord object
@@ -60,6 +67,7 @@ Trace::InstRecord::dump(ostream &outs)
     if (flags[PRINT_REG_DELTA])
     {
 #if THE_ISA == SPARC_ISA
+#if 0
         //Don't print what happens for each micro-op, just print out
         //once at the last op, and for regular instructions.
         if(!staticInst->isMicroOp() || staticInst->isLastMicroOp())
@@ -121,6 +129,7 @@ Trace::InstRecord::dump(ostream &outs)
             outs << endl;
         }
 #endif
+#endif
     }
     else if (flags[INTEL_FORMAT]) {
 #if FULL_SYSTEM
@@ -222,6 +231,65 @@ Trace::InstRecord::dump(ostream &outs)
         //
         outs << endl;
     }
+    // Compare
+    if (flags[LEGION_LOCKSTEP])
+    {
+        bool compared = false;
+        bool diffPC   = false;
+        bool diffInst = false;
+        bool diffRegs = false;
+
+        while (!compared) {
+            if (shared_data->flags == OWN_M5) {
+                if (shared_data->pc != PC)
+                   diffPC = true;
+                if (shared_data->instruction != staticInst->machInst)
+                    diffInst = true;
+                for (int i = 0; i < TheISA::NumIntRegs; i++) {
+                    if (thread->readIntReg(i) != shared_data->intregs[i])
+                        diffRegs = true;
+                }
+
+                if (diffPC || diffInst || diffRegs ) {
+                    outs << "Differences found between M5 and Legion:";
+                    if (diffPC)
+                        outs << " PC";
+                    if (diffInst)
+                        outs << " Instruction";
+                    if (diffRegs)
+                        outs << " IntRegs";
+                    outs << endl;
+
+                    outs << "M5 PC: " << setw(20) << "0x" << hex << PC;
+                    outs << "Legion PC: " << setw(20) << "0x" << hex <<
+                        shared_data->pc << endl;
+
+
+
+                    outs << "M5 Instruction: " << staticInst->machInst << "("
+                         << staticInst->disassemble(PC, debugSymbolTable)
+                         << ")" << "Legion Instruction: " <<
+                         shared_data->instruction << "("
+                         /*<< legionInst->disassemble(shared_data->pc,
+                                 debugSymbolTable)*/
+                         << ")" << endl;
+
+                    for (int i = 0; i < TheISA::NumIntRegs; i++) {
+                        outs << setw(16) << "0x" << hex << thread->readIntReg(i)
+                             << setw(16) << "0x" << hex << shared_data->intregs[i];
+
+                        if (thread->readIntReg(i) != shared_data->intregs[i])
+                            outs << "<--- Different";
+                        outs << endl;
+                    }
+                }
+
+                compared = true;
+                shared_data->flags = OWN_LEGION;
+            }
+        }
+
+    }
 }
 
 
@@ -271,6 +339,9 @@ Param<bool> exe_trace_pc_symbol(&exeTraceParams, "pc_symbol",
                                   "Use symbols for the PC if available", true);
 Param<bool> exe_trace_intel_format(&exeTraceParams, "intel_format",
                                    "print trace in intel compatible format", false);
+Param<bool> exe_trace_legion_lockstep(&exeTraceParams, "legion_lockstep",
+                                   "Compare sim state to legion state every cycle",
+                                   false);
 Param<string> exe_trace_system(&exeTraceParams, "trace_system",
                                    "print trace of which system (client or server)",
                                    "client");
@@ -296,7 +367,28 @@ Trace::InstRecord::setParams()
     flags[PRINT_REG_DELTA]   = exe_trace_print_reg_delta;
     flags[PC_SYMBOL]         = exe_trace_pc_symbol;
     flags[INTEL_FORMAT]      = exe_trace_intel_format;
+    flags[LEGION_LOCKSTEP]   = exe_trace_legion_lockstep;
     trace_system	     = exe_trace_system;
+
+    // If were going to be in lockstep with Legion
+    // Setup shared memory, and get otherwise ready
+    if (flags[LEGION_LOCKSTEP]) {
+        int shmfd = shmget(getuid(), sizeof(SharedData), 0777);
+        if (shmfd < 0)
+            fatal("Couldn't get shared memory fd. Is Legion running?");
+
+        shared_data = (SharedData*)shmat(shmfd, NULL, SHM_RND);
+        if (shared_data == (SharedData*)-1)
+            fatal("Couldn't allocate shared memory");
+
+        if (shared_data->flags != OWN_M5)
+            fatal("Shared memory has invalid owner");
+
+        if (shared_data->version != VERSION)
+            fatal("Shared Data is wrong version! M5: %d Legion: %d", VERSION,
+                    shared_data->version);
+
+    }
 }
 
 void
diff --git a/src/cpu/exetrace.hh b/src/cpu/exetrace.hh
index 02ea162f0..6562e5265 100644
--- a/src/cpu/exetrace.hh
+++ b/src/cpu/exetrace.hh
@@ -150,6 +150,7 @@ class InstRecord : public Record
         PRINT_REG_DELTA,
         PC_SYMBOL,
         INTEL_FORMAT,
+        LEGION_LOCKSTEP,
         NUM_BITS
     };
 
diff --git a/src/cpu/m5legion_interface.h b/src/cpu/m5legion_interface.h
new file mode 100644
index 000000000..0fa0e7279
--- /dev/null
+++ b/src/cpu/m5legion_interface.h
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2006 The Regents of The University of Michigan
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met: redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer;
+ * redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution;
+ * neither the name of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * Authors: Ali Saidi
+ */
+
+#include <unistd.h>
+
+#define VERSION         0xA1000001
+#define OWN_M5          0x000000AA
+#define OWN_LEGION      0x00000055
+
+/** !!!  VVV Increment VERSION on change VVV !!! **/
+
+typedef struct {
+    uint32_t flags;
+    uint32_t version;
+
+    uint64_t pc;
+    uint64_t instruction;
+    uint64_t intregs[32];
+
+} SharedData;
+
+/** !!! ^^^  Increment VERSION on change ^^^ !!! **/
+
diff --git a/src/cpu/o3/mem_dep_unit.hh b/src/cpu/o3/mem_dep_unit.hh
index e399f0133..a12a3001b 100644
--- a/src/cpu/o3/mem_dep_unit.hh
+++ b/src/cpu/o3/mem_dep_unit.hh
@@ -69,7 +69,7 @@ class MemDepUnit {
     typedef typename Impl::DynInstPtr DynInstPtr;
 
     /** Empty constructor. Must call init() prior to using in this case. */
-    MemDepUnit() {}
+    MemDepUnit();
 
     /** Constructs a MemDepUnit with given parameters. */
     MemDepUnit(Params *params);
diff --git a/src/cpu/o3/mem_dep_unit_impl.hh b/src/cpu/o3/mem_dep_unit_impl.hh
index c649ca385..f19980fd5 100644
--- a/src/cpu/o3/mem_dep_unit_impl.hh
+++ b/src/cpu/o3/mem_dep_unit_impl.hh
@@ -34,6 +34,13 @@
 #include "cpu/o3/mem_dep_unit.hh"
 
 template <class MemDepPred, class Impl>
+MemDepUnit<MemDepPred, Impl>::MemDepUnit()
+    : loadBarrier(false), loadBarrierSN(0), storeBarrier(false),
+      storeBarrierSN(0), iqPtr(NULL)
+{
+}
+
+template <class MemDepPred, class Impl>
 MemDepUnit<MemDepPred, Impl>::MemDepUnit(Params *params)
     : depPred(params->SSITSize, params->LFSTSize), loadBarrier(false),
       loadBarrierSN(0), storeBarrier(false), storeBarrierSN(0), iqPtr(NULL)
@@ -160,8 +167,12 @@ MemDepUnit<MemDepPred, Impl>::insert(DynInstPtr &inst)
     // producing memrefs/stores.
     InstSeqNum producing_store;
     if (inst->isLoad() && loadBarrier) {
+        DPRINTF(MemDepUnit, "Load barrier [sn:%lli] in flight\n",
+                loadBarrierSN);
         producing_store = loadBarrierSN;
     } else if (inst->isStore() && storeBarrier) {
+        DPRINTF(MemDepUnit, "Store barrier [sn:%lli] in flight\n",
+                storeBarrierSN);
         producing_store = storeBarrierSN;
     } else {
         producing_store = depPred.checkInst(inst->readPC());
@@ -171,10 +182,12 @@ MemDepUnit<MemDepPred, Impl>::insert(DynInstPtr &inst)
 
     // If there is a producing store, try to find the entry.
     if (producing_store != 0) {
+        DPRINTF(MemDepUnit, "Searching for producer\n");
         MemDepHashIt hash_it = memDepHash.find(producing_store);
 
         if (hash_it != memDepHash.end()) {
             store_entry = (*hash_it).second;
+            DPRINTF(MemDepUnit, "Proucer found\n");
         }
     }
 
diff --git a/src/cpu/ozone/cpu.hh b/src/cpu/ozone/cpu.hh
index 2b2ed7b3e..c1373944d 100644
--- a/src/cpu/ozone/cpu.hh
+++ b/src/cpu/ozone/cpu.hh
@@ -361,8 +361,8 @@ class OzoneCPU : public BaseCPU
 
     bool interval_stats;
 
-    AlphaITB *itb;
-    AlphaDTB *dtb;
+    TheISA::ITB *itb;
+    TheISA::DTB *dtb;
     System *system;
     PhysicalMemory *physmem;
 #endif
diff --git a/src/cpu/ozone/thread_state.hh b/src/cpu/ozone/thread_state.hh
index c4d16b3af..a71795851 100644
--- a/src/cpu/ozone/thread_state.hh
+++ b/src/cpu/ozone/thread_state.hh
@@ -122,7 +122,7 @@ struct OzoneThreadState : public ThreadState {
 
     MiscReg readMiscRegWithEffect(int misc_reg)
     {
-        return miscRegFile.readRegWithEffect(misc_reg, fault, tc);
+        return miscRegFile.readRegWithEffect(misc_reg, tc);
     }
 
     void setMiscReg(int misc_reg, const MiscReg &val)
diff --git a/src/dev/isa_fake.cc b/src/dev/isa_fake.cc
index 103fdd8ce..40909c6a1 100644
--- a/src/dev/isa_fake.cc
+++ b/src/dev/isa_fake.cc
@@ -50,15 +50,6 @@ IsaFake::IsaFake(Params *p)
     memset(&retData, p->retData, sizeof(retData));
 }
 
-void
-IsaFake::init()
-{
-    // Only init this device if it's connected to anything.
-    if (pioPort)
-        PioDevice::init();
-}
-
-
 Tick
 IsaFake::read(PacketPtr pkt)
 {
diff --git a/src/dev/isa_fake.hh b/src/dev/isa_fake.hh
index 4c195a97f..fee41e325 100644
--- a/src/dev/isa_fake.hh
+++ b/src/dev/isa_fake.hh
@@ -80,8 +80,6 @@ class IsaFake : public BasicPioDevice
      * @param data the data to not write.
      */
     virtual Tick write(PacketPtr pkt);
-
-    void init();
 };
 
 #endif // __ISA_FAKE_HH__
diff --git a/src/mem/bus.cc b/src/mem/bus.cc
index 28ee3476b..7b65d252b 100644
--- a/src/mem/bus.cc
+++ b/src/mem/bus.cc
@@ -240,10 +240,10 @@ Bus::recvRetry(int id)
                 busIdle.reschedule(tickNextIdle);
             }
         }
-        //If we weren't able to drain before, we might be able to now.
-        if (drainEvent && retryList.size() == 0 && curTick >= tickNextIdle)
-            drainEvent->process();
     }
+    //If we weren't able to drain before, we might be able to now.
+    if (drainEvent && retryList.size() == 0 && curTick >= tickNextIdle)
+        drainEvent->process();
 }
 
 Port *
@@ -521,10 +521,10 @@ Bus::drain(Event * de)
     //waiting. We might be idle but have someone waiting if the device we
     //contacted for a retry didn't actually retry.
     if (curTick >= tickNextIdle && retryList.size() == 0) {
+        return 0;
+    } else {
         drainEvent = de;
         return 1;
-    } else {
-        return 0;
     }
 }
 
diff --git a/src/mem/bus.hh b/src/mem/bus.hh
index 1d1cfde89..ff1d2545d 100644
--- a/src/mem/bus.hh
+++ b/src/mem/bus.hh
@@ -257,8 +257,8 @@ class Bus : public MemObject
     Bus(const std::string &n, int bus_id, int _clock, int _width,
         bool responder_set)
         : MemObject(n), busId(bus_id), clock(_clock), width(_width),
-          tickNextIdle(0), busIdle(this), inRetry(false), defaultPort(NULL),
-          responderSet(responder_set)
+          tickNextIdle(0), drainEvent(NULL), busIdle(this), inRetry(false),
+          defaultPort(NULL), responderSet(responder_set)
     {
         //Both the width and clock period must be positive
         if (width <= 0)
diff --git a/src/mem/cache/base_cache.cc b/src/mem/cache/base_cache.cc
index 1c519fb86..c26d7782b 100644
--- a/src/mem/cache/base_cache.cc
+++ b/src/mem/cache/base_cache.cc
@@ -140,6 +140,9 @@ BaseCache::CachePort::recvRetry()
             }
             waitingOnRetry = false;
         }
+        // Check if we're done draining once this list is empty
+        if (drainList.empty())
+            cache->checkDrain();
     }
     else if (!isCpuSide)
     {
@@ -338,6 +341,10 @@ BaseCache::CacheEvent::process()
         cachePort->drainList.push_back(pkt);
         cachePort->waitingOnRetry = true;
     }
+
+    // Check if we're done draining once this list is empty
+    if (cachePort->drainList.empty())
+        cachePort->cache->checkDrain();
 }
 
 const char *
@@ -599,3 +606,18 @@ BaseCache::regStats()
         ;
 
 }
+
+unsigned int
+BaseCache::drain(Event *de)
+{
+    // Set status
+    if (!canDrain()) {
+        drainEvent = de;
+
+        changeState(SimObject::Draining);
+        return 1;
+    }
+
+    changeState(SimObject::Drained);
+    return 0;
+}
diff --git a/src/mem/cache/base_cache.hh b/src/mem/cache/base_cache.hh
index 565280aef..ea7544fbb 100644
--- a/src/mem/cache/base_cache.hh
+++ b/src/mem/cache/base_cache.hh
@@ -105,6 +105,8 @@ class BaseCache : public MemObject
 
         void clearBlocked();
 
+        bool canDrain() { return drainList.empty(); }
+
         bool blocked;
 
         bool mustSendRetry;
@@ -227,6 +229,9 @@ class BaseCache : public MemObject
     /** The number of misses to trigger an exit event. */
     Counter missCount;
 
+    /** The drain event. */
+    Event *drainEvent;
+
   public:
     // Statistics
     /**
@@ -340,7 +345,7 @@ class BaseCache : public MemObject
     BaseCache(const std::string &name, Params &params)
         : MemObject(name), blocked(0), blockedSnoop(0), masterRequests(0),
           slaveRequests(0), blkSize(params.blkSize),
-          missCount(params.maxMisses)
+          missCount(params.maxMisses), drainEvent(NULL)
     {
         //Start ports at null if more than one is created we should panic
         cpuSidePort = NULL;
@@ -477,6 +482,7 @@ class BaseCache : public MemObject
     {
         uint8_t flag = 1<<cause;
         masterRequests &= ~flag;
+        checkDrain();
     }
 
     /**
@@ -512,6 +518,7 @@ class BaseCache : public MemObject
     {
         uint8_t flag = 1<<cause;
         slaveRequests &= ~flag;
+        checkDrain();
     }
 
     /**
@@ -589,6 +596,30 @@ class BaseCache : public MemObject
             return;
         }
     }
+
+    virtual unsigned int drain(Event *de);
+
+    void checkDrain()
+    {
+        if (drainEvent && canDrain()) {
+            drainEvent->process();
+            changeState(SimObject::Drained);
+            // Clear the drain event
+            drainEvent = NULL;
+        }
+    }
+
+    bool canDrain()
+    {
+        if (doMasterRequest() || doSlaveRequest()) {
+            return false;
+        } else if (memSidePort && !memSidePort->canDrain()) {
+            return false;
+        } else if (cpuSidePort && !cpuSidePort->canDrain()) {
+            return false;
+        }
+        return true;
+    }
 };
 
 #endif //__BASE_CACHE_HH__
diff --git a/src/python/m5/__init__.py b/src/python/m5/__init__.py
index d41fd5a61..579562b38 100644
--- a/src/python/m5/__init__.py
+++ b/src/python/m5/__init__.py
@@ -39,6 +39,9 @@ from cc_main import simulate, SimLoopExitEvent
 # import the m5 compile options
 import defines
 
+# define a MaxTick parameter
+MaxTick = 2**63 - 1
+
 # define this here so we can use it right away if necessary
 def panic(string):
     print >>sys.stderr, 'panic:', string
@@ -171,10 +174,10 @@ def switchCpus(cpuList):
 
     for cpu in old_cpus:
         if not isinstance(cpu, objects.BaseCPU):
-            raise TypeError, "%s is not of type BaseCPU", cpu
+            raise TypeError, "%s is not of type BaseCPU" % cpu
     for cpu in new_cpus:
         if not isinstance(cpu, objects.BaseCPU):
-            raise TypeError, "%s is not of type BaseCPU", cpu
+            raise TypeError, "%s is not of type BaseCPU" % cpu
 
     # Drain all of the individual CPUs
     drain_event = cc_main.createCountedDrain()
diff --git a/src/python/m5/main.py b/src/python/m5/main.py
index ccd6c5807..ef37f62ac 100644
--- a/src/python/m5/main.py
+++ b/src/python/m5/main.py
@@ -181,6 +181,8 @@ bool_option("print-cpseq", default=False,
     help="Print correct path sequence numbers in trace output")
 #bool_option("print-reg-delta", default=False,
 #    help="Print which registers changed to what in trace output")
+bool_option("legion-lock", default=False,
+    help="Compare simulator state with Legion simulator every cycle")
 
 options = attrdict()
 arguments = []
@@ -296,6 +298,7 @@ def main():
     objects.ExecutionTrace.print_fetchseq = options.print_fetch_seq
     objects.ExecutionTrace.print_cpseq = options.print_cpseq
     #objects.ExecutionTrace.print_reg_delta = options.print_reg_delta
+    objects.ExecutionTrace.legion_lockstep = options.legion_lock
 
     sys.argv = arguments
     sys.path = [ os.path.dirname(sys.argv[0]) ] + sys.path
diff --git a/src/python/m5/objects/BaseCPU.py b/src/python/m5/objects/BaseCPU.py
index b6dc08e46..4e34e8a4e 100644
--- a/src/python/m5/objects/BaseCPU.py
+++ b/src/python/m5/objects/BaseCPU.py
@@ -8,7 +8,6 @@ from Bus import Bus
 class BaseCPU(SimObject):
     type = 'BaseCPU'
     abstract = True
-    mem = Param.MemObject("memory")
 
     system = Param.System(Parent.any, "system object")
     cpu_id = Param.Int("CPU identifier")
@@ -47,7 +46,6 @@ class BaseCPU(SimObject):
         self.icache_port = ic.cpu_side
         self.dcache_port = dc.cpu_side
         self._mem_ports = ['icache.mem_side', 'dcache.mem_side']
-#        self.mem = dc
 
     def addTwoLevelCacheHierarchy(self, ic, dc, l2c):
         self.addPrivateSplitL1Caches(ic, dc)
diff --git a/src/python/m5/objects/Tsunami.py b/src/python/m5/objects/Tsunami.py
index 78ab65b31..ffe93727b 100644
--- a/src/python/m5/objects/Tsunami.py
+++ b/src/python/m5/objects/Tsunami.py
@@ -76,6 +76,7 @@ class Tsunami(Platform):
         self.pchip.pio = bus.port
         self.pciconfig.pio = bus.default
         bus.responder_set = True
+        bus.responder = self.pciconfig
         self.fake_sm_chip.pio = bus.port
         self.fake_uart1.pio = bus.port
         self.fake_uart2.pio = bus.port
diff --git a/src/sim/host.hh b/src/sim/host.hh
index 9c79580b1..a2faa206b 100644
--- a/src/sim/host.hh
+++ b/src/sim/host.hh
@@ -56,7 +56,7 @@ typedef int64_t Counter;
  */
 typedef int64_t Tick;
 
-const Tick MaxTick = (1LL << 62);
+const Tick MaxTick = (1LL << 63) - 1;
 
 /**
  * Address type
diff --git a/src/sim/main.cc b/src/sim/main.cc
index 133141e57..5b44102a8 100644
--- a/src/sim/main.cc
+++ b/src/sim/main.cc
@@ -309,18 +309,14 @@ finalInit()
  * @return The SimLoopExitEvent that caused the loop to exit.
  */
 SimLoopExitEvent *
-simulate(Tick num_cycles = -1)
+simulate(Tick num_cycles = MaxTick)
 {
     warn("Entering event queue @ %d.  Starting simulation...\n", curTick);
 
-    // Fix up num_cycles.  Special default value -1 means simulate
-    // "forever"... schedule event at MaxTick just to be safe.
-    // Otherwise it's a delta for additional cycles to simulate past
-    // curTick, and thus must be non-negative.
-    if (num_cycles == -1)
-        num_cycles = MaxTick;
-    else if (num_cycles < 0)
+    if (num_cycles < 0)
         fatal("simulate: num_cycles must be >= 0 (was %d)\n", num_cycles);
+    else if (curTick + num_cycles < 0)  //Overflow
+        num_cycles = MaxTick;
     else
         num_cycles = curTick + num_cycles;
 
diff --git a/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic-dual/config.ini b/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic-dual/config.ini
index 409b641a2..8691a494f 100644
--- a/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic-dual/config.ini
+++ b/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic-dual/config.ini
@@ -175,7 +175,6 @@ cpu=system.cpu0
 
 [system.iobus]
 type=Bus
-children=responder
 bus_id=0
 clock=2
 responder_set=true
@@ -183,13 +182,6 @@ width=64
 default=system.tsunami.pciconfig.pio
 port=system.bridge.side_a system.tsunami.cchip.pio system.tsunami.pchip.pio system.tsunami.fake_sm_chip.pio system.tsunami.fake_uart1.pio system.tsunami.fake_uart2.pio system.tsunami.fake_uart3.pio system.tsunami.fake_uart4.pio system.tsunami.fake_ppc.pio system.tsunami.fake_OROM.pio system.tsunami.fake_pnp_addr.pio system.tsunami.fake_pnp_write.pio system.tsunami.fake_pnp_read0.pio system.tsunami.fake_pnp_read1.pio system.tsunami.fake_pnp_read2.pio system.tsunami.fake_pnp_read3.pio system.tsunami.fake_pnp_read4.pio system.tsunami.fake_pnp_read5.pio system.tsunami.fake_pnp_read6.pio system.tsunami.fake_pnp_read7.pio system.tsunami.fake_ata0.pio system.tsunami.fake_ata1.pio system.tsunami.fb.pio system.tsunami.io.pio system.tsunami.uart.pio system.tsunami.console.pio system.tsunami.ide.pio system.tsunami.ethernet.pio system.tsunami.ethernet.config system.tsunami.ethernet.dma system.tsunami.ide.config system.tsunami.ide.dma
 
-[system.iobus.responder]
-type=BadAddr
-pio_addr=0
-pio_latency=0
-platform=system.tsunami
-system=system
-
 [system.membus]
 type=Bus
 children=responder
@@ -201,10 +193,13 @@ default=system.membus.responder.pio
 port=system.bridge.side_b system.physmem.port system.cpu0.icache_port system.cpu0.dcache_port system.cpu1.icache_port system.cpu1.dcache_port
 
 [system.membus.responder]
-type=BadAddr
+type=IsaFake
 pio_addr=0
 pio_latency=0
+pio_size=8
 platform=system.tsunami
+ret_bad_addr=true
+ret_data=255
 system=system
 pio=system.membus.default
 
@@ -344,6 +339,8 @@ pio_addr=8796093677568
 pio_latency=2
 pio_size=393216
 platform=system.tsunami
+ret_bad_addr=false
+ret_data=255
 system=system
 pio=system.iobus.port[9]
 
@@ -353,6 +350,8 @@ pio_addr=8804615848432
 pio_latency=2
 pio_size=8
 platform=system.tsunami
+ret_bad_addr=false
+ret_data=255
 system=system
 pio=system.iobus.port[20]
 
@@ -362,6 +361,8 @@ pio_addr=8804615848304
 pio_latency=2
 pio_size=8
 platform=system.tsunami
+ret_bad_addr=false
+ret_data=255
 system=system
 pio=system.iobus.port[21]
 
@@ -371,6 +372,8 @@ pio_addr=8804615848569
 pio_latency=2
 pio_size=8
 platform=system.tsunami
+ret_bad_addr=false
+ret_data=255
 system=system
 pio=system.iobus.port[10]
 
@@ -380,6 +383,8 @@ pio_addr=8804615848451
 pio_latency=2
 pio_size=8
 platform=system.tsunami
+ret_bad_addr=false
+ret_data=255
 system=system
 pio=system.iobus.port[12]
 
@@ -389,6 +394,8 @@ pio_addr=8804615848515
 pio_latency=2
 pio_size=8
 platform=system.tsunami
+ret_bad_addr=false
+ret_data=255
 system=system
 pio=system.iobus.port[13]
 
@@ -398,6 +405,8 @@ pio_addr=8804615848579
 pio_latency=2
 pio_size=8
 platform=system.tsunami
+ret_bad_addr=false
+ret_data=255
 system=system
 pio=system.iobus.port[14]
 
@@ -407,6 +416,8 @@ pio_addr=8804615848643
 pio_latency=2
 pio_size=8
 platform=system.tsunami
+ret_bad_addr=false
+ret_data=255
 system=system
 pio=system.iobus.port[15]
 
@@ -416,6 +427,8 @@ pio_addr=8804615848707
 pio_latency=2
 pio_size=8
 platform=system.tsunami
+ret_bad_addr=false
+ret_data=255
 system=system
 pio=system.iobus.port[16]
 
@@ -425,6 +438,8 @@ pio_addr=8804615848771
 pio_latency=2
 pio_size=8
 platform=system.tsunami
+ret_bad_addr=false
+ret_data=255
 system=system
 pio=system.iobus.port[17]
 
@@ -434,6 +449,8 @@ pio_addr=8804615848835
 pio_latency=2
 pio_size=8
 platform=system.tsunami
+ret_bad_addr=false
+ret_data=255
 system=system
 pio=system.iobus.port[18]
 
@@ -443,6 +460,8 @@ pio_addr=8804615848899
 pio_latency=2
 pio_size=8
 platform=system.tsunami
+ret_bad_addr=false
+ret_data=255
 system=system
 pio=system.iobus.port[19]
 
@@ -452,6 +471,8 @@ pio_addr=8804615850617
 pio_latency=2
 pio_size=8
 platform=system.tsunami
+ret_bad_addr=false
+ret_data=255
 system=system
 pio=system.iobus.port[11]
 
@@ -461,6 +482,8 @@ pio_addr=8804615848892
 pio_latency=2
 pio_size=8
 platform=system.tsunami
+ret_bad_addr=false
+ret_data=255
 system=system
 pio=system.iobus.port[8]
 
@@ -470,6 +493,8 @@ pio_addr=8804615848816
 pio_latency=2
 pio_size=8
 platform=system.tsunami
+ret_bad_addr=false
+ret_data=255
 system=system
 pio=system.iobus.port[3]
 
@@ -479,6 +504,8 @@ pio_addr=8804615848696
 pio_latency=2
 pio_size=8
 platform=system.tsunami
+ret_bad_addr=false
+ret_data=255
 system=system
 pio=system.iobus.port[4]
 
@@ -488,6 +515,8 @@ pio_addr=8804615848936
 pio_latency=2
 pio_size=8
 platform=system.tsunami
+ret_bad_addr=false
+ret_data=255
 system=system
 pio=system.iobus.port[5]
 
@@ -497,6 +526,8 @@ pio_addr=8804615848680
 pio_latency=2
 pio_size=8
 platform=system.tsunami
+ret_bad_addr=false
+ret_data=255
 system=system
 pio=system.iobus.port[6]
 
@@ -506,6 +537,8 @@ pio_addr=8804615848944
 pio_latency=2
 pio_size=8
 platform=system.tsunami
+ret_bad_addr=false
+ret_data=255
 system=system
 pio=system.iobus.port[7]
 
diff --git a/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic-dual/config.out b/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic-dual/config.out
index d4ec3e5b3..3d4a0e43f 100644
--- a/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic-dual/config.out
+++ b/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic-dual/config.out
@@ -70,9 +70,12 @@ system=system
 intrctrl=system.intrctrl
 
 [system.membus.responder]
-type=BadAddr
+type=IsaFake
 pio_addr=0
 pio_latency=0
+pio_size=8
+ret_bad_addr=true
+ret_data=255
 platform=system.tsunami
 system=system
 
@@ -161,6 +164,8 @@ type=IsaFake
 pio_addr=8804615848696
 pio_latency=2
 pio_size=8
+ret_bad_addr=false
+ret_data=255
 platform=system.tsunami
 system=system
 
@@ -169,6 +174,8 @@ type=IsaFake
 pio_addr=8804615848936
 pio_latency=2
 pio_size=8
+ret_bad_addr=false
+ret_data=255
 platform=system.tsunami
 system=system
 
@@ -177,6 +184,8 @@ type=IsaFake
 pio_addr=8804615848680
 pio_latency=2
 pio_size=8
+ret_bad_addr=false
+ret_data=255
 platform=system.tsunami
 system=system
 
@@ -185,6 +194,8 @@ type=IsaFake
 pio_addr=8804615848944
 pio_latency=2
 pio_size=8
+ret_bad_addr=false
+ret_data=255
 platform=system.tsunami
 system=system
 
@@ -193,6 +204,8 @@ type=IsaFake
 pio_addr=8804615848892
 pio_latency=2
 pio_size=8
+ret_bad_addr=false
+ret_data=255
 platform=system.tsunami
 system=system
 
@@ -249,6 +262,8 @@ type=IsaFake
 pio_addr=8804615848304
 pio_latency=2
 pio_size=8
+ret_bad_addr=false
+ret_data=255
 platform=system.tsunami
 system=system
 
@@ -257,6 +272,8 @@ type=IsaFake
 pio_addr=8804615848432
 pio_latency=2
 pio_size=8
+ret_bad_addr=false
+ret_data=255
 platform=system.tsunami
 system=system
 
@@ -273,6 +290,8 @@ type=IsaFake
 pio_addr=8804615848643
 pio_latency=2
 pio_size=8
+ret_bad_addr=false
+ret_data=255
 platform=system.tsunami
 system=system
 
@@ -281,6 +300,8 @@ type=IsaFake
 pio_addr=8804615848579
 pio_latency=2
 pio_size=8
+ret_bad_addr=false
+ret_data=255
 platform=system.tsunami
 system=system
 
@@ -289,6 +310,8 @@ type=IsaFake
 pio_addr=8804615848515
 pio_latency=2
 pio_size=8
+ret_bad_addr=false
+ret_data=255
 platform=system.tsunami
 system=system
 
@@ -297,6 +320,8 @@ type=IsaFake
 pio_addr=8804615848451
 pio_latency=2
 pio_size=8
+ret_bad_addr=false
+ret_data=255
 platform=system.tsunami
 system=system
 
@@ -305,6 +330,8 @@ type=IsaFake
 pio_addr=8804615848899
 pio_latency=2
 pio_size=8
+ret_bad_addr=false
+ret_data=255
 platform=system.tsunami
 system=system
 
@@ -313,6 +340,8 @@ type=IsaFake
 pio_addr=8804615848835
 pio_latency=2
 pio_size=8
+ret_bad_addr=false
+ret_data=255
 platform=system.tsunami
 system=system
 
@@ -321,6 +350,8 @@ type=IsaFake
 pio_addr=8804615848771
 pio_latency=2
 pio_size=8
+ret_bad_addr=false
+ret_data=255
 platform=system.tsunami
 system=system
 
@@ -329,6 +360,8 @@ type=IsaFake
 pio_addr=8804615848707
 pio_latency=2
 pio_size=8
+ret_bad_addr=false
+ret_data=255
 platform=system.tsunami
 system=system
 
@@ -337,6 +370,8 @@ type=IsaFake
 pio_addr=8804615850617
 pio_latency=2
 pio_size=8
+ret_bad_addr=false
+ret_data=255
 platform=system.tsunami
 system=system
 
@@ -422,6 +457,8 @@ type=IsaFake
 pio_addr=8796093677568
 pio_latency=2
 pio_size=393216
+ret_bad_addr=false
+ret_data=255
 platform=system.tsunami
 system=system
 
@@ -438,6 +475,8 @@ type=IsaFake
 pio_addr=8804615848816
 pio_latency=2
 pio_size=8
+ret_bad_addr=false
+ret_data=255
 platform=system.tsunami
 system=system
 
@@ -446,6 +485,8 @@ type=IsaFake
 pio_addr=8804615848569
 pio_latency=2
 pio_size=8
+ret_bad_addr=false
+ret_data=255
 platform=system.tsunami
 system=system
 
@@ -503,13 +544,6 @@ clock=2
 width=64
 responder_set=true
 
-[system.iobus.responder]
-type=BadAddr
-pio_addr=0
-pio_latency=0
-platform=system.tsunami
-system=system
-
 [trace]
 flags=
 start=0
diff --git a/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic-dual/stderr b/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic-dual/stderr
index 9d74574e7..9bd19d291 100644
--- a/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic-dual/stderr
+++ b/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic-dual/stderr
@@ -1,7 +1,5 @@
 Warning: rounding error > tolerance
     0.002000 rounded to 0
-Warning: rounding error > tolerance
-    0.002000 rounded to 0
       0: system.tsunami.io.rtc: Real-time clock set to Sun Jan  1 00:00:00 2006
 Listening for console connection on port 3457
 0: system.remote_gdb.listener: listening for remote gdb #0 on port 7001
diff --git a/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic/config.ini b/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic/config.ini
index a862353cb..30f7b3f1c 100644
--- a/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic/config.ini
+++ b/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic/config.ini
@@ -145,7 +145,6 @@ cpu=system.cpu
 
 [system.iobus]
 type=Bus
-children=responder
 bus_id=0
 clock=2
 responder_set=true
@@ -153,13 +152,6 @@ width=64
 default=system.tsunami.pciconfig.pio
 port=system.bridge.side_a system.tsunami.cchip.pio system.tsunami.pchip.pio system.tsunami.fake_sm_chip.pio system.tsunami.fake_uart1.pio system.tsunami.fake_uart2.pio system.tsunami.fake_uart3.pio system.tsunami.fake_uart4.pio system.tsunami.fake_ppc.pio system.tsunami.fake_OROM.pio system.tsunami.fake_pnp_addr.pio system.tsunami.fake_pnp_write.pio system.tsunami.fake_pnp_read0.pio system.tsunami.fake_pnp_read1.pio system.tsunami.fake_pnp_read2.pio system.tsunami.fake_pnp_read3.pio system.tsunami.fake_pnp_read4.pio system.tsunami.fake_pnp_read5.pio system.tsunami.fake_pnp_read6.pio system.tsunami.fake_pnp_read7.pio system.tsunami.fake_ata0.pio system.tsunami.fake_ata1.pio system.tsunami.fb.pio system.tsunami.io.pio system.tsunami.uart.pio system.tsunami.console.pio system.tsunami.ide.pio system.tsunami.ethernet.pio system.tsunami.ethernet.config system.tsunami.ethernet.dma system.tsunami.ide.config system.tsunami.ide.dma
 
-[system.iobus.responder]
-type=BadAddr
-pio_addr=0
-pio_latency=0
-platform=system.tsunami
-system=system
-
 [system.membus]
 type=Bus
 children=responder
@@ -171,10 +163,13 @@ default=system.membus.responder.pio
 port=system.bridge.side_b system.physmem.port system.cpu.icache_port system.cpu.dcache_port
 
 [system.membus.responder]
-type=BadAddr
+type=IsaFake
 pio_addr=0
 pio_latency=0
+pio_size=8
 platform=system.tsunami
+ret_bad_addr=true
+ret_data=255
 system=system
 pio=system.membus.default
 
@@ -314,6 +309,8 @@ pio_addr=8796093677568
 pio_latency=2
 pio_size=393216
 platform=system.tsunami
+ret_bad_addr=false
+ret_data=255
 system=system
 pio=system.iobus.port[9]
 
@@ -323,6 +320,8 @@ pio_addr=8804615848432
 pio_latency=2
 pio_size=8
 platform=system.tsunami
+ret_bad_addr=false
+ret_data=255
 system=system
 pio=system.iobus.port[20]
 
@@ -332,6 +331,8 @@ pio_addr=8804615848304
 pio_latency=2
 pio_size=8
 platform=system.tsunami
+ret_bad_addr=false
+ret_data=255
 system=system
 pio=system.iobus.port[21]
 
@@ -341,6 +342,8 @@ pio_addr=8804615848569
 pio_latency=2
 pio_size=8
 platform=system.tsunami
+ret_bad_addr=false
+ret_data=255
 system=system
 pio=system.iobus.port[10]
 
@@ -350,6 +353,8 @@ pio_addr=8804615848451
 pio_latency=2
 pio_size=8
 platform=system.tsunami
+ret_bad_addr=false
+ret_data=255
 system=system
 pio=system.iobus.port[12]
 
@@ -359,6 +364,8 @@ pio_addr=8804615848515
 pio_latency=2
 pio_size=8
 platform=system.tsunami
+ret_bad_addr=false
+ret_data=255
 system=system
 pio=system.iobus.port[13]
 
@@ -368,6 +375,8 @@ pio_addr=8804615848579
 pio_latency=2
 pio_size=8
 platform=system.tsunami
+ret_bad_addr=false
+ret_data=255
 system=system
 pio=system.iobus.port[14]
 
@@ -377,6 +386,8 @@ pio_addr=8804615848643
 pio_latency=2
 pio_size=8
 platform=system.tsunami
+ret_bad_addr=false
+ret_data=255
 system=system
 pio=system.iobus.port[15]
 
@@ -386,6 +397,8 @@ pio_addr=8804615848707
 pio_latency=2
 pio_size=8
 platform=system.tsunami
+ret_bad_addr=false
+ret_data=255
 system=system
 pio=system.iobus.port[16]
 
@@ -395,6 +408,8 @@ pio_addr=8804615848771
 pio_latency=2
 pio_size=8
 platform=system.tsunami
+ret_bad_addr=false
+ret_data=255
 system=system
 pio=system.iobus.port[17]
 
@@ -404,6 +419,8 @@ pio_addr=8804615848835
 pio_latency=2
 pio_size=8
 platform=system.tsunami
+ret_bad_addr=false
+ret_data=255
 system=system
 pio=system.iobus.port[18]
 
@@ -413,6 +430,8 @@ pio_addr=8804615848899
 pio_latency=2
 pio_size=8
 platform=system.tsunami
+ret_bad_addr=false
+ret_data=255
 system=system
 pio=system.iobus.port[19]
 
@@ -422,6 +441,8 @@ pio_addr=8804615850617
 pio_latency=2
 pio_size=8
 platform=system.tsunami
+ret_bad_addr=false
+ret_data=255
 system=system
 pio=system.iobus.port[11]
 
@@ -431,6 +452,8 @@ pio_addr=8804615848892
 pio_latency=2
 pio_size=8
 platform=system.tsunami
+ret_bad_addr=false
+ret_data=255
 system=system
 pio=system.iobus.port[8]
 
@@ -440,6 +463,8 @@ pio_addr=8804615848816
 pio_latency=2
 pio_size=8
 platform=system.tsunami
+ret_bad_addr=false
+ret_data=255
 system=system
 pio=system.iobus.port[3]
 
@@ -449,6 +474,8 @@ pio_addr=8804615848696
 pio_latency=2
 pio_size=8
 platform=system.tsunami
+ret_bad_addr=false
+ret_data=255
 system=system
 pio=system.iobus.port[4]
 
@@ -458,6 +485,8 @@ pio_addr=8804615848936
 pio_latency=2
 pio_size=8
 platform=system.tsunami
+ret_bad_addr=false
+ret_data=255
 system=system
 pio=system.iobus.port[5]
 
@@ -467,6 +496,8 @@ pio_addr=8804615848680
 pio_latency=2
 pio_size=8
 platform=system.tsunami
+ret_bad_addr=false
+ret_data=255
 system=system
 pio=system.iobus.port[6]
 
@@ -476,6 +507,8 @@ pio_addr=8804615848944
 pio_latency=2
 pio_size=8
 platform=system.tsunami
+ret_bad_addr=false
+ret_data=255
 system=system
 pio=system.iobus.port[7]
 
diff --git a/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic/config.out b/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic/config.out
index 739a4860a..bc33ad4d9 100644
--- a/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic/config.out
+++ b/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic/config.out
@@ -70,9 +70,12 @@ system=system
 intrctrl=system.intrctrl
 
 [system.membus.responder]
-type=BadAddr
+type=IsaFake
 pio_addr=0
 pio_latency=0
+pio_size=8
+ret_bad_addr=true
+ret_data=255
 platform=system.tsunami
 system=system
 
@@ -134,6 +137,8 @@ type=IsaFake
 pio_addr=8804615848696
 pio_latency=2
 pio_size=8
+ret_bad_addr=false
+ret_data=255
 platform=system.tsunami
 system=system
 
@@ -142,6 +147,8 @@ type=IsaFake
 pio_addr=8804615848936
 pio_latency=2
 pio_size=8
+ret_bad_addr=false
+ret_data=255
 platform=system.tsunami
 system=system
 
@@ -150,6 +157,8 @@ type=IsaFake
 pio_addr=8804615848680
 pio_latency=2
 pio_size=8
+ret_bad_addr=false
+ret_data=255
 platform=system.tsunami
 system=system
 
@@ -158,6 +167,8 @@ type=IsaFake
 pio_addr=8804615848944
 pio_latency=2
 pio_size=8
+ret_bad_addr=false
+ret_data=255
 platform=system.tsunami
 system=system
 
@@ -166,6 +177,8 @@ type=IsaFake
 pio_addr=8804615848892
 pio_latency=2
 pio_size=8
+ret_bad_addr=false
+ret_data=255
 platform=system.tsunami
 system=system
 
@@ -222,6 +235,8 @@ type=IsaFake
 pio_addr=8804615848304
 pio_latency=2
 pio_size=8
+ret_bad_addr=false
+ret_data=255
 platform=system.tsunami
 system=system
 
@@ -230,6 +245,8 @@ type=IsaFake
 pio_addr=8804615848432
 pio_latency=2
 pio_size=8
+ret_bad_addr=false
+ret_data=255
 platform=system.tsunami
 system=system
 
@@ -246,6 +263,8 @@ type=IsaFake
 pio_addr=8804615848643
 pio_latency=2
 pio_size=8
+ret_bad_addr=false
+ret_data=255
 platform=system.tsunami
 system=system
 
@@ -254,6 +273,8 @@ type=IsaFake
 pio_addr=8804615848579
 pio_latency=2
 pio_size=8
+ret_bad_addr=false
+ret_data=255
 platform=system.tsunami
 system=system
 
@@ -262,6 +283,8 @@ type=IsaFake
 pio_addr=8804615848515
 pio_latency=2
 pio_size=8
+ret_bad_addr=false
+ret_data=255
 platform=system.tsunami
 system=system
 
@@ -270,6 +293,8 @@ type=IsaFake
 pio_addr=8804615848451
 pio_latency=2
 pio_size=8
+ret_bad_addr=false
+ret_data=255
 platform=system.tsunami
 system=system
 
@@ -278,6 +303,8 @@ type=IsaFake
 pio_addr=8804615848899
 pio_latency=2
 pio_size=8
+ret_bad_addr=false
+ret_data=255
 platform=system.tsunami
 system=system
 
@@ -286,6 +313,8 @@ type=IsaFake
 pio_addr=8804615848835
 pio_latency=2
 pio_size=8
+ret_bad_addr=false
+ret_data=255
 platform=system.tsunami
 system=system
 
@@ -294,6 +323,8 @@ type=IsaFake
 pio_addr=8804615848771
 pio_latency=2
 pio_size=8
+ret_bad_addr=false
+ret_data=255
 platform=system.tsunami
 system=system
 
@@ -302,6 +333,8 @@ type=IsaFake
 pio_addr=8804615848707
 pio_latency=2
 pio_size=8
+ret_bad_addr=false
+ret_data=255
 platform=system.tsunami
 system=system
 
@@ -310,6 +343,8 @@ type=IsaFake
 pio_addr=8804615850617
 pio_latency=2
 pio_size=8
+ret_bad_addr=false
+ret_data=255
 platform=system.tsunami
 system=system
 
@@ -395,6 +430,8 @@ type=IsaFake
 pio_addr=8796093677568
 pio_latency=2
 pio_size=393216
+ret_bad_addr=false
+ret_data=255
 platform=system.tsunami
 system=system
 
@@ -411,6 +448,8 @@ type=IsaFake
 pio_addr=8804615848816
 pio_latency=2
 pio_size=8
+ret_bad_addr=false
+ret_data=255
 platform=system.tsunami
 system=system
 
@@ -419,6 +458,8 @@ type=IsaFake
 pio_addr=8804615848569
 pio_latency=2
 pio_size=8
+ret_bad_addr=false
+ret_data=255
 platform=system.tsunami
 system=system
 
@@ -476,13 +517,6 @@ clock=2
 width=64
 responder_set=true
 
-[system.iobus.responder]
-type=BadAddr
-pio_addr=0
-pio_latency=0
-platform=system.tsunami
-system=system
-
 [trace]
 flags=
 start=0
diff --git a/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic/stderr b/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic/stderr
index dbafd6309..a8bcb04d9 100644
--- a/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic/stderr
+++ b/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic/stderr
@@ -1,7 +1,5 @@
 Warning: rounding error > tolerance
     0.002000 rounded to 0
-Warning: rounding error > tolerance
-    0.002000 rounded to 0
       0: system.tsunami.io.rtc: Real-time clock set to Sun Jan  1 00:00:00 2006
 Listening for console connection on port 3456
 0: system.remote_gdb.listener: listening for remote gdb #0 on port 7000
diff --git a/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing-dual/config.ini b/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing-dual/config.ini
index f9a926d79..bc81405be 100644
--- a/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing-dual/config.ini
+++ b/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing-dual/config.ini
@@ -171,7 +171,6 @@ cpu=system.cpu0
 
 [system.iobus]
 type=Bus
-children=responder
 bus_id=0
 clock=2
 responder_set=true
@@ -179,13 +178,6 @@ width=64
 default=system.tsunami.pciconfig.pio
 port=system.bridge.side_a system.tsunami.cchip.pio system.tsunami.pchip.pio system.tsunami.fake_sm_chip.pio system.tsunami.fake_uart1.pio system.tsunami.fake_uart2.pio system.tsunami.fake_uart3.pio system.tsunami.fake_uart4.pio system.tsunami.fake_ppc.pio system.tsunami.fake_OROM.pio system.tsunami.fake_pnp_addr.pio system.tsunami.fake_pnp_write.pio system.tsunami.fake_pnp_read0.pio system.tsunami.fake_pnp_read1.pio system.tsunami.fake_pnp_read2.pio system.tsunami.fake_pnp_read3.pio system.tsunami.fake_pnp_read4.pio system.tsunami.fake_pnp_read5.pio system.tsunami.fake_pnp_read6.pio system.tsunami.fake_pnp_read7.pio system.tsunami.fake_ata0.pio system.tsunami.fake_ata1.pio system.tsunami.fb.pio system.tsunami.io.pio system.tsunami.uart.pio system.tsunami.console.pio system.tsunami.ide.pio system.tsunami.ethernet.pio system.tsunami.ethernet.config system.tsunami.ethernet.dma system.tsunami.ide.config system.tsunami.ide.dma
 
-[system.iobus.responder]
-type=BadAddr
-pio_addr=0
-pio_latency=0
-platform=system.tsunami
-system=system
-
 [system.membus]
 type=Bus
 children=responder
@@ -197,10 +189,13 @@ default=system.membus.responder.pio
 port=system.bridge.side_b system.physmem.port system.cpu0.icache_port system.cpu0.dcache_port system.cpu1.icache_port system.cpu1.dcache_port
 
 [system.membus.responder]
-type=BadAddr
+type=IsaFake
 pio_addr=0
 pio_latency=0
+pio_size=8
 platform=system.tsunami
+ret_bad_addr=true
+ret_data=255
 system=system
 pio=system.membus.default
 
@@ -340,6 +335,8 @@ pio_addr=8796093677568
 pio_latency=2
 pio_size=393216
 platform=system.tsunami
+ret_bad_addr=false
+ret_data=255
 system=system
 pio=system.iobus.port[9]
 
@@ -349,6 +346,8 @@ pio_addr=8804615848432
 pio_latency=2
 pio_size=8
 platform=system.tsunami
+ret_bad_addr=false
+ret_data=255
 system=system
 pio=system.iobus.port[20]
 
@@ -358,6 +357,8 @@ pio_addr=8804615848304
 pio_latency=2
 pio_size=8
 platform=system.tsunami
+ret_bad_addr=false
+ret_data=255
 system=system
 pio=system.iobus.port[21]
 
@@ -367,6 +368,8 @@ pio_addr=8804615848569
 pio_latency=2
 pio_size=8
 platform=system.tsunami
+ret_bad_addr=false
+ret_data=255
 system=system
 pio=system.iobus.port[10]
 
@@ -376,6 +379,8 @@ pio_addr=8804615848451
 pio_latency=2
 pio_size=8
 platform=system.tsunami
+ret_bad_addr=false
+ret_data=255
 system=system
 pio=system.iobus.port[12]
 
@@ -385,6 +390,8 @@ pio_addr=8804615848515
 pio_latency=2
 pio_size=8
 platform=system.tsunami
+ret_bad_addr=false
+ret_data=255
 system=system
 pio=system.iobus.port[13]
 
@@ -394,6 +401,8 @@ pio_addr=8804615848579
 pio_latency=2
 pio_size=8
 platform=system.tsunami
+ret_bad_addr=false
+ret_data=255
 system=system
 pio=system.iobus.port[14]
 
@@ -403,6 +412,8 @@ pio_addr=8804615848643
 pio_latency=2
 pio_size=8
 platform=system.tsunami
+ret_bad_addr=false
+ret_data=255
 system=system
 pio=system.iobus.port[15]
 
@@ -412,6 +423,8 @@ pio_addr=8804615848707
 pio_latency=2
 pio_size=8
 platform=system.tsunami
+ret_bad_addr=false
+ret_data=255
 system=system
 pio=system.iobus.port[16]
 
@@ -421,6 +434,8 @@ pio_addr=8804615848771
 pio_latency=2
 pio_size=8
 platform=system.tsunami
+ret_bad_addr=false
+ret_data=255
 system=system
 pio=system.iobus.port[17]
 
@@ -430,6 +445,8 @@ pio_addr=8804615848835
 pio_latency=2
 pio_size=8
 platform=system.tsunami
+ret_bad_addr=false
+ret_data=255
 system=system
 pio=system.iobus.port[18]
 
@@ -439,6 +456,8 @@ pio_addr=8804615848899
 pio_latency=2
 pio_size=8
 platform=system.tsunami
+ret_bad_addr=false
+ret_data=255
 system=system
 pio=system.iobus.port[19]
 
@@ -448,6 +467,8 @@ pio_addr=8804615850617
 pio_latency=2
 pio_size=8
 platform=system.tsunami
+ret_bad_addr=false
+ret_data=255
 system=system
 pio=system.iobus.port[11]
 
@@ -457,6 +478,8 @@ pio_addr=8804615848892
 pio_latency=2
 pio_size=8
 platform=system.tsunami
+ret_bad_addr=false
+ret_data=255
 system=system
 pio=system.iobus.port[8]
 
@@ -466,6 +489,8 @@ pio_addr=8804615848816
 pio_latency=2
 pio_size=8
 platform=system.tsunami
+ret_bad_addr=false
+ret_data=255
 system=system
 pio=system.iobus.port[3]
 
@@ -475,6 +500,8 @@ pio_addr=8804615848696
 pio_latency=2
 pio_size=8
 platform=system.tsunami
+ret_bad_addr=false
+ret_data=255
 system=system
 pio=system.iobus.port[4]
 
@@ -484,6 +511,8 @@ pio_addr=8804615848936
 pio_latency=2
 pio_size=8
 platform=system.tsunami
+ret_bad_addr=false
+ret_data=255
 system=system
 pio=system.iobus.port[5]
 
@@ -493,6 +522,8 @@ pio_addr=8804615848680
 pio_latency=2
 pio_size=8
 platform=system.tsunami
+ret_bad_addr=false
+ret_data=255
 system=system
 pio=system.iobus.port[6]
 
@@ -502,6 +533,8 @@ pio_addr=8804615848944
 pio_latency=2
 pio_size=8
 platform=system.tsunami
+ret_bad_addr=false
+ret_data=255
 system=system
 pio=system.iobus.port[7]
 
diff --git a/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing-dual/config.out b/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing-dual/config.out
index 5391d8e88..cd74278eb 100644
--- a/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing-dual/config.out
+++ b/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing-dual/config.out
@@ -70,9 +70,12 @@ system=system
 intrctrl=system.intrctrl
 
 [system.membus.responder]
-type=BadAddr
+type=IsaFake
 pio_addr=0
 pio_latency=0
+pio_size=8
+ret_bad_addr=true
+ret_data=255
 platform=system.tsunami
 system=system
 
@@ -161,6 +164,8 @@ type=IsaFake
 pio_addr=8804615848696
 pio_latency=2
 pio_size=8
+ret_bad_addr=false
+ret_data=255
 platform=system.tsunami
 system=system
 
@@ -169,6 +174,8 @@ type=IsaFake
 pio_addr=8804615848936
 pio_latency=2
 pio_size=8
+ret_bad_addr=false
+ret_data=255
 platform=system.tsunami
 system=system
 
@@ -177,6 +184,8 @@ type=IsaFake
 pio_addr=8804615848680
 pio_latency=2
 pio_size=8
+ret_bad_addr=false
+ret_data=255
 platform=system.tsunami
 system=system
 
@@ -185,6 +194,8 @@ type=IsaFake
 pio_addr=8804615848944
 pio_latency=2
 pio_size=8
+ret_bad_addr=false
+ret_data=255
 platform=system.tsunami
 system=system
 
@@ -193,6 +204,8 @@ type=IsaFake
 pio_addr=8804615848892
 pio_latency=2
 pio_size=8
+ret_bad_addr=false
+ret_data=255
 platform=system.tsunami
 system=system
 
@@ -249,6 +262,8 @@ type=IsaFake
 pio_addr=8804615848304
 pio_latency=2
 pio_size=8
+ret_bad_addr=false
+ret_data=255
 platform=system.tsunami
 system=system
 
@@ -257,6 +272,8 @@ type=IsaFake
 pio_addr=8804615848432
 pio_latency=2
 pio_size=8
+ret_bad_addr=false
+ret_data=255
 platform=system.tsunami
 system=system
 
@@ -273,6 +290,8 @@ type=IsaFake
 pio_addr=8804615848643
 pio_latency=2
 pio_size=8
+ret_bad_addr=false
+ret_data=255
 platform=system.tsunami
 system=system
 
@@ -281,6 +300,8 @@ type=IsaFake
 pio_addr=8804615848579
 pio_latency=2
 pio_size=8
+ret_bad_addr=false
+ret_data=255
 platform=system.tsunami
 system=system
 
@@ -289,6 +310,8 @@ type=IsaFake
 pio_addr=8804615848515
 pio_latency=2
 pio_size=8
+ret_bad_addr=false
+ret_data=255
 platform=system.tsunami
 system=system
 
@@ -297,6 +320,8 @@ type=IsaFake
 pio_addr=8804615848451
 pio_latency=2
 pio_size=8
+ret_bad_addr=false
+ret_data=255
 platform=system.tsunami
 system=system
 
@@ -305,6 +330,8 @@ type=IsaFake
 pio_addr=8804615848899
 pio_latency=2
 pio_size=8
+ret_bad_addr=false
+ret_data=255
 platform=system.tsunami
 system=system
 
@@ -313,6 +340,8 @@ type=IsaFake
 pio_addr=8804615848835
 pio_latency=2
 pio_size=8
+ret_bad_addr=false
+ret_data=255
 platform=system.tsunami
 system=system
 
@@ -321,6 +350,8 @@ type=IsaFake
 pio_addr=8804615848771
 pio_latency=2
 pio_size=8
+ret_bad_addr=false
+ret_data=255
 platform=system.tsunami
 system=system
 
@@ -329,6 +360,8 @@ type=IsaFake
 pio_addr=8804615848707
 pio_latency=2
 pio_size=8
+ret_bad_addr=false
+ret_data=255
 platform=system.tsunami
 system=system
 
@@ -337,6 +370,8 @@ type=IsaFake
 pio_addr=8804615850617
 pio_latency=2
 pio_size=8
+ret_bad_addr=false
+ret_data=255
 platform=system.tsunami
 system=system
 
@@ -422,6 +457,8 @@ type=IsaFake
 pio_addr=8796093677568
 pio_latency=2
 pio_size=393216
+ret_bad_addr=false
+ret_data=255
 platform=system.tsunami
 system=system
 
@@ -438,6 +475,8 @@ type=IsaFake
 pio_addr=8804615848816
 pio_latency=2
 pio_size=8
+ret_bad_addr=false
+ret_data=255
 platform=system.tsunami
 system=system
 
@@ -446,6 +485,8 @@ type=IsaFake
 pio_addr=8804615848569
 pio_latency=2
 pio_size=8
+ret_bad_addr=false
+ret_data=255
 platform=system.tsunami
 system=system
 
@@ -503,13 +544,6 @@ clock=2
 width=64
 responder_set=true
 
-[system.iobus.responder]
-type=BadAddr
-pio_addr=0
-pio_latency=0
-platform=system.tsunami
-system=system
-
 [trace]
 flags=
 start=0
diff --git a/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing-dual/stderr b/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing-dual/stderr
index bfd64fb2b..c211114c2 100644
--- a/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing-dual/stderr
+++ b/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing-dual/stderr
@@ -1,7 +1,5 @@
 Warning: rounding error > tolerance
     0.002000 rounded to 0
-Warning: rounding error > tolerance
-    0.002000 rounded to 0
       0: system.tsunami.io.rtc: Real-time clock set to Sun Jan  1 00:00:00 2006
 Listening for console connection on port 3457
 0: system.remote_gdb.listener: listening for remote gdb #0 on port 7001
diff --git a/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing/config.ini b/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing/config.ini
index 17b05cd2b..180fa2b80 100644
--- a/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing/config.ini
+++ b/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing/config.ini
@@ -143,7 +143,6 @@ cpu=system.cpu
 
 [system.iobus]
 type=Bus
-children=responder
 bus_id=0
 clock=2
 responder_set=true
@@ -151,13 +150,6 @@ width=64
 default=system.tsunami.pciconfig.pio
 port=system.bridge.side_a system.tsunami.cchip.pio system.tsunami.pchip.pio system.tsunami.fake_sm_chip.pio system.tsunami.fake_uart1.pio system.tsunami.fake_uart2.pio system.tsunami.fake_uart3.pio system.tsunami.fake_uart4.pio system.tsunami.fake_ppc.pio system.tsunami.fake_OROM.pio system.tsunami.fake_pnp_addr.pio system.tsunami.fake_pnp_write.pio system.tsunami.fake_pnp_read0.pio system.tsunami.fake_pnp_read1.pio system.tsunami.fake_pnp_read2.pio system.tsunami.fake_pnp_read3.pio system.tsunami.fake_pnp_read4.pio system.tsunami.fake_pnp_read5.pio system.tsunami.fake_pnp_read6.pio system.tsunami.fake_pnp_read7.pio system.tsunami.fake_ata0.pio system.tsunami.fake_ata1.pio system.tsunami.fb.pio system.tsunami.io.pio system.tsunami.uart.pio system.tsunami.console.pio system.tsunami.ide.pio system.tsunami.ethernet.pio system.tsunami.ethernet.config system.tsunami.ethernet.dma system.tsunami.ide.config system.tsunami.ide.dma
 
-[system.iobus.responder]
-type=BadAddr
-pio_addr=0
-pio_latency=0
-platform=system.tsunami
-system=system
-
 [system.membus]
 type=Bus
 children=responder
@@ -169,10 +161,13 @@ default=system.membus.responder.pio
 port=system.bridge.side_b system.physmem.port system.cpu.icache_port system.cpu.dcache_port
 
 [system.membus.responder]
-type=BadAddr
+type=IsaFake
 pio_addr=0
 pio_latency=0
+pio_size=8
 platform=system.tsunami
+ret_bad_addr=true
+ret_data=255
 system=system
 pio=system.membus.default
 
@@ -312,6 +307,8 @@ pio_addr=8796093677568
 pio_latency=2
 pio_size=393216
 platform=system.tsunami
+ret_bad_addr=false
+ret_data=255
 system=system
 pio=system.iobus.port[9]
 
@@ -321,6 +318,8 @@ pio_addr=8804615848432
 pio_latency=2
 pio_size=8
 platform=system.tsunami
+ret_bad_addr=false
+ret_data=255
 system=system
 pio=system.iobus.port[20]
 
@@ -330,6 +329,8 @@ pio_addr=8804615848304
 pio_latency=2
 pio_size=8
 platform=system.tsunami
+ret_bad_addr=false
+ret_data=255
 system=system
 pio=system.iobus.port[21]
 
@@ -339,6 +340,8 @@ pio_addr=8804615848569
 pio_latency=2
 pio_size=8
 platform=system.tsunami
+ret_bad_addr=false
+ret_data=255
 system=system
 pio=system.iobus.port[10]
 
@@ -348,6 +351,8 @@ pio_addr=8804615848451
 pio_latency=2
 pio_size=8
 platform=system.tsunami
+ret_bad_addr=false
+ret_data=255
 system=system
 pio=system.iobus.port[12]
 
@@ -357,6 +362,8 @@ pio_addr=8804615848515
 pio_latency=2
 pio_size=8
 platform=system.tsunami
+ret_bad_addr=false
+ret_data=255
 system=system
 pio=system.iobus.port[13]
 
@@ -366,6 +373,8 @@ pio_addr=8804615848579
 pio_latency=2
 pio_size=8
 platform=system.tsunami
+ret_bad_addr=false
+ret_data=255
 system=system
 pio=system.iobus.port[14]
 
@@ -375,6 +384,8 @@ pio_addr=8804615848643
 pio_latency=2
 pio_size=8
 platform=system.tsunami
+ret_bad_addr=false
+ret_data=255
 system=system
 pio=system.iobus.port[15]
 
@@ -384,6 +395,8 @@ pio_addr=8804615848707
 pio_latency=2
 pio_size=8
 platform=system.tsunami
+ret_bad_addr=false
+ret_data=255
 system=system
 pio=system.iobus.port[16]
 
@@ -393,6 +406,8 @@ pio_addr=8804615848771
 pio_latency=2
 pio_size=8
 platform=system.tsunami
+ret_bad_addr=false
+ret_data=255
 system=system
 pio=system.iobus.port[17]
 
@@ -402,6 +417,8 @@ pio_addr=8804615848835
 pio_latency=2
 pio_size=8
 platform=system.tsunami
+ret_bad_addr=false
+ret_data=255
 system=system
 pio=system.iobus.port[18]
 
@@ -411,6 +428,8 @@ pio_addr=8804615848899
 pio_latency=2
 pio_size=8
 platform=system.tsunami
+ret_bad_addr=false
+ret_data=255
 system=system
 pio=system.iobus.port[19]
 
@@ -420,6 +439,8 @@ pio_addr=8804615850617
 pio_latency=2
 pio_size=8
 platform=system.tsunami
+ret_bad_addr=false
+ret_data=255
 system=system
 pio=system.iobus.port[11]
 
@@ -429,6 +450,8 @@ pio_addr=8804615848892
 pio_latency=2
 pio_size=8
 platform=system.tsunami
+ret_bad_addr=false
+ret_data=255
 system=system
 pio=system.iobus.port[8]
 
@@ -438,6 +461,8 @@ pio_addr=8804615848816
 pio_latency=2
 pio_size=8
 platform=system.tsunami
+ret_bad_addr=false
+ret_data=255
 system=system
 pio=system.iobus.port[3]
 
@@ -447,6 +472,8 @@ pio_addr=8804615848696
 pio_latency=2
 pio_size=8
 platform=system.tsunami
+ret_bad_addr=false
+ret_data=255
 system=system
 pio=system.iobus.port[4]
 
@@ -456,6 +483,8 @@ pio_addr=8804615848936
 pio_latency=2
 pio_size=8
 platform=system.tsunami
+ret_bad_addr=false
+ret_data=255
 system=system
 pio=system.iobus.port[5]
 
@@ -465,6 +494,8 @@ pio_addr=8804615848680
 pio_latency=2
 pio_size=8
 platform=system.tsunami
+ret_bad_addr=false
+ret_data=255
 system=system
 pio=system.iobus.port[6]
 
@@ -474,6 +505,8 @@ pio_addr=8804615848944
 pio_latency=2
 pio_size=8
 platform=system.tsunami
+ret_bad_addr=false
+ret_data=255
 system=system
 pio=system.iobus.port[7]
 
diff --git a/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing/config.out b/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing/config.out
index 6f0210a4c..f88a750d9 100644
--- a/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing/config.out
+++ b/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing/config.out
@@ -70,9 +70,12 @@ system=system
 intrctrl=system.intrctrl
 
 [system.membus.responder]
-type=BadAddr
+type=IsaFake
 pio_addr=0
 pio_latency=0
+pio_size=8
+ret_bad_addr=true
+ret_data=255
 platform=system.tsunami
 system=system
 
@@ -134,6 +137,8 @@ type=IsaFake
 pio_addr=8804615848696
 pio_latency=2
 pio_size=8
+ret_bad_addr=false
+ret_data=255
 platform=system.tsunami
 system=system
 
@@ -142,6 +147,8 @@ type=IsaFake
 pio_addr=8804615848936
 pio_latency=2
 pio_size=8
+ret_bad_addr=false
+ret_data=255
 platform=system.tsunami
 system=system
 
@@ -150,6 +157,8 @@ type=IsaFake
 pio_addr=8804615848680
 pio_latency=2
 pio_size=8
+ret_bad_addr=false
+ret_data=255
 platform=system.tsunami
 system=system
 
@@ -158,6 +167,8 @@ type=IsaFake
 pio_addr=8804615848944
 pio_latency=2
 pio_size=8
+ret_bad_addr=false
+ret_data=255
 platform=system.tsunami
 system=system
 
@@ -166,6 +177,8 @@ type=IsaFake
 pio_addr=8804615848892
 pio_latency=2
 pio_size=8
+ret_bad_addr=false
+ret_data=255
 platform=system.tsunami
 system=system
 
@@ -222,6 +235,8 @@ type=IsaFake
 pio_addr=8804615848304
 pio_latency=2
 pio_size=8
+ret_bad_addr=false
+ret_data=255
 platform=system.tsunami
 system=system
 
@@ -230,6 +245,8 @@ type=IsaFake
 pio_addr=8804615848432
 pio_latency=2
 pio_size=8
+ret_bad_addr=false
+ret_data=255
 platform=system.tsunami
 system=system
 
@@ -246,6 +263,8 @@ type=IsaFake
 pio_addr=8804615848643
 pio_latency=2
 pio_size=8
+ret_bad_addr=false
+ret_data=255
 platform=system.tsunami
 system=system
 
@@ -254,6 +273,8 @@ type=IsaFake
 pio_addr=8804615848579
 pio_latency=2
 pio_size=8
+ret_bad_addr=false
+ret_data=255
 platform=system.tsunami
 system=system
 
@@ -262,6 +283,8 @@ type=IsaFake
 pio_addr=8804615848515
 pio_latency=2
 pio_size=8
+ret_bad_addr=false
+ret_data=255
 platform=system.tsunami
 system=system
 
@@ -270,6 +293,8 @@ type=IsaFake
 pio_addr=8804615848451
 pio_latency=2
 pio_size=8
+ret_bad_addr=false
+ret_data=255
 platform=system.tsunami
 system=system
 
@@ -278,6 +303,8 @@ type=IsaFake
 pio_addr=8804615848899
 pio_latency=2
 pio_size=8
+ret_bad_addr=false
+ret_data=255
 platform=system.tsunami
 system=system
 
@@ -286,6 +313,8 @@ type=IsaFake
 pio_addr=8804615848835
 pio_latency=2
 pio_size=8
+ret_bad_addr=false
+ret_data=255
 platform=system.tsunami
 system=system
 
@@ -294,6 +323,8 @@ type=IsaFake
 pio_addr=8804615848771
 pio_latency=2
 pio_size=8
+ret_bad_addr=false
+ret_data=255
 platform=system.tsunami
 system=system
 
@@ -302,6 +333,8 @@ type=IsaFake
 pio_addr=8804615848707
 pio_latency=2
 pio_size=8
+ret_bad_addr=false
+ret_data=255
 platform=system.tsunami
 system=system
 
@@ -310,6 +343,8 @@ type=IsaFake
 pio_addr=8804615850617
 pio_latency=2
 pio_size=8
+ret_bad_addr=false
+ret_data=255
 platform=system.tsunami
 system=system
 
@@ -395,6 +430,8 @@ type=IsaFake
 pio_addr=8796093677568
 pio_latency=2
 pio_size=393216
+ret_bad_addr=false
+ret_data=255
 platform=system.tsunami
 system=system
 
@@ -411,6 +448,8 @@ type=IsaFake
 pio_addr=8804615848816
 pio_latency=2
 pio_size=8
+ret_bad_addr=false
+ret_data=255
 platform=system.tsunami
 system=system
 
@@ -419,6 +458,8 @@ type=IsaFake
 pio_addr=8804615848569
 pio_latency=2
 pio_size=8
+ret_bad_addr=false
+ret_data=255
 platform=system.tsunami
 system=system
 
@@ -476,13 +517,6 @@ clock=2
 width=64
 responder_set=true
 
-[system.iobus.responder]
-type=BadAddr
-pio_addr=0
-pio_latency=0
-platform=system.tsunami
-system=system
-
 [trace]
 flags=
 start=0
diff --git a/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing/stderr b/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing/stderr
index dbafd6309..a8bcb04d9 100644
--- a/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing/stderr
+++ b/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing/stderr
@@ -1,7 +1,5 @@
 Warning: rounding error > tolerance
     0.002000 rounded to 0
-Warning: rounding error > tolerance
-    0.002000 rounded to 0
       0: system.tsunami.io.rtc: Real-time clock set to Sun Jan  1 00:00:00 2006
 Listening for console connection on port 3456
 0: system.remote_gdb.listener: listening for remote gdb #0 on port 7000