14,15c14
< 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
26c25
< system_port=drivesys.membus.port[2]
---
> system_port=drivesys.membus.slave[0]
36,37c35,36
< master=drivesys.iobus.port[0]
< slave=drivesys.membus.port[0]
---
> master=drivesys.iobus.slave[0]
> slave=drivesys.membus.master[0]
49a49
> fastmem=false
68,69c68,69
< dcache_port=drivesys.membus.port[4]
< icache_port=drivesys.membus.port[3]
---
> dcache_port=drivesys.membus.slave[2]
> icache_port=drivesys.membus.slave[1]
137,138c137,138
< master=drivesys.membus.port[5]
< slave=drivesys.iobus.port[32]
---
> master=drivesys.membus.slave[3]
> slave=drivesys.iobus.master[29]
149c149,150
< 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
161c162,163
< 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
180c182,183
< type=PhysicalMemory
---
> type=SimpleMemory
> conf_table_reported=false
181a185
> in_addr_map=true
187c191
< port=drivesys.membus.port[1]
---
> port=drivesys.membus.master[1]
222c226
< pio=drivesys.iobus.port[25]
---
> pio=drivesys.iobus.master[24]
230c234
< pio=drivesys.iobus.port[1]
---
> pio=drivesys.iobus.master[0]
299,300c303,304
< config=drivesys.iobus.port[30]
< dma=drivesys.iobus.port[31]
---
> config=drivesys.iobus.master[28]
> dma=drivesys.iobus.slave[2]
302c306
< pio=drivesys.iobus.port[29]
---
> pio=drivesys.iobus.master[27]
318c322
< pio=drivesys.iobus.port[9]
---
> pio=drivesys.iobus.master[8]
334c338
< pio=drivesys.iobus.port[20]
---
> pio=drivesys.iobus.master[19]
350c354
< pio=drivesys.iobus.port[21]
---
> pio=drivesys.iobus.master[20]
366c370
< pio=drivesys.iobus.port[10]
---
> pio=drivesys.iobus.master[9]
382c386
< pio=drivesys.iobus.port[12]
---
> pio=drivesys.iobus.master[11]
398c402
< pio=drivesys.iobus.port[13]
---
> pio=drivesys.iobus.master[12]
414c418
< pio=drivesys.iobus.port[14]
---
> pio=drivesys.iobus.master[13]
430c434
< pio=drivesys.iobus.port[15]
---
> pio=drivesys.iobus.master[14]
446c450
< pio=drivesys.iobus.port[16]
---
> pio=drivesys.iobus.master[15]
462c466
< pio=drivesys.iobus.port[17]
---
> pio=drivesys.iobus.master[16]
478c482
< pio=drivesys.iobus.port[18]
---
> pio=drivesys.iobus.master[17]
494c498
< pio=drivesys.iobus.port[19]
---
> pio=drivesys.iobus.master[18]
510c514
< pio=drivesys.iobus.port[11]
---
> pio=drivesys.iobus.master[10]
526c530
< pio=drivesys.iobus.port[8]
---
> pio=drivesys.iobus.master[7]
542c546
< pio=drivesys.iobus.port[3]
---
> pio=drivesys.iobus.master[2]
558c562
< pio=drivesys.iobus.port[4]
---
> pio=drivesys.iobus.master[3]
574c578
< pio=drivesys.iobus.port[5]
---
> pio=drivesys.iobus.master[4]
590c594
< pio=drivesys.iobus.port[6]
---
> pio=drivesys.iobus.master[5]
606c610
< pio=drivesys.iobus.port[7]
---
> pio=drivesys.iobus.master[6]
614c618
< pio=drivesys.iobus.port[22]
---
> pio=drivesys.iobus.master[21]
668,670c672,674
< 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]
681c685
< pio=drivesys.iobus.port[23]
---
> pio=drivesys.iobus.master[22]
689c693
< pio=drivesys.iobus.port[2]
---
> pio=drivesys.iobus.master[1]
707c711
< pio=drivesys.iobus.port[24]
---
> pio=drivesys.iobus.master[23]
744,745c748
< 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
756c759
< system_port=testsys.membus.port[2]
---
> system_port=testsys.membus.slave[0]
766,767c769,770
< master=testsys.iobus.port[0]
< slave=testsys.membus.port[0]
---
> master=testsys.iobus.slave[0]
> slave=testsys.membus.master[0]
779a783
> fastmem=false
798,799c802,803
< dcache_port=testsys.membus.port[4]
< icache_port=testsys.membus.port[3]
---
> dcache_port=testsys.membus.slave[2]
> icache_port=testsys.membus.slave[1]
867,868c871,872
< master=testsys.membus.port[5]
< slave=testsys.iobus.port[32]
---
> master=testsys.membus.slave[3]
> slave=testsys.iobus.master[29]
879c883,884
< 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
891c896,897
< 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
910c916,917
< type=PhysicalMemory
---
> type=SimpleMemory
> conf_table_reported=false
911a919
> in_addr_map=true
917c925
< port=testsys.membus.port[1]
---
> port=testsys.membus.master[1]
952c960
< pio=testsys.iobus.port[25]
---
> pio=testsys.iobus.master[24]
960c968
< pio=testsys.iobus.port[1]
---
> pio=testsys.iobus.master[0]
1029,1030c1037,1038
< config=testsys.iobus.port[30]
< dma=testsys.iobus.port[31]
---
> config=testsys.iobus.master[28]
> dma=testsys.iobus.slave[2]
1032c1040
< pio=testsys.iobus.port[29]
---
> pio=testsys.iobus.master[27]
1048c1056
< pio=testsys.iobus.port[9]
---
> pio=testsys.iobus.master[8]
1064c1072
< pio=testsys.iobus.port[20]
---
> pio=testsys.iobus.master[19]
1080c1088
< pio=testsys.iobus.port[21]
---
> pio=testsys.iobus.master[20]
1096c1104
< pio=testsys.iobus.port[10]
---
> pio=testsys.iobus.master[9]
1112c1120
< pio=testsys.iobus.port[12]
---
> pio=testsys.iobus.master[11]
1128c1136
< pio=testsys.iobus.port[13]
---
> pio=testsys.iobus.master[12]
1144c1152
< pio=testsys.iobus.port[14]
---
> pio=testsys.iobus.master[13]
1160c1168
< pio=testsys.iobus.port[15]
---
> pio=testsys.iobus.master[14]
1176c1184
< pio=testsys.iobus.port[16]
---
> pio=testsys.iobus.master[15]
1192c1200
< pio=testsys.iobus.port[17]
---
> pio=testsys.iobus.master[16]
1208c1216
< pio=testsys.iobus.port[18]
---
> pio=testsys.iobus.master[17]
1224c1232
< pio=testsys.iobus.port[19]
---
> pio=testsys.iobus.master[18]
1240c1248
< pio=testsys.iobus.port[11]
---
> pio=testsys.iobus.master[10]
1256c1264
< pio=testsys.iobus.port[8]
---
> pio=testsys.iobus.master[7]
1272c1280
< pio=testsys.iobus.port[3]
---
> pio=testsys.iobus.master[2]
1288c1296
< pio=testsys.iobus.port[4]
---
> pio=testsys.iobus.master[3]
1304c1312
< pio=testsys.iobus.port[5]
---
> pio=testsys.iobus.master[4]
1320c1328
< pio=testsys.iobus.port[6]
---
> pio=testsys.iobus.master[5]
1336c1344
< pio=testsys.iobus.port[7]
---
> pio=testsys.iobus.master[6]
1344c1352
< pio=testsys.iobus.port[22]
---
> pio=testsys.iobus.master[21]
1398,1400c1406,1408
< 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]
1411c1419
< pio=testsys.iobus.port[23]
---
> pio=testsys.iobus.master[22]
1419c1427
< pio=testsys.iobus.port[2]
---
> pio=testsys.iobus.master[1]
1437c1445
< pio=testsys.iobus.port[24]
---
> pio=testsys.iobus.master[23]
< 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
26c25
< system_port=drivesys.membus.port[2]
---
> system_port=drivesys.membus.slave[0]
36,37c35,36
< master=drivesys.iobus.port[0]
< slave=drivesys.membus.port[0]
---
> master=drivesys.iobus.slave[0]
> slave=drivesys.membus.master[0]
49a49
> fastmem=false
68,69c68,69
< dcache_port=drivesys.membus.port[4]
< icache_port=drivesys.membus.port[3]
---
> dcache_port=drivesys.membus.slave[2]
> icache_port=drivesys.membus.slave[1]
137,138c137,138
< master=drivesys.membus.port[5]
< slave=drivesys.iobus.port[32]
---
> master=drivesys.membus.slave[3]
> slave=drivesys.iobus.master[29]
149c149,150
< 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
161c162,163
< 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
180c182,183
< type=PhysicalMemory
---
> type=SimpleMemory
> conf_table_reported=false
181a185
> in_addr_map=true
187c191
< port=drivesys.membus.port[1]
---
> port=drivesys.membus.master[1]
222c226
< pio=drivesys.iobus.port[25]
---
> pio=drivesys.iobus.master[24]
230c234
< pio=drivesys.iobus.port[1]
---
> pio=drivesys.iobus.master[0]
299,300c303,304
< config=drivesys.iobus.port[30]
< dma=drivesys.iobus.port[31]
---
> config=drivesys.iobus.master[28]
> dma=drivesys.iobus.slave[2]
302c306
< pio=drivesys.iobus.port[29]
---
> pio=drivesys.iobus.master[27]
318c322
< pio=drivesys.iobus.port[9]
---
> pio=drivesys.iobus.master[8]
334c338
< pio=drivesys.iobus.port[20]
---
> pio=drivesys.iobus.master[19]
350c354
< pio=drivesys.iobus.port[21]
---
> pio=drivesys.iobus.master[20]
366c370
< pio=drivesys.iobus.port[10]
---
> pio=drivesys.iobus.master[9]
382c386
< pio=drivesys.iobus.port[12]
---
> pio=drivesys.iobus.master[11]
398c402
< pio=drivesys.iobus.port[13]
---
> pio=drivesys.iobus.master[12]
414c418
< pio=drivesys.iobus.port[14]
---
> pio=drivesys.iobus.master[13]
430c434
< pio=drivesys.iobus.port[15]
---
> pio=drivesys.iobus.master[14]
446c450
< pio=drivesys.iobus.port[16]
---
> pio=drivesys.iobus.master[15]
462c466
< pio=drivesys.iobus.port[17]
---
> pio=drivesys.iobus.master[16]
478c482
< pio=drivesys.iobus.port[18]
---
> pio=drivesys.iobus.master[17]
494c498
< pio=drivesys.iobus.port[19]
---
> pio=drivesys.iobus.master[18]
510c514
< pio=drivesys.iobus.port[11]
---
> pio=drivesys.iobus.master[10]
526c530
< pio=drivesys.iobus.port[8]
---
> pio=drivesys.iobus.master[7]
542c546
< pio=drivesys.iobus.port[3]
---
> pio=drivesys.iobus.master[2]
558c562
< pio=drivesys.iobus.port[4]
---
> pio=drivesys.iobus.master[3]
574c578
< pio=drivesys.iobus.port[5]
---
> pio=drivesys.iobus.master[4]
590c594
< pio=drivesys.iobus.port[6]
---
> pio=drivesys.iobus.master[5]
606c610
< pio=drivesys.iobus.port[7]
---
> pio=drivesys.iobus.master[6]
614c618
< pio=drivesys.iobus.port[22]
---
> pio=drivesys.iobus.master[21]
668,670c672,674
< 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]
681c685
< pio=drivesys.iobus.port[23]
---
> pio=drivesys.iobus.master[22]
689c693
< pio=drivesys.iobus.port[2]
---
> pio=drivesys.iobus.master[1]
707c711
< pio=drivesys.iobus.port[24]
---
> pio=drivesys.iobus.master[23]
744,745c748
< 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
756c759
< system_port=testsys.membus.port[2]
---
> system_port=testsys.membus.slave[0]
766,767c769,770
< master=testsys.iobus.port[0]
< slave=testsys.membus.port[0]
---
> master=testsys.iobus.slave[0]
> slave=testsys.membus.master[0]
779a783
> fastmem=false
798,799c802,803
< dcache_port=testsys.membus.port[4]
< icache_port=testsys.membus.port[3]
---
> dcache_port=testsys.membus.slave[2]
> icache_port=testsys.membus.slave[1]
867,868c871,872
< master=testsys.membus.port[5]
< slave=testsys.iobus.port[32]
---
> master=testsys.membus.slave[3]
> slave=testsys.iobus.master[29]
879c883,884
< 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
891c896,897
< 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
910c916,917
< type=PhysicalMemory
---
> type=SimpleMemory
> conf_table_reported=false
911a919
> in_addr_map=true
917c925
< port=testsys.membus.port[1]
---
> port=testsys.membus.master[1]
952c960
< pio=testsys.iobus.port[25]
---
> pio=testsys.iobus.master[24]
960c968
< pio=testsys.iobus.port[1]
---
> pio=testsys.iobus.master[0]
1029,1030c1037,1038
< config=testsys.iobus.port[30]
< dma=testsys.iobus.port[31]
---
> config=testsys.iobus.master[28]
> dma=testsys.iobus.slave[2]
1032c1040
< pio=testsys.iobus.port[29]
---
> pio=testsys.iobus.master[27]
1048c1056
< pio=testsys.iobus.port[9]
---
> pio=testsys.iobus.master[8]
1064c1072
< pio=testsys.iobus.port[20]
---
> pio=testsys.iobus.master[19]
1080c1088
< pio=testsys.iobus.port[21]
---
> pio=testsys.iobus.master[20]
1096c1104
< pio=testsys.iobus.port[10]
---
> pio=testsys.iobus.master[9]
1112c1120
< pio=testsys.iobus.port[12]
---
> pio=testsys.iobus.master[11]
1128c1136
< pio=testsys.iobus.port[13]
---
> pio=testsys.iobus.master[12]
1144c1152
< pio=testsys.iobus.port[14]
---
> pio=testsys.iobus.master[13]
1160c1168
< pio=testsys.iobus.port[15]
---
> pio=testsys.iobus.master[14]
1176c1184
< pio=testsys.iobus.port[16]
---
> pio=testsys.iobus.master[15]
1192c1200
< pio=testsys.iobus.port[17]
---
> pio=testsys.iobus.master[16]
1208c1216
< pio=testsys.iobus.port[18]
---
> pio=testsys.iobus.master[17]
1224c1232
< pio=testsys.iobus.port[19]
---
> pio=testsys.iobus.master[18]
1240c1248
< pio=testsys.iobus.port[11]
---
> pio=testsys.iobus.master[10]
1256c1264
< pio=testsys.iobus.port[8]
---
> pio=testsys.iobus.master[7]
1272c1280
< pio=testsys.iobus.port[3]
---
> pio=testsys.iobus.master[2]
1288c1296
< pio=testsys.iobus.port[4]
---
> pio=testsys.iobus.master[3]
1304c1312
< pio=testsys.iobus.port[5]
---
> pio=testsys.iobus.master[4]
1320c1328
< pio=testsys.iobus.port[6]
---
> pio=testsys.iobus.master[5]
1336c1344
< pio=testsys.iobus.port[7]
---
> pio=testsys.iobus.master[6]
1344c1352
< pio=testsys.iobus.port[22]
---
> pio=testsys.iobus.master[21]
1398,1400c1406,1408
< 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]
1411c1419
< pio=testsys.iobus.port[23]
---
> pio=testsys.iobus.master[22]
1419c1427
< pio=testsys.iobus.port[2]
---
> pio=testsys.iobus.master[1]
1437c1445
< pio=testsys.iobus.port[24]
---
> pio=testsys.iobus.master[23]