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]
57a57
> fastmem=false
81c81
< addr_range=0:18446744073709551615
---
> addr_ranges=0:18446744073709551615
102c102
< mem_side=system.toL2Bus.port[2]
---
> mem_side=system.toL2Bus.slave[1]
110c110
< addr_range=0:18446744073709551615
---
> addr_ranges=0:18446744073709551615
131c131
< mem_side=system.toL2Bus.port[1]
---
> mem_side=system.toL2Bus.slave[0]
196c196,197
< 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
200c201
< addr_range=0:8589934591
---
> addr_ranges=0:8589934591
220,221c221,222
< cpu_side=system.iobus.port[32]
< mem_side=system.membus.port[3]
---
> cpu_side=system.iobus.master[29]
> mem_side=system.membus.slave[1]
225c226
< addr_range=0:18446744073709551615
---
> addr_ranges=0:18446744073709551615
245,246c246,247
< cpu_side=system.toL2Bus.port[0]
< mem_side=system.membus.port[4]
---
> cpu_side=system.toL2Bus.master[0]
> mem_side=system.membus.slave[2]
258c259,260
< 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
277c279,280
< type=PhysicalMemory
---
> type=SimpleMemory
> conf_table_reported=false
278a282
> in_addr_map=true
284c288
< port=system.membus.port[1]
---
> port=system.membus.master[1]
312c316,317
< port=system.l2c.cpu_side system.cpu.icache.mem_side system.cpu.dcache.mem_side
---
> master=system.l2c.cpu_side
> slave=system.cpu.icache.mem_side system.cpu.dcache.mem_side
329c334
< pio=system.iobus.port[25]
---
> pio=system.iobus.master[24]
337c342
< pio=system.iobus.port[1]
---
> pio=system.iobus.master[0]
406,408c411,413
< 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]
424c429
< pio=system.iobus.port[9]
---
> pio=system.iobus.master[8]
440c445
< pio=system.iobus.port[20]
---
> pio=system.iobus.master[19]
456c461
< pio=system.iobus.port[21]
---
> pio=system.iobus.master[20]
472c477
< pio=system.iobus.port[10]
---
> pio=system.iobus.master[9]
488c493
< pio=system.iobus.port[12]
---
> pio=system.iobus.master[11]
504c509
< pio=system.iobus.port[13]
---
> pio=system.iobus.master[12]
520c525
< pio=system.iobus.port[14]
---
> pio=system.iobus.master[13]
536c541
< pio=system.iobus.port[15]
---
> pio=system.iobus.master[14]
552c557
< pio=system.iobus.port[16]
---
> pio=system.iobus.master[15]
568c573
< pio=system.iobus.port[17]
---
> pio=system.iobus.master[16]
584c589
< pio=system.iobus.port[18]
---
> pio=system.iobus.master[17]
600c605
< pio=system.iobus.port[19]
---
> pio=system.iobus.master[18]
616c621
< pio=system.iobus.port[11]
---
> pio=system.iobus.master[10]
632c637
< pio=system.iobus.port[8]
---
> pio=system.iobus.master[7]
648c653
< pio=system.iobus.port[3]
---
> pio=system.iobus.master[2]
664c669
< pio=system.iobus.port[4]
---
> pio=system.iobus.master[3]
680c685
< pio=system.iobus.port[5]
---
> pio=system.iobus.master[4]
696c701
< pio=system.iobus.port[6]
---
> pio=system.iobus.master[5]
712c717
< pio=system.iobus.port[7]
---
> pio=system.iobus.master[6]
720c725
< pio=system.iobus.port[22]
---
> pio=system.iobus.master[21]
774,776c779,781
< 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]
787c792
< pio=system.iobus.port[23]
---
> pio=system.iobus.master[22]
795c800
< pio=system.iobus.port[2]
---
> pio=system.iobus.master[1]
813c818
< 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]
57a57
> fastmem=false
81c81
< addr_range=0:18446744073709551615
---
> addr_ranges=0:18446744073709551615
102c102
< mem_side=system.toL2Bus.port[2]
---
> mem_side=system.toL2Bus.slave[1]
110c110
< addr_range=0:18446744073709551615
---
> addr_ranges=0:18446744073709551615
131c131
< mem_side=system.toL2Bus.port[1]
---
> mem_side=system.toL2Bus.slave[0]
196c196,197
< 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
200c201
< addr_range=0:8589934591
---
> addr_ranges=0:8589934591
220,221c221,222
< cpu_side=system.iobus.port[32]
< mem_side=system.membus.port[3]
---
> cpu_side=system.iobus.master[29]
> mem_side=system.membus.slave[1]
225c226
< addr_range=0:18446744073709551615
---
> addr_ranges=0:18446744073709551615
245,246c246,247
< cpu_side=system.toL2Bus.port[0]
< mem_side=system.membus.port[4]
---
> cpu_side=system.toL2Bus.master[0]
> mem_side=system.membus.slave[2]
258c259,260
< 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
277c279,280
< type=PhysicalMemory
---
> type=SimpleMemory
> conf_table_reported=false
278a282
> in_addr_map=true
284c288
< port=system.membus.port[1]
---
> port=system.membus.master[1]
312c316,317
< port=system.l2c.cpu_side system.cpu.icache.mem_side system.cpu.dcache.mem_side
---
> master=system.l2c.cpu_side
> slave=system.cpu.icache.mem_side system.cpu.dcache.mem_side
329c334
< pio=system.iobus.port[25]
---
> pio=system.iobus.master[24]
337c342
< pio=system.iobus.port[1]
---
> pio=system.iobus.master[0]
406,408c411,413
< 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]
424c429
< pio=system.iobus.port[9]
---
> pio=system.iobus.master[8]
440c445
< pio=system.iobus.port[20]
---
> pio=system.iobus.master[19]
456c461
< pio=system.iobus.port[21]
---
> pio=system.iobus.master[20]
472c477
< pio=system.iobus.port[10]
---
> pio=system.iobus.master[9]
488c493
< pio=system.iobus.port[12]
---
> pio=system.iobus.master[11]
504c509
< pio=system.iobus.port[13]
---
> pio=system.iobus.master[12]
520c525
< pio=system.iobus.port[14]
---
> pio=system.iobus.master[13]
536c541
< pio=system.iobus.port[15]
---
> pio=system.iobus.master[14]
552c557
< pio=system.iobus.port[16]
---
> pio=system.iobus.master[15]
568c573
< pio=system.iobus.port[17]
---
> pio=system.iobus.master[16]
584c589
< pio=system.iobus.port[18]
---
> pio=system.iobus.master[17]
600c605
< pio=system.iobus.port[19]
---
> pio=system.iobus.master[18]
616c621
< pio=system.iobus.port[11]
---
> pio=system.iobus.master[10]
632c637
< pio=system.iobus.port[8]
---
> pio=system.iobus.master[7]
648c653
< pio=system.iobus.port[3]
---
> pio=system.iobus.master[2]
664c669
< pio=system.iobus.port[4]
---
> pio=system.iobus.master[3]
680c685
< pio=system.iobus.port[5]
---
> pio=system.iobus.master[4]
696c701
< pio=system.iobus.port[6]
---
> pio=system.iobus.master[5]
712c717
< pio=system.iobus.port[7]
---
> pio=system.iobus.master[6]
720c725
< pio=system.iobus.port[22]
---
> pio=system.iobus.master[21]
774,776c779,781
< 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]
787c792
< pio=system.iobus.port[23]
---
> pio=system.iobus.master[22]
795c800
< pio=system.iobus.port[2]
---
> pio=system.iobus.master[1]
813c818
< pio=system.iobus.port[24]
---
> pio=system.iobus.master[23]