1 files changed, 47 insertions, 38 deletions
diff --git a/tests/long/10.linux-boot/ref/x86/linux/pc-o3-timing/config.ini b/tests/long/10.linux-boot/ref/x86/linux/pc-o3-timing/config.ini
index 9ef75afe6..f406247a4 100644
--- a/tests/long/10.linux-boot/ref/x86/linux/pc-o3-timing/config.ini
+++ b/tests/long/10.linux-boot/ref/x86/linux/pc-o3-timing/config.ini
@@ -7,7 +7,7 @@ time_sync_spin_threshold=100000000
 
 [system]
 type=LinuxX86System
-children=acpi_description_table_pointer bridge cpu e820_table intel_mp_pointer intel_mp_table intrctrl iobus iocache l2c membus pc physmem smbios_table toL2Bus
+children=acpi_description_table_pointer bridge cpu e820_table intel_mp_pointer intel_mp_table intrctrl iobridge iobus iocache l2c membus pc physmem smbios_table toL2Bus
 acpi_description_table_pointer=system.acpi_description_table_pointer
 boot_cpu_frequency=500
 boot_osflags=earlyprintk=ttyS0 console=ttyS0 lpj=7999923 root=/dev/hda1
@@ -15,7 +15,7 @@ e820_table=system.e820_table
 init_param=0
 intel_mp_pointer=system.intel_mp_pointer
 intel_mp_table=system.intel_mp_table
-kernel=/scratch/nilay/GEM5/system/binaries/x86_64-vmlinux-2.6.22.9
+kernel=/dist/m5/system/binaries/x86_64-vmlinux-2.6.22.9
 load_addr_mask=18446744073709551615
 mem_mode=timing
 memories=system.physmem
@@ -31,6 +31,7 @@ work_cpus_ckpt_count=0
 work_end_ckpt_count=0
 work_end_exit_count=0
 work_item_id=-1
+system_port=system.membus.port[3]
 
 [system.acpi_description_table_pointer]
 type=X86ACPIRSDP
@@ -52,16 +53,13 @@ oem_table_id=
 [system.bridge]
 type=Bridge
 delay=50000
-filter_ranges_a=0:1152921504606846975
-filter_ranges_b=0:134217727
 nack_delay=4000
-req_size_a=16
-req_size_b=16
-resp_size_a=16
-resp_size_b=16
+ranges=4273995776:4273999871 9223372036854775808:11529215046068469759 13835058055282163712:18446744073709551615
+req_size=16
+resp_size=16
 write_ack=false
-side_a=system.iobus.port[0]
-side_b=system.membus.port[1]
+master=system.iobus.port[0]
+slave=system.membus.port[1]
 
 [system.cpu]
 type=DerivO3CPU
@@ -535,8 +533,8 @@ pio_addr=2305843009213693952
 pio_latency=1000
 platform=system.pc
 system=system
-int_port=system.membus.port[5]
-pio=system.membus.port[4]
+int_port=system.membus.port[7]
+pio=system.membus.port[6]
 
 [system.cpu.itb]
 type=X86TLB
@@ -947,6 +945,17 @@ subtractive_decode=true
 type=IntrControl
 sys=system
 
+[system.iobridge]
+type=Bridge
+delay=50000
+nack_delay=4000
+ranges=11529215046068469760:11529215046068473855
+req_size=16
+resp_size=16
+write_ack=false
+master=system.membus.port[2]
+slave=system.iobus.port[1]
+
 [system.iobus]
 type=Bus
 block_size=64
@@ -956,7 +965,7 @@ header_cycles=1
 use_default_range=true
 width=64
 default=system.pc.pciconfig.pio
-port=system.bridge.side_a system.pc.south_bridge.cmos.pio system.pc.south_bridge.dma1.pio system.pc.south_bridge.ide.pio system.pc.south_bridge.keyboard.pio system.pc.south_bridge.pic1.pio system.pc.south_bridge.pic2.pio system.pc.south_bridge.pit.pio system.pc.south_bridge.speaker.pio system.pc.south_bridge.io_apic.pio system.pc.south_bridge.io_apic.int_port system.pc.i_dont_exist.pio system.pc.behind_pci.pio system.pc.com_1.pio system.pc.fake_com_2.pio system.pc.fake_com_3.pio system.pc.fake_com_4.pio system.pc.fake_floppy.pio system.iocache.cpu_side system.pc.south_bridge.ide.config system.pc.south_bridge.ide.dma
+port=system.bridge.master system.iobridge.slave system.pc.south_bridge.cmos.pio system.pc.south_bridge.dma1.pio system.pc.south_bridge.ide.pio system.pc.south_bridge.ide.config system.pc.south_bridge.ide.dma system.pc.south_bridge.keyboard.pio system.pc.south_bridge.pic1.pio system.pc.south_bridge.pic2.pio system.pc.south_bridge.pit.pio system.pc.south_bridge.speaker.pio system.pc.south_bridge.io_apic.pio system.pc.south_bridge.io_apic.int_port system.pc.i_dont_exist.pio system.pc.behind_pci.pio system.pc.com_1.pio system.pc.fake_com_2.pio system.pc.fake_com_3.pio system.pc.fake_com_4.pio system.pc.fake_floppy.pio system.iocache.cpu_side
 
 [system.iocache]
 type=BaseCache
@@ -987,8 +996,8 @@ tgts_per_mshr=12
 trace_addr=0
 two_queue=false
 write_buffers=8
-cpu_side=system.iobus.port[18]
-mem_side=system.membus.port[2]
+cpu_side=system.iobus.port[21]
+mem_side=system.membus.port[4]
 
 [system.l2c]
 type=BaseCache
@@ -1020,7 +1029,7 @@ trace_addr=0
 two_queue=false
 write_buffers=8
 cpu_side=system.toL2Bus.port[0]
-mem_side=system.membus.port[3]
+mem_side=system.membus.port[5]
 
 [system.membus]
 type=Bus
@@ -1032,7 +1041,7 @@ header_cycles=1
 use_default_range=false
 width=64
 default=system.membus.badaddr_responder.pio
-port=system.physmem.port[0] system.bridge.side_b system.iocache.mem_side system.l2c.mem_side system.cpu.interrupts.pio system.cpu.interrupts.int_port
+port=system.physmem.port[0] system.bridge.slave system.iobridge.master system.system_port system.iocache.mem_side system.l2c.mem_side system.cpu.interrupts.pio system.cpu.interrupts.int_port
 
 [system.membus.badaddr_responder]
 type=IsaFake
@@ -1072,7 +1081,7 @@ ret_data8=255
 system=system
 update_data=false
 warn_access=
-pio=system.iobus.port[12]
+pio=system.iobus.port[15]
 
 [system.pc.com_1]
 type=Uart8250
@@ -1082,7 +1091,7 @@ pio_latency=1000
 platform=system.pc
 system=system
 terminal=system.pc.com_1.terminal
-pio=system.iobus.port[13]
+pio=system.iobus.port[16]
 
 [system.pc.com_1.terminal]
 type=Terminal
@@ -1113,7 +1122,7 @@ ret_data8=255
 system=system
 update_data=false
 warn_access=
-pio=system.iobus.port[14]
+pio=system.iobus.port[17]
 
 [system.pc.fake_com_3]
 type=IsaFake
@@ -1130,7 +1139,7 @@ ret_data8=255
 system=system
 update_data=false
 warn_access=
-pio=system.iobus.port[15]
+pio=system.iobus.port[18]
 
 [system.pc.fake_com_4]
 type=IsaFake
@@ -1147,7 +1156,7 @@ ret_data8=255
 system=system
 update_data=false
 warn_access=
-pio=system.iobus.port[16]
+pio=system.iobus.port[19]
 
 [system.pc.fake_floppy]
 type=IsaFake
@@ -1164,7 +1173,7 @@ ret_data8=255
 system=system
 update_data=false
 warn_access=
-pio=system.iobus.port[17]
+pio=system.iobus.port[20]
 
 [system.pc.i_dont_exist]
 type=IsaFake
@@ -1181,7 +1190,7 @@ ret_data8=255
 system=system
 update_data=false
 warn_access=
-pio=system.iobus.port[11]
+pio=system.iobus.port[14]
 
 [system.pc.pciconfig]
 type=PciConfigAll
@@ -1215,7 +1224,7 @@ pio_latency=1000
 platform=system.pc
 system=system
 time=Sun Jan  1 00:00:00 2012
-pio=system.iobus.port[1]
+pio=system.iobus.port[2]
 
 [system.pc.south_bridge.cmos.int_pin]
 type=X86IntSourcePin
@@ -1226,7 +1235,7 @@ pio_addr=9223372036854775808
 pio_latency=1000
 platform=system.pc
 system=system
-pio=system.iobus.port[2]
+pio=system.iobus.port[3]
 
 [system.pc.south_bridge.ide]
 type=IdeController
@@ -1281,9 +1290,9 @@ pci_func=0
 pio_latency=1000
 platform=system.pc
 system=system
-config=system.iobus.port[19]
-dma=system.iobus.port[20]
-pio=system.iobus.port[3]
+config=system.iobus.port[5]
+dma=system.iobus.port[6]
+pio=system.iobus.port[4]
 
 [system.pc.south_bridge.ide.disks0]
 type=IdeDisk
@@ -1302,7 +1311,7 @@ table_size=65536
 
 [system.pc.south_bridge.ide.disks0.image.child]
 type=RawDiskImage
-image_file=/scratch/nilay/GEM5/system/disks/linux-x86.img
+image_file=/dist/m5/system/disks/linux-x86.img
 read_only=true
 
 [system.pc.south_bridge.ide.disks1]
@@ -1322,7 +1331,7 @@ table_size=65536
 
 [system.pc.south_bridge.ide.disks1.image.child]
 type=RawDiskImage
-image_file=/scratch/nilay/GEM5/system/disks/linux-bigswap2.img
+image_file=/dist/m5/system/disks/linux-bigswap2.img
 read_only=true
 
 [system.pc.south_bridge.int_lines0]
@@ -1411,8 +1420,8 @@ pio_addr=4273995776
 pio_latency=1000
 platform=system.pc
 system=system
-int_port=system.iobus.port[10]
-pio=system.iobus.port[9]
+int_port=system.iobus.port[13]
+pio=system.iobus.port[12]
 
 [system.pc.south_bridge.keyboard]
 type=I8042
@@ -1425,7 +1434,7 @@ pio_addr=0
 pio_latency=1000
 platform=system.pc
 system=system
-pio=system.iobus.port[4]
+pio=system.iobus.port[7]
 
 [system.pc.south_bridge.keyboard.keyboard_int_pin]
 type=X86IntSourcePin
@@ -1443,7 +1452,7 @@ pio_latency=1000
 platform=system.pc
 slave=system.pc.south_bridge.pic2
 system=system
-pio=system.iobus.port[5]
+pio=system.iobus.port[8]
 
 [system.pc.south_bridge.pic1.output]
 type=X86IntSourcePin
@@ -1458,7 +1467,7 @@ pio_latency=1000
 platform=system.pc
 slave=Null
 system=system
-pio=system.iobus.port[6]
+pio=system.iobus.port[9]
 
 [system.pc.south_bridge.pic2.output]
 type=X86IntSourcePin
@@ -1471,7 +1480,7 @@ pio_addr=9223372036854775872
 pio_latency=1000
 platform=system.pc
 system=system
-pio=system.iobus.port[7]
+pio=system.iobus.port[10]
 
 [system.pc.south_bridge.pit.int_pin]
 type=X86IntSourcePin
@@ -1483,7 +1492,7 @@ pio_addr=9223372036854775905
 pio_latency=1000
 platform=system.pc
 system=system
-pio=system.iobus.port[8]
+pio=system.iobus.port[11]
 
 [system.physmem]
 type=PhysicalMemory