22d21
< physmem=system.physmem
34c33
< system_port=system.membus.port[2]
---
> system_port=system.membus.slave[0]
44,45c43,44
< master=system.iobus.port[0]
< slave=system.membus.port[0]
---
> master=system.iobus.slave[0]
> slave=system.membus.master[0]
146c145
< addr_range=0:18446744073709551615
---
> addr_ranges=0:18446744073709551615
167c166
< mem_side=system.toL2Bus.port[2]
---
> mem_side=system.toL2Bus.slave[1]
438c437
< addr_range=0:18446744073709551615
---
> addr_ranges=0:18446744073709551615
459c458
< mem_side=system.toL2Bus.port[1]
---
> mem_side=system.toL2Bus.slave[0]
570c569
< addr_range=0:18446744073709551615
---
> addr_ranges=0:18446744073709551615
591c590
< mem_side=system.toL2Bus.port[4]
---
> mem_side=system.toL2Bus.slave[3]
862c861
< addr_range=0:18446744073709551615
---
> addr_ranges=0:18446744073709551615
883c882
< mem_side=system.toL2Bus.port[3]
---
> mem_side=system.toL2Bus.slave[2]
948c947,948
< port=system.bridge.master 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.backdoor.pio system.tsunami.ide.pio system.tsunami.ide.config system.tsunami.ide.dma system.tsunami.ethernet.pio system.tsunami.ethernet.config system.tsunami.ethernet.dma system.iocache.cpu_side
---
> master=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.backdoor.pio system.tsunami.ide.pio system.tsunami.ide.config system.tsunami.ethernet.pio system.tsunami.ethernet.config system.iocache.cpu_side
> slave=system.bridge.master system.tsunami.ide.dma system.tsunami.ethernet.dma
952c952
< addr_range=0:8589934591
---
> addr_ranges=0:8589934591
972,973c972,973
< cpu_side=system.iobus.port[32]
< mem_side=system.membus.port[3]
---
> cpu_side=system.iobus.master[29]
> mem_side=system.membus.slave[1]
977c977
< addr_range=0:18446744073709551615
---
> addr_ranges=0:18446744073709551615
997,998c997,998
< cpu_side=system.toL2Bus.port[0]
< mem_side=system.membus.port[4]
---
> cpu_side=system.toL2Bus.master[0]
> mem_side=system.membus.slave[2]
1010c1010,1011
< port=system.bridge.slave system.physmem.port[0] system.system_port system.iocache.mem_side system.l2c.mem_side
---
> master=system.bridge.slave system.physmem.port[0]
> slave=system.system_port system.iocache.mem_side system.l2c.mem_side
1029c1030,1031
< type=PhysicalMemory
---
> type=SimpleMemory
> conf_table_reported=false
1030a1033
> in_addr_map=true
1036c1039
< port=system.membus.port[1]
---
> port=system.membus.master[1]
1064c1067,1068
< port=system.l2c.cpu_side system.cpu0.icache.mem_side system.cpu0.dcache.mem_side system.cpu1.icache.mem_side system.cpu1.dcache.mem_side
---
> master=system.l2c.cpu_side
> slave=system.cpu0.icache.mem_side system.cpu0.dcache.mem_side system.cpu1.icache.mem_side system.cpu1.dcache.mem_side
1081c1085
< pio=system.iobus.port[25]
---
> pio=system.iobus.master[24]
1089c1093
< pio=system.iobus.port[1]
---
> pio=system.iobus.master[0]
1158,1160c1162,1164
< config=system.iobus.port[30]
< dma=system.iobus.port[31]
< pio=system.iobus.port[29]
---
> config=system.iobus.master[28]
> dma=system.iobus.slave[2]
> pio=system.iobus.master[27]
1176c1180
< pio=system.iobus.port[9]
---
> pio=system.iobus.master[8]
1192c1196
< pio=system.iobus.port[20]
---
> pio=system.iobus.master[19]
1208c1212
< pio=system.iobus.port[21]
---
> pio=system.iobus.master[20]
1224c1228
< pio=system.iobus.port[10]
---
> pio=system.iobus.master[9]
1240c1244
< pio=system.iobus.port[12]
---
> pio=system.iobus.master[11]
1256c1260
< pio=system.iobus.port[13]
---
> pio=system.iobus.master[12]
1272c1276
< pio=system.iobus.port[14]
---
> pio=system.iobus.master[13]
1288c1292
< pio=system.iobus.port[15]
---
> pio=system.iobus.master[14]
1304c1308
< pio=system.iobus.port[16]
---
> pio=system.iobus.master[15]
1320c1324
< pio=system.iobus.port[17]
---
> pio=system.iobus.master[16]
1336c1340
< pio=system.iobus.port[18]
---
> pio=system.iobus.master[17]
1352c1356
< pio=system.iobus.port[19]
---
> pio=system.iobus.master[18]
1368c1372
< pio=system.iobus.port[11]
---
> pio=system.iobus.master[10]
1384c1388
< pio=system.iobus.port[8]
---
> pio=system.iobus.master[7]
1400c1404
< pio=system.iobus.port[3]
---
> pio=system.iobus.master[2]
1416c1420
< pio=system.iobus.port[4]
---
> pio=system.iobus.master[3]
1432c1436
< pio=system.iobus.port[5]
---
> pio=system.iobus.master[4]
1448c1452
< pio=system.iobus.port[6]
---
> pio=system.iobus.master[5]
1464c1468
< pio=system.iobus.port[7]
---
> pio=system.iobus.master[6]
1472c1476
< pio=system.iobus.port[22]
---
> pio=system.iobus.master[21]
1526,1528c1530,1532
< config=system.iobus.port[27]
< dma=system.iobus.port[28]
< pio=system.iobus.port[26]
---
> config=system.iobus.master[26]
> dma=system.iobus.slave[1]
> pio=system.iobus.master[25]
1539c1543
< pio=system.iobus.port[23]
---
> pio=system.iobus.master[22]
1547c1551
< pio=system.iobus.port[2]
---
> pio=system.iobus.master[1]
1565c1569
< pio=system.iobus.port[24]
---
> pio=system.iobus.master[23]
< physmem=system.physmem
34c33
< system_port=system.membus.port[2]
---
> system_port=system.membus.slave[0]
44,45c43,44
< master=system.iobus.port[0]
< slave=system.membus.port[0]
---
> master=system.iobus.slave[0]
> slave=system.membus.master[0]
146c145
< addr_range=0:18446744073709551615
---
> addr_ranges=0:18446744073709551615
167c166
< mem_side=system.toL2Bus.port[2]
---
> mem_side=system.toL2Bus.slave[1]
438c437
< addr_range=0:18446744073709551615
---
> addr_ranges=0:18446744073709551615
459c458
< mem_side=system.toL2Bus.port[1]
---
> mem_side=system.toL2Bus.slave[0]
570c569
< addr_range=0:18446744073709551615
---
> addr_ranges=0:18446744073709551615
591c590
< mem_side=system.toL2Bus.port[4]
---
> mem_side=system.toL2Bus.slave[3]
862c861
< addr_range=0:18446744073709551615
---
> addr_ranges=0:18446744073709551615
883c882
< mem_side=system.toL2Bus.port[3]
---
> mem_side=system.toL2Bus.slave[2]
948c947,948
< port=system.bridge.master 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.backdoor.pio system.tsunami.ide.pio system.tsunami.ide.config system.tsunami.ide.dma system.tsunami.ethernet.pio system.tsunami.ethernet.config system.tsunami.ethernet.dma system.iocache.cpu_side
---
> master=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.backdoor.pio system.tsunami.ide.pio system.tsunami.ide.config system.tsunami.ethernet.pio system.tsunami.ethernet.config system.iocache.cpu_side
> slave=system.bridge.master system.tsunami.ide.dma system.tsunami.ethernet.dma
952c952
< addr_range=0:8589934591
---
> addr_ranges=0:8589934591
972,973c972,973
< cpu_side=system.iobus.port[32]
< mem_side=system.membus.port[3]
---
> cpu_side=system.iobus.master[29]
> mem_side=system.membus.slave[1]
977c977
< addr_range=0:18446744073709551615
---
> addr_ranges=0:18446744073709551615
997,998c997,998
< cpu_side=system.toL2Bus.port[0]
< mem_side=system.membus.port[4]
---
> cpu_side=system.toL2Bus.master[0]
> mem_side=system.membus.slave[2]
1010c1010,1011
< port=system.bridge.slave system.physmem.port[0] system.system_port system.iocache.mem_side system.l2c.mem_side
---
> master=system.bridge.slave system.physmem.port[0]
> slave=system.system_port system.iocache.mem_side system.l2c.mem_side
1029c1030,1031
< type=PhysicalMemory
---
> type=SimpleMemory
> conf_table_reported=false
1030a1033
> in_addr_map=true
1036c1039
< port=system.membus.port[1]
---
> port=system.membus.master[1]
1064c1067,1068
< port=system.l2c.cpu_side system.cpu0.icache.mem_side system.cpu0.dcache.mem_side system.cpu1.icache.mem_side system.cpu1.dcache.mem_side
---
> master=system.l2c.cpu_side
> slave=system.cpu0.icache.mem_side system.cpu0.dcache.mem_side system.cpu1.icache.mem_side system.cpu1.dcache.mem_side
1081c1085
< pio=system.iobus.port[25]
---
> pio=system.iobus.master[24]
1089c1093
< pio=system.iobus.port[1]
---
> pio=system.iobus.master[0]
1158,1160c1162,1164
< config=system.iobus.port[30]
< dma=system.iobus.port[31]
< pio=system.iobus.port[29]
---
> config=system.iobus.master[28]
> dma=system.iobus.slave[2]
> pio=system.iobus.master[27]
1176c1180
< pio=system.iobus.port[9]
---
> pio=system.iobus.master[8]
1192c1196
< pio=system.iobus.port[20]
---
> pio=system.iobus.master[19]
1208c1212
< pio=system.iobus.port[21]
---
> pio=system.iobus.master[20]
1224c1228
< pio=system.iobus.port[10]
---
> pio=system.iobus.master[9]
1240c1244
< pio=system.iobus.port[12]
---
> pio=system.iobus.master[11]
1256c1260
< pio=system.iobus.port[13]
---
> pio=system.iobus.master[12]
1272c1276
< pio=system.iobus.port[14]
---
> pio=system.iobus.master[13]
1288c1292
< pio=system.iobus.port[15]
---
> pio=system.iobus.master[14]
1304c1308
< pio=system.iobus.port[16]
---
> pio=system.iobus.master[15]
1320c1324
< pio=system.iobus.port[17]
---
> pio=system.iobus.master[16]
1336c1340
< pio=system.iobus.port[18]
---
> pio=system.iobus.master[17]
1352c1356
< pio=system.iobus.port[19]
---
> pio=system.iobus.master[18]
1368c1372
< pio=system.iobus.port[11]
---
> pio=system.iobus.master[10]
1384c1388
< pio=system.iobus.port[8]
---
> pio=system.iobus.master[7]
1400c1404
< pio=system.iobus.port[3]
---
> pio=system.iobus.master[2]
1416c1420
< pio=system.iobus.port[4]
---
> pio=system.iobus.master[3]
1432c1436
< pio=system.iobus.port[5]
---
> pio=system.iobus.master[4]
1448c1452
< pio=system.iobus.port[6]
---
> pio=system.iobus.master[5]
1464c1468
< pio=system.iobus.port[7]
---
> pio=system.iobus.master[6]
1472c1476
< pio=system.iobus.port[22]
---
> pio=system.iobus.master[21]
1526,1528c1530,1532
< config=system.iobus.port[27]
< dma=system.iobus.port[28]
< pio=system.iobus.port[26]
---
> config=system.iobus.master[26]
> dma=system.iobus.slave[1]
> pio=system.iobus.master[25]
1539c1543
< pio=system.iobus.port[23]
---
> pio=system.iobus.master[22]
1547c1551
< pio=system.iobus.port[2]
---
> pio=system.iobus.master[1]
1565c1569
< pio=system.iobus.port[24]
---
> pio=system.iobus.master[23]