stats: update stats for no_value -> nan

Lots of accumulated older changes too.

1 files changed, 96 insertions, 88 deletions

diff --git a/tests/quick/fs/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/config.ini b/tests/quick/fs/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/config.ini
index 7a0c1d8ae..fdc643fe0 100644
--- a/tests/quick/fs/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/config.ini
+++ b/tests/quick/fs/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/config.ini
@@ -11,8 +11,7 @@ mem_mode=atomic
 memories=drivesys.physmem
 num_work_ids=16
 pal=/dist/m5/system/binaries/ts_osfpal
-physmem=drivesys.physmem
-readfile=/tmp/gem5.ali/configs/boot/netperf-server.rcS
+readfile=/n/piton/z/nate/work/m5/work/configs/boot/netperf-server.rcS
 symbolfile=
 system_rev=1024
 system_type=34
@@ -23,7 +22,7 @@ work_cpus_ckpt_count=0
 work_end_ckpt_count=0
 work_end_exit_count=0
 work_item_id=-1
-system_port=drivesys.membus.port[2]
+system_port=drivesys.membus.slave[0]
 
 [drivesys.bridge]
 type=Bridge
@@ -33,8 +32,8 @@ ranges=8796093022208:18446744073709551615
 req_size=16
 resp_size=16
 write_ack=false
-master=drivesys.iobus.port[0]
-slave=drivesys.membus.port[0]
+master=drivesys.iobus.slave[0]
+slave=drivesys.membus.master[0]
 
 [drivesys.cpu]
 type=AtomicSimpleCPU
@@ -47,6 +46,7 @@ do_checkpoint_insts=true
 do_quiesce=true
 do_statistics_insts=true
 dtb=drivesys.cpu.dtb
+fastmem=false
 function_trace=false
 function_trace_start=0
 interrupts=drivesys.cpu.interrupts
@@ -65,8 +65,8 @@ system=drivesys
 tracer=drivesys.cpu.tracer
 width=1
 workload=
-dcache_port=drivesys.membus.port[4]
-icache_port=drivesys.membus.port[3]
+dcache_port=drivesys.membus.slave[2]
+icache_port=drivesys.membus.slave[1]
 
 [drivesys.cpu.dtb]
 type=AlphaTLB
@@ -134,8 +134,8 @@ ranges=0:8589934592
 req_size=16
 resp_size=16
 write_ack=false
-master=drivesys.membus.port[5]
-slave=drivesys.iobus.port[32]
+master=drivesys.membus.slave[3]
+slave=drivesys.iobus.master[29]
 
 [drivesys.iobus]
 type=Bus
@@ -146,7 +146,8 @@ header_cycles=1
 use_default_range=true
 width=64
 default=drivesys.tsunami.pciconfig.pio
-port=drivesys.bridge.master drivesys.tsunami.cchip.pio drivesys.tsunami.pchip.pio drivesys.tsunami.fake_sm_chip.pio drivesys.tsunami.fake_uart1.pio drivesys.tsunami.fake_uart2.pio drivesys.tsunami.fake_uart3.pio drivesys.tsunami.fake_uart4.pio drivesys.tsunami.fake_ppc.pio drivesys.tsunami.fake_OROM.pio drivesys.tsunami.fake_pnp_addr.pio drivesys.tsunami.fake_pnp_write.pio drivesys.tsunami.fake_pnp_read0.pio drivesys.tsunami.fake_pnp_read1.pio drivesys.tsunami.fake_pnp_read2.pio drivesys.tsunami.fake_pnp_read3.pio drivesys.tsunami.fake_pnp_read4.pio drivesys.tsunami.fake_pnp_read5.pio drivesys.tsunami.fake_pnp_read6.pio drivesys.tsunami.fake_pnp_read7.pio drivesys.tsunami.fake_ata0.pio drivesys.tsunami.fake_ata1.pio drivesys.tsunami.fb.pio drivesys.tsunami.io.pio drivesys.tsunami.uart.pio drivesys.tsunami.backdoor.pio drivesys.tsunami.ide.pio drivesys.tsunami.ide.config drivesys.tsunami.ide.dma drivesys.tsunami.ethernet.pio drivesys.tsunami.ethernet.config drivesys.tsunami.ethernet.dma drivesys.iobridge.slave
+master=drivesys.tsunami.cchip.pio drivesys.tsunami.pchip.pio drivesys.tsunami.fake_sm_chip.pio drivesys.tsunami.fake_uart1.pio drivesys.tsunami.fake_uart2.pio drivesys.tsunami.fake_uart3.pio drivesys.tsunami.fake_uart4.pio drivesys.tsunami.fake_ppc.pio drivesys.tsunami.fake_OROM.pio drivesys.tsunami.fake_pnp_addr.pio drivesys.tsunami.fake_pnp_write.pio drivesys.tsunami.fake_pnp_read0.pio drivesys.tsunami.fake_pnp_read1.pio drivesys.tsunami.fake_pnp_read2.pio drivesys.tsunami.fake_pnp_read3.pio drivesys.tsunami.fake_pnp_read4.pio drivesys.tsunami.fake_pnp_read5.pio drivesys.tsunami.fake_pnp_read6.pio drivesys.tsunami.fake_pnp_read7.pio drivesys.tsunami.fake_ata0.pio drivesys.tsunami.fake_ata1.pio drivesys.tsunami.fb.pio drivesys.tsunami.io.pio drivesys.tsunami.uart.pio drivesys.tsunami.backdoor.pio drivesys.tsunami.ide.pio drivesys.tsunami.ide.config drivesys.tsunami.ethernet.pio drivesys.tsunami.ethernet.config drivesys.iobridge.slave
+slave=drivesys.bridge.master drivesys.tsunami.ide.dma drivesys.tsunami.ethernet.dma
 
 [drivesys.membus]
 type=Bus
@@ -158,7 +159,8 @@ header_cycles=1
 use_default_range=false
 width=64
 default=drivesys.membus.badaddr_responder.pio
-port=drivesys.bridge.slave drivesys.physmem.port[0] drivesys.system_port drivesys.cpu.icache_port drivesys.cpu.dcache_port drivesys.iobridge.master
+master=drivesys.bridge.slave drivesys.physmem.port[0]
+slave=drivesys.system_port drivesys.cpu.icache_port drivesys.cpu.dcache_port drivesys.iobridge.master
 
 [drivesys.membus.badaddr_responder]
 type=IsaFake
@@ -177,14 +179,16 @@ warn_access=
 pio=drivesys.membus.default
 
 [drivesys.physmem]
-type=PhysicalMemory
+type=SimpleMemory
+conf_table_reported=false
 file=
+in_addr_map=true
 latency=30000
 latency_var=0
 null=false
 range=0:134217727
 zero=false
-port=drivesys.membus.port[1]
+port=drivesys.membus.master[1]
 
 [drivesys.simple_disk]
 type=SimpleDisk
@@ -219,7 +223,7 @@ pio_latency=1000
 platform=drivesys.tsunami
 system=drivesys
 terminal=drivesys.terminal
-pio=drivesys.iobus.port[25]
+pio=drivesys.iobus.master[24]
 
 [drivesys.tsunami.cchip]
 type=TsunamiCChip
@@ -227,7 +231,7 @@ pio_addr=8803072344064
 pio_latency=1000
 system=drivesys
 tsunami=drivesys.tsunami
-pio=drivesys.iobus.port[1]
+pio=drivesys.iobus.master[0]
 
 [drivesys.tsunami.ethernet]
 type=NSGigE
@@ -296,10 +300,10 @@ system=drivesys
 tx_delay=1000000
 tx_fifo_size=524288
 tx_thread=false
-config=drivesys.iobus.port[30]
-dma=drivesys.iobus.port[31]
+config=drivesys.iobus.master[28]
+dma=drivesys.iobus.slave[2]
 interface=etherlink.int1
-pio=drivesys.iobus.port[29]
+pio=drivesys.iobus.master[27]
 
 [drivesys.tsunami.fake_OROM]
 type=IsaFake
@@ -315,7 +319,7 @@ ret_data8=255
 system=drivesys
 update_data=false
 warn_access=
-pio=drivesys.iobus.port[9]
+pio=drivesys.iobus.master[8]
 
 [drivesys.tsunami.fake_ata0]
 type=IsaFake
@@ -331,7 +335,7 @@ ret_data8=255
 system=drivesys
 update_data=false
 warn_access=
-pio=drivesys.iobus.port[20]
+pio=drivesys.iobus.master[19]
 
 [drivesys.tsunami.fake_ata1]
 type=IsaFake
@@ -347,7 +351,7 @@ ret_data8=255
 system=drivesys
 update_data=false
 warn_access=
-pio=drivesys.iobus.port[21]
+pio=drivesys.iobus.master[20]
 
 [drivesys.tsunami.fake_pnp_addr]
 type=IsaFake
@@ -363,7 +367,7 @@ ret_data8=255
 system=drivesys
 update_data=false
 warn_access=
-pio=drivesys.iobus.port[10]
+pio=drivesys.iobus.master[9]
 
 [drivesys.tsunami.fake_pnp_read0]
 type=IsaFake
@@ -379,7 +383,7 @@ ret_data8=255
 system=drivesys
 update_data=false
 warn_access=
-pio=drivesys.iobus.port[12]
+pio=drivesys.iobus.master[11]
 
 [drivesys.tsunami.fake_pnp_read1]
 type=IsaFake
@@ -395,7 +399,7 @@ ret_data8=255
 system=drivesys
 update_data=false
 warn_access=
-pio=drivesys.iobus.port[13]
+pio=drivesys.iobus.master[12]
 
 [drivesys.tsunami.fake_pnp_read2]
 type=IsaFake
@@ -411,7 +415,7 @@ ret_data8=255
 system=drivesys
 update_data=false
 warn_access=
-pio=drivesys.iobus.port[14]
+pio=drivesys.iobus.master[13]
 
 [drivesys.tsunami.fake_pnp_read3]
 type=IsaFake
@@ -427,7 +431,7 @@ ret_data8=255
 system=drivesys
 update_data=false
 warn_access=
-pio=drivesys.iobus.port[15]
+pio=drivesys.iobus.master[14]
 
 [drivesys.tsunami.fake_pnp_read4]
 type=IsaFake
@@ -443,7 +447,7 @@ ret_data8=255
 system=drivesys
 update_data=false
 warn_access=
-pio=drivesys.iobus.port[16]
+pio=drivesys.iobus.master[15]
 
 [drivesys.tsunami.fake_pnp_read5]
 type=IsaFake
@@ -459,7 +463,7 @@ ret_data8=255
 system=drivesys
 update_data=false
 warn_access=
-pio=drivesys.iobus.port[17]
+pio=drivesys.iobus.master[16]
 
 [drivesys.tsunami.fake_pnp_read6]
 type=IsaFake
@@ -475,7 +479,7 @@ ret_data8=255
 system=drivesys
 update_data=false
 warn_access=
-pio=drivesys.iobus.port[18]
+pio=drivesys.iobus.master[17]
 
 [drivesys.tsunami.fake_pnp_read7]
 type=IsaFake
@@ -491,7 +495,7 @@ ret_data8=255
 system=drivesys
 update_data=false
 warn_access=
-pio=drivesys.iobus.port[19]
+pio=drivesys.iobus.master[18]
 
 [drivesys.tsunami.fake_pnp_write]
 type=IsaFake
@@ -507,7 +511,7 @@ ret_data8=255
 system=drivesys
 update_data=false
 warn_access=
-pio=drivesys.iobus.port[11]
+pio=drivesys.iobus.master[10]
 
 [drivesys.tsunami.fake_ppc]
 type=IsaFake
@@ -523,7 +527,7 @@ ret_data8=255
 system=drivesys
 update_data=false
 warn_access=
-pio=drivesys.iobus.port[8]
+pio=drivesys.iobus.master[7]
 
 [drivesys.tsunami.fake_sm_chip]
 type=IsaFake
@@ -539,7 +543,7 @@ ret_data8=255
 system=drivesys
 update_data=false
 warn_access=
-pio=drivesys.iobus.port[3]
+pio=drivesys.iobus.master[2]
 
 [drivesys.tsunami.fake_uart1]
 type=IsaFake
@@ -555,7 +559,7 @@ ret_data8=255
 system=drivesys
 update_data=false
 warn_access=
-pio=drivesys.iobus.port[4]
+pio=drivesys.iobus.master[3]
 
 [drivesys.tsunami.fake_uart2]
 type=IsaFake
@@ -571,7 +575,7 @@ ret_data8=255
 system=drivesys
 update_data=false
 warn_access=
-pio=drivesys.iobus.port[5]
+pio=drivesys.iobus.master[4]
 
 [drivesys.tsunami.fake_uart3]
 type=IsaFake
@@ -587,7 +591,7 @@ ret_data8=255
 system=drivesys
 update_data=false
 warn_access=
-pio=drivesys.iobus.port[6]
+pio=drivesys.iobus.master[5]
 
 [drivesys.tsunami.fake_uart4]
 type=IsaFake
@@ -603,7 +607,7 @@ ret_data8=255
 system=drivesys
 update_data=false
 warn_access=
-pio=drivesys.iobus.port[7]
+pio=drivesys.iobus.master[6]
 
 [drivesys.tsunami.fb]
 type=BadDevice
@@ -611,7 +615,7 @@ devicename=FrameBuffer
 pio_addr=8804615848912
 pio_latency=1000
 system=drivesys
-pio=drivesys.iobus.port[22]
+pio=drivesys.iobus.master[21]
 
 [drivesys.tsunami.ide]
 type=IdeController
@@ -665,9 +669,9 @@ pci_func=0
 pio_latency=1000
 platform=drivesys.tsunami
 system=drivesys
-config=drivesys.iobus.port[27]
-dma=drivesys.iobus.port[28]
-pio=drivesys.iobus.port[26]
+config=drivesys.iobus.master[26]
+dma=drivesys.iobus.slave[1]
+pio=drivesys.iobus.master[25]
 
 [drivesys.tsunami.io]
 type=TsunamiIO
@@ -678,7 +682,7 @@ system=drivesys
 time=Thu Jan  1 00:00:00 2009
 tsunami=drivesys.tsunami
 year_is_bcd=false
-pio=drivesys.iobus.port[23]
+pio=drivesys.iobus.master[22]
 
 [drivesys.tsunami.pchip]
 type=TsunamiPChip
@@ -686,7 +690,7 @@ pio_addr=8802535473152
 pio_latency=1000
 system=drivesys
 tsunami=drivesys.tsunami
-pio=drivesys.iobus.port[2]
+pio=drivesys.iobus.master[1]
 
 [drivesys.tsunami.pciconfig]
 type=PciConfigAll
@@ -704,7 +708,7 @@ pio_latency=1000
 platform=drivesys.tsunami
 system=drivesys
 terminal=drivesys.terminal
-pio=drivesys.iobus.port[24]
+pio=drivesys.iobus.master[23]
 
 [etherdump]
 type=EtherDump
@@ -741,8 +745,7 @@ mem_mode=atomic
 memories=testsys.physmem
 num_work_ids=16
 pal=/dist/m5/system/binaries/ts_osfpal
-physmem=testsys.physmem
-readfile=/tmp/gem5.ali/configs/boot/netperf-stream-client.rcS
+readfile=/n/piton/z/nate/work/m5/work/configs/boot/netperf-stream-client.rcS
 symbolfile=
 system_rev=1024
 system_type=34
@@ -753,7 +756,7 @@ work_cpus_ckpt_count=0
 work_end_ckpt_count=0
 work_end_exit_count=0
 work_item_id=-1
-system_port=testsys.membus.port[2]
+system_port=testsys.membus.slave[0]
 
 [testsys.bridge]
 type=Bridge
@@ -763,8 +766,8 @@ ranges=8796093022208:18446744073709551615
 req_size=16
 resp_size=16
 write_ack=false
-master=testsys.iobus.port[0]
-slave=testsys.membus.port[0]
+master=testsys.iobus.slave[0]
+slave=testsys.membus.master[0]
 
 [testsys.cpu]
 type=AtomicSimpleCPU
@@ -777,6 +780,7 @@ do_checkpoint_insts=true
 do_quiesce=true
 do_statistics_insts=true
 dtb=testsys.cpu.dtb
+fastmem=false
 function_trace=false
 function_trace_start=0
 interrupts=testsys.cpu.interrupts
@@ -795,8 +799,8 @@ system=testsys
 tracer=testsys.cpu.tracer
 width=1
 workload=
-dcache_port=testsys.membus.port[4]
-icache_port=testsys.membus.port[3]
+dcache_port=testsys.membus.slave[2]
+icache_port=testsys.membus.slave[1]
 
 [testsys.cpu.dtb]
 type=AlphaTLB
@@ -864,8 +868,8 @@ ranges=0:8589934592
 req_size=16
 resp_size=16
 write_ack=false
-master=testsys.membus.port[5]
-slave=testsys.iobus.port[32]
+master=testsys.membus.slave[3]
+slave=testsys.iobus.master[29]
 
 [testsys.iobus]
 type=Bus
@@ -876,7 +880,8 @@ header_cycles=1
 use_default_range=true
 width=64
 default=testsys.tsunami.pciconfig.pio
-port=testsys.bridge.master testsys.tsunami.cchip.pio testsys.tsunami.pchip.pio testsys.tsunami.fake_sm_chip.pio testsys.tsunami.fake_uart1.pio testsys.tsunami.fake_uart2.pio testsys.tsunami.fake_uart3.pio testsys.tsunami.fake_uart4.pio testsys.tsunami.fake_ppc.pio testsys.tsunami.fake_OROM.pio testsys.tsunami.fake_pnp_addr.pio testsys.tsunami.fake_pnp_write.pio testsys.tsunami.fake_pnp_read0.pio testsys.tsunami.fake_pnp_read1.pio testsys.tsunami.fake_pnp_read2.pio testsys.tsunami.fake_pnp_read3.pio testsys.tsunami.fake_pnp_read4.pio testsys.tsunami.fake_pnp_read5.pio testsys.tsunami.fake_pnp_read6.pio testsys.tsunami.fake_pnp_read7.pio testsys.tsunami.fake_ata0.pio testsys.tsunami.fake_ata1.pio testsys.tsunami.fb.pio testsys.tsunami.io.pio testsys.tsunami.uart.pio testsys.tsunami.backdoor.pio testsys.tsunami.ide.pio testsys.tsunami.ide.config testsys.tsunami.ide.dma testsys.tsunami.ethernet.pio testsys.tsunami.ethernet.config testsys.tsunami.ethernet.dma testsys.iobridge.slave
+master=testsys.tsunami.cchip.pio testsys.tsunami.pchip.pio testsys.tsunami.fake_sm_chip.pio testsys.tsunami.fake_uart1.pio testsys.tsunami.fake_uart2.pio testsys.tsunami.fake_uart3.pio testsys.tsunami.fake_uart4.pio testsys.tsunami.fake_ppc.pio testsys.tsunami.fake_OROM.pio testsys.tsunami.fake_pnp_addr.pio testsys.tsunami.fake_pnp_write.pio testsys.tsunami.fake_pnp_read0.pio testsys.tsunami.fake_pnp_read1.pio testsys.tsunami.fake_pnp_read2.pio testsys.tsunami.fake_pnp_read3.pio testsys.tsunami.fake_pnp_read4.pio testsys.tsunami.fake_pnp_read5.pio testsys.tsunami.fake_pnp_read6.pio testsys.tsunami.fake_pnp_read7.pio testsys.tsunami.fake_ata0.pio testsys.tsunami.fake_ata1.pio testsys.tsunami.fb.pio testsys.tsunami.io.pio testsys.tsunami.uart.pio testsys.tsunami.backdoor.pio testsys.tsunami.ide.pio testsys.tsunami.ide.config testsys.tsunami.ethernet.pio testsys.tsunami.ethernet.config testsys.iobridge.slave
+slave=testsys.bridge.master testsys.tsunami.ide.dma testsys.tsunami.ethernet.dma
 
 [testsys.membus]
 type=Bus
@@ -888,7 +893,8 @@ header_cycles=1
 use_default_range=false
 width=64
 default=testsys.membus.badaddr_responder.pio
-port=testsys.bridge.slave testsys.physmem.port[0] testsys.system_port testsys.cpu.icache_port testsys.cpu.dcache_port testsys.iobridge.master
+master=testsys.bridge.slave testsys.physmem.port[0]
+slave=testsys.system_port testsys.cpu.icache_port testsys.cpu.dcache_port testsys.iobridge.master
 
 [testsys.membus.badaddr_responder]
 type=IsaFake
@@ -907,14 +913,16 @@ warn_access=
 pio=testsys.membus.default
 
 [testsys.physmem]
-type=PhysicalMemory
+type=SimpleMemory
+conf_table_reported=false
 file=
+in_addr_map=true
 latency=30000
 latency_var=0
 null=false
 range=0:134217727
 zero=false
-port=testsys.membus.port[1]
+port=testsys.membus.master[1]
 
 [testsys.simple_disk]
 type=SimpleDisk
@@ -949,7 +957,7 @@ pio_latency=1000
 platform=testsys.tsunami
 system=testsys
 terminal=testsys.terminal
-pio=testsys.iobus.port[25]
+pio=testsys.iobus.master[24]
 
 [testsys.tsunami.cchip]
 type=TsunamiCChip
@@ -957,7 +965,7 @@ pio_addr=8803072344064
 pio_latency=1000
 system=testsys
 tsunami=testsys.tsunami
-pio=testsys.iobus.port[1]
+pio=testsys.iobus.master[0]
 
 [testsys.tsunami.ethernet]
 type=NSGigE
@@ -1026,10 +1034,10 @@ system=testsys
 tx_delay=1000000
 tx_fifo_size=524288
 tx_thread=false
-config=testsys.iobus.port[30]
-dma=testsys.iobus.port[31]
+config=testsys.iobus.master[28]
+dma=testsys.iobus.slave[2]
 interface=etherlink.int0
-pio=testsys.iobus.port[29]
+pio=testsys.iobus.master[27]
 
 [testsys.tsunami.fake_OROM]
 type=IsaFake
@@ -1045,7 +1053,7 @@ ret_data8=255
 system=testsys
 update_data=false
 warn_access=
-pio=testsys.iobus.port[9]
+pio=testsys.iobus.master[8]
 
 [testsys.tsunami.fake_ata0]
 type=IsaFake
@@ -1061,7 +1069,7 @@ ret_data8=255
 system=testsys
 update_data=false
 warn_access=
-pio=testsys.iobus.port[20]
+pio=testsys.iobus.master[19]
 
 [testsys.tsunami.fake_ata1]
 type=IsaFake
@@ -1077,7 +1085,7 @@ ret_data8=255
 system=testsys
 update_data=false
 warn_access=
-pio=testsys.iobus.port[21]
+pio=testsys.iobus.master[20]
 
 [testsys.tsunami.fake_pnp_addr]
 type=IsaFake
@@ -1093,7 +1101,7 @@ ret_data8=255
 system=testsys
 update_data=false
 warn_access=
-pio=testsys.iobus.port[10]
+pio=testsys.iobus.master[9]
 
 [testsys.tsunami.fake_pnp_read0]
 type=IsaFake
@@ -1109,7 +1117,7 @@ ret_data8=255
 system=testsys
 update_data=false
 warn_access=
-pio=testsys.iobus.port[12]
+pio=testsys.iobus.master[11]
 
 [testsys.tsunami.fake_pnp_read1]
 type=IsaFake
@@ -1125,7 +1133,7 @@ ret_data8=255
 system=testsys
 update_data=false
 warn_access=
-pio=testsys.iobus.port[13]
+pio=testsys.iobus.master[12]
 
 [testsys.tsunami.fake_pnp_read2]
 type=IsaFake
@@ -1141,7 +1149,7 @@ ret_data8=255
 system=testsys
 update_data=false
 warn_access=
-pio=testsys.iobus.port[14]
+pio=testsys.iobus.master[13]
 
 [testsys.tsunami.fake_pnp_read3]
 type=IsaFake
@@ -1157,7 +1165,7 @@ ret_data8=255
 system=testsys
 update_data=false
 warn_access=
-pio=testsys.iobus.port[15]
+pio=testsys.iobus.master[14]
 
 [testsys.tsunami.fake_pnp_read4]
 type=IsaFake
@@ -1173,7 +1181,7 @@ ret_data8=255
 system=testsys
 update_data=false
 warn_access=
-pio=testsys.iobus.port[16]
+pio=testsys.iobus.master[15]
 
 [testsys.tsunami.fake_pnp_read5]
 type=IsaFake
@@ -1189,7 +1197,7 @@ ret_data8=255
 system=testsys
 update_data=false
 warn_access=
-pio=testsys.iobus.port[17]
+pio=testsys.iobus.master[16]
 
 [testsys.tsunami.fake_pnp_read6]
 type=IsaFake
@@ -1205,7 +1213,7 @@ ret_data8=255
 system=testsys
 update_data=false
 warn_access=
-pio=testsys.iobus.port[18]
+pio=testsys.iobus.master[17]
 
 [testsys.tsunami.fake_pnp_read7]
 type=IsaFake
@@ -1221,7 +1229,7 @@ ret_data8=255
 system=testsys
 update_data=false
 warn_access=
-pio=testsys.iobus.port[19]
+pio=testsys.iobus.master[18]
 
 [testsys.tsunami.fake_pnp_write]
 type=IsaFake
@@ -1237,7 +1245,7 @@ ret_data8=255
 system=testsys
 update_data=false
 warn_access=
-pio=testsys.iobus.port[11]
+pio=testsys.iobus.master[10]
 
 [testsys.tsunami.fake_ppc]
 type=IsaFake
@@ -1253,7 +1261,7 @@ ret_data8=255
 system=testsys
 update_data=false
 warn_access=
-pio=testsys.iobus.port[8]
+pio=testsys.iobus.master[7]
 
 [testsys.tsunami.fake_sm_chip]
 type=IsaFake
@@ -1269,7 +1277,7 @@ ret_data8=255
 system=testsys
 update_data=false
 warn_access=
-pio=testsys.iobus.port[3]
+pio=testsys.iobus.master[2]
 
 [testsys.tsunami.fake_uart1]
 type=IsaFake
@@ -1285,7 +1293,7 @@ ret_data8=255
 system=testsys
 update_data=false
 warn_access=
-pio=testsys.iobus.port[4]
+pio=testsys.iobus.master[3]
 
 [testsys.tsunami.fake_uart2]
 type=IsaFake
@@ -1301,7 +1309,7 @@ ret_data8=255
 system=testsys
 update_data=false
 warn_access=
-pio=testsys.iobus.port[5]
+pio=testsys.iobus.master[4]
 
 [testsys.tsunami.fake_uart3]
 type=IsaFake
@@ -1317,7 +1325,7 @@ ret_data8=255
 system=testsys
 update_data=false
 warn_access=
-pio=testsys.iobus.port[6]
+pio=testsys.iobus.master[5]
 
 [testsys.tsunami.fake_uart4]
 type=IsaFake
@@ -1333,7 +1341,7 @@ ret_data8=255
 system=testsys
 update_data=false
 warn_access=
-pio=testsys.iobus.port[7]
+pio=testsys.iobus.master[6]
 
 [testsys.tsunami.fb]
 type=BadDevice
@@ -1341,7 +1349,7 @@ devicename=FrameBuffer
 pio_addr=8804615848912
 pio_latency=1000
 system=testsys
-pio=testsys.iobus.port[22]
+pio=testsys.iobus.master[21]
 
 [testsys.tsunami.ide]
 type=IdeController
@@ -1395,9 +1403,9 @@ pci_func=0
 pio_latency=1000
 platform=testsys.tsunami
 system=testsys
-config=testsys.iobus.port[27]
-dma=testsys.iobus.port[28]
-pio=testsys.iobus.port[26]
+config=testsys.iobus.master[26]
+dma=testsys.iobus.slave[1]
+pio=testsys.iobus.master[25]
 
 [testsys.tsunami.io]
 type=TsunamiIO
@@ -1408,7 +1416,7 @@ system=testsys
 time=Thu Jan  1 00:00:00 2009
 tsunami=testsys.tsunami
 year_is_bcd=false
-pio=testsys.iobus.port[23]
+pio=testsys.iobus.master[22]
 
 [testsys.tsunami.pchip]
 type=TsunamiPChip
@@ -1416,7 +1424,7 @@ pio_addr=8802535473152
 pio_latency=1000
 system=testsys
 tsunami=testsys.tsunami
-pio=testsys.iobus.port[2]
+pio=testsys.iobus.master[1]
 
 [testsys.tsunami.pciconfig]
 type=PciConfigAll
@@ -1434,5 +1442,5 @@ pio_latency=1000
 platform=testsys.tsunami
 system=testsys
 terminal=testsys.terminal
-pio=testsys.iobus.port[24]
+pio=testsys.iobus.master[23]