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

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

--HG--
extra : convert_revision : dc165840841bdd88e40111b98d1be493441703f0

12 files changed, 336 insertions, 76 deletions

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