19d18
< physmem=system.physmem
29c28
< system_port=system.membus.port[0]
---
> system_port=system.membus.slave[0]
62c61
< addr_range=0:18446744073709551615
---
> addr_ranges=0:18446744073709551615
83c82
< mem_side=system.cpu.toL2Bus.port[1]
---
> mem_side=system.cpu.toL2Bus.slave[1]
94c93
< port=system.cpu.toL2Bus.port[3]
---
> port=system.cpu.toL2Bus.slave[3]
98c97
< addr_range=0:18446744073709551615
---
> addr_ranges=0:18446744073709551615
119c118
< mem_side=system.cpu.toL2Bus.port[0]
---
> mem_side=system.cpu.toL2Bus.slave[0]
127,128c126,128
< int_port=system.membus.port[4]
< pio=system.membus.port[3]
---
> int_master=system.membus.slave[2]
> int_slave=system.membus.master[2]
> pio=system.membus.master[1]
139c139
< port=system.cpu.toL2Bus.port[2]
---
> port=system.cpu.toL2Bus.slave[2]
143c143
< addr_range=0:18446744073709551615
---
> addr_ranges=0:18446744073709551615
163,164c163,164
< cpu_side=system.cpu.toL2Bus.port[4]
< mem_side=system.membus.port[2]
---
> cpu_side=system.cpu.toL2Bus.master[0]
> mem_side=system.membus.slave[1]
174c174,175
< port=system.cpu.icache.mem_side system.cpu.dcache.mem_side system.cpu.itb.walker.port system.cpu.dtb.walker.port system.cpu.l2cache.cpu_side
---
> master=system.cpu.l2cache.cpu_side
> slave=system.cpu.icache.mem_side system.cpu.dcache.mem_side system.cpu.itb.walker.port system.cpu.dtb.walker.port
182c183
< cwd=build/X86/tests/fast/long/se/60.bzip2/x86/linux/simple-timing
---
> cwd=build/X86/tests/opt/long/se/60.bzip2/x86/linux/simple-timing
206c207,208
< port=system.system_port system.physmem.port[0] system.cpu.l2cache.mem_side system.cpu.interrupts.pio system.cpu.interrupts.int_port
---
> master=system.physmem.port[0] system.cpu.interrupts.pio system.cpu.interrupts.int_slave
> slave=system.system_port system.cpu.l2cache.mem_side system.cpu.interrupts.int_master
209c211,212
< type=PhysicalMemory
---
> type=SimpleMemory
> conf_table_reported=false
210a214
> in_addr_map=true
216c220
< port=system.membus.port[1]
---
> port=system.membus.master[0]