Merge with the main repo.

--HG--
rename : src/mem/vport.hh => src/mem/fs_translating_port_proxy.hh
rename : src/mem/translating_port.cc => src/mem/se_translating_port_proxy.cc
rename : src/mem/translating_port.hh => src/mem/se_translating_port_proxy.hh

6 files changed, 136 insertions, 94 deletions

diff --git a/tests/quick/10.linux-boot/ref/x86/linux/pc-simple-atomic/config.ini b/tests/quick/10.linux-boot/ref/x86/linux/pc-simple-atomic/config.ini
index bea7090e9..91a089b4b 100644
--- a/tests/quick/10.linux-boot/ref/x86/linux/pc-simple-atomic/config.ini
+++ b/tests/quick/10.linux-boot/ref/x86/linux/pc-simple-atomic/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=atomic
 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=AtomicSimpleCPU
@@ -208,8 +206,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
@@ -620,6 +618,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
@@ -629,7 +638,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
@@ -660,8 +669,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
@@ -693,7 +702,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
@@ -705,7 +714,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
@@ -745,7 +754,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
@@ -755,7 +764,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
@@ -786,7 +795,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
@@ -803,7 +812,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
@@ -820,7 +829,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
@@ -837,7 +846,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
@@ -854,7 +863,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
@@ -888,7 +897,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
@@ -899,7 +908,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
@@ -954,9 +963,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
@@ -975,7 +984,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]
@@ -995,7 +1004,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]
@@ -1084,8 +1093,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
@@ -1098,7 +1107,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
@@ -1116,7 +1125,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
@@ -1131,7 +1140,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
@@ -1144,7 +1153,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
@@ -1156,7 +1165,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
diff --git a/tests/quick/10.linux-boot/ref/x86/linux/pc-simple-atomic/simout b/tests/quick/10.linux-boot/ref/x86/linux/pc-simple-atomic/simout
index bd3613cfe..23cf47db2 100755
--- a/tests/quick/10.linux-boot/ref/x86/linux/pc-simple-atomic/simout
+++ b/tests/quick/10.linux-boot/ref/x86/linux/pc-simple-atomic/simout
@@ -1,12 +1,13 @@
 gem5 Simulator System.  http://gem5.org
 gem5 is copyrighted software; use the --copyright option for details.
 
-gem5 compiled Jan  9 2012 20:47:38
-gem5 started Jan  9 2012 21:03:15
-gem5 executing on ribera.cs.wisc.edu
-command line: build/X86_FS/gem5.fast -d build/X86_FS/tests/fast/quick/10.linux-boot/x86/linux/pc-simple-atomic -re tests/run.py build/X86_FS/tests/fast/quick/10.linux-boot/x86/linux/pc-simple-atomic
+gem5 compiled Jan 23 2012 04:12:17
+gem5 started Jan 23 2012 04:24:46
+gem5 executing on zizzer
+command line: build/X86_FS/gem5.opt -d build/X86_FS/tests/opt/quick/10.linux-boot/x86/linux/pc-simple-atomic -re tests/run.py build/X86_FS/tests/opt/quick/10.linux-boot/x86/linux/pc-simple-atomic
 warning: add_child('terminal'): child 'terminal' already has parent
 Global frequency set at 1000000000000 ticks per second
-info: kernel located at: /scratch/nilay/GEM5/system/binaries/x86_64-vmlinux-2.6.22.9
+      0: rtc: Real-time clock set to Sun Jan  1 00:00:00 2012
+info: kernel located at: /dist/m5/system/binaries/x86_64-vmlinux-2.6.22.9
 info: Entering event queue @ 0.  Starting simulation...
 Exiting @ tick 5112043255000 because m5_exit instruction encountered
diff --git a/tests/quick/10.linux-boot/ref/x86/linux/pc-simple-atomic/stats.txt b/tests/quick/10.linux-boot/ref/x86/linux/pc-simple-atomic/stats.txt
index dc005fb66..324bf8929 100644
--- a/tests/quick/10.linux-boot/ref/x86/linux/pc-simple-atomic/stats.txt
+++ b/tests/quick/10.linux-boot/ref/x86/linux/pc-simple-atomic/stats.txt
@@ -2,12 +2,23 @@
 ---------- Begin Simulation Statistics ----------
 sim_seconds                                  5.112043                       # Number of seconds simulated
 sim_ticks                                5112043255000                       # Number of ticks simulated
+final_tick                               5112043255000                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                 1000000000000                       # Frequency of simulated ticks
-host_inst_rate                                2860366                       # Simulator instruction rate (inst/s)
-host_tick_rate                            35739722021                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 375540                       # Number of bytes of host memory used
-host_seconds                                   143.04                       # Real time elapsed on the host
+host_inst_rate                                2850135                       # Simulator instruction rate (inst/s)
+host_tick_rate                            35611898535                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 353172                       # Number of bytes of host memory used
+host_seconds                                   143.55                       # Real time elapsed on the host
 sim_insts                                   409133277                       # Number of instructions simulated
+system.physmem.bytes_read                    15568704                       # Number of bytes read from this memory
+system.physmem.bytes_inst_read                 972736                       # Number of instructions bytes read from this memory
+system.physmem.bytes_written                 12232896                       # Number of bytes written to this memory
+system.physmem.num_reads                       243261                       # Number of read requests responded to by this memory
+system.physmem.num_writes                      191139                       # Number of write requests responded to by this memory
+system.physmem.num_other                            0                       # Number of other requests responded to by this memory
+system.physmem.bw_read                        3045495                       # Total read bandwidth from this memory (bytes/s)
+system.physmem.bw_inst_read                    190283                       # Instruction read bandwidth from this memory (bytes/s)
+system.physmem.bw_write                       2392956                       # Write bandwidth from this memory (bytes/s)
+system.physmem.bw_total                       5438452                       # Total bandwidth to/from this memory (bytes/s)
 system.l2c.replacements                        164044                       # number of replacements
 system.l2c.tagsinuse                     36842.944085                       # Cycle average of tags in use
 system.l2c.total_refs                         3332458                       # Total number of references to valid blocks.
diff --git a/tests/quick/10.linux-boot/ref/x86/linux/pc-simple-timing/config.ini b/tests/quick/10.linux-boot/ref/x86/linux/pc-simple-timing/config.ini
index 3130a22aa..e3a339662 100644
--- a/tests/quick/10.linux-boot/ref/x86/linux/pc-simple-timing/config.ini
+++ b/tests/quick/10.linux-boot/ref/x86/linux/pc-simple-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=TimingSimpleCPU
@@ -205,8 +203,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
@@ -617,6 +615,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
@@ -626,7 +635,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
@@ -657,8 +666,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
@@ -690,7 +699,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
@@ -702,7 +711,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
@@ -742,7 +751,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
@@ -752,7 +761,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
@@ -783,7 +792,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
@@ -800,7 +809,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
@@ -817,7 +826,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
@@ -834,7 +843,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
@@ -851,7 +860,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
@@ -885,7 +894,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
@@ -896,7 +905,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
@@ -951,9 +960,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
@@ -972,7 +981,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]
@@ -992,7 +1001,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]
@@ -1081,8 +1090,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
@@ -1095,7 +1104,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
@@ -1113,7 +1122,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
@@ -1128,7 +1137,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
@@ -1141,7 +1150,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
@@ -1153,7 +1162,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
diff --git a/tests/quick/10.linux-boot/ref/x86/linux/pc-simple-timing/simout b/tests/quick/10.linux-boot/ref/x86/linux/pc-simple-timing/simout
index ec51a2abf..5dde537a2 100755
--- a/tests/quick/10.linux-boot/ref/x86/linux/pc-simple-timing/simout
+++ b/tests/quick/10.linux-boot/ref/x86/linux/pc-simple-timing/simout
@@ -1,12 +1,13 @@
 gem5 Simulator System.  http://gem5.org
 gem5 is copyrighted software; use the --copyright option for details.
 
-gem5 compiled Jan  9 2012 20:47:38
-gem5 started Jan  9 2012 21:05:49
-gem5 executing on ribera.cs.wisc.edu
-command line: build/X86_FS/gem5.fast -d build/X86_FS/tests/fast/quick/10.linux-boot/x86/linux/pc-simple-timing -re tests/run.py build/X86_FS/tests/fast/quick/10.linux-boot/x86/linux/pc-simple-timing
+gem5 compiled Jan 23 2012 04:12:17
+gem5 started Jan 23 2012 04:24:49
+gem5 executing on zizzer
+command line: build/X86_FS/gem5.opt -d build/X86_FS/tests/opt/quick/10.linux-boot/x86/linux/pc-simple-timing -re tests/run.py build/X86_FS/tests/opt/quick/10.linux-boot/x86/linux/pc-simple-timing
 warning: add_child('terminal'): child 'terminal' already has parent
 Global frequency set at 1000000000000 ticks per second
-info: kernel located at: /scratch/nilay/GEM5/system/binaries/x86_64-vmlinux-2.6.22.9
+      0: rtc: Real-time clock set to Sun Jan  1 00:00:00 2012
+info: kernel located at: /dist/m5/system/binaries/x86_64-vmlinux-2.6.22.9
 info: Entering event queue @ 0.  Starting simulation...
 Exiting @ tick 5195470393000 because m5_exit instruction encountered
diff --git a/tests/quick/10.linux-boot/ref/x86/linux/pc-simple-timing/stats.txt b/tests/quick/10.linux-boot/ref/x86/linux/pc-simple-timing/stats.txt
index 3c6185134..c4a248e5e 100644
--- a/tests/quick/10.linux-boot/ref/x86/linux/pc-simple-timing/stats.txt
+++ b/tests/quick/10.linux-boot/ref/x86/linux/pc-simple-timing/stats.txt
@@ -2,12 +2,23 @@
 ---------- Begin Simulation Statistics ----------
 sim_seconds                                  5.195470                       # Number of seconds simulated
 sim_ticks                                5195470393000                       # Number of ticks simulated
+final_tick                               5195470393000                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                 1000000000000                       # Frequency of simulated ticks
-host_inst_rate                                1858401                       # Simulator instruction rate (inst/s)
-host_tick_rate                            36414646229                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 372180                       # Number of bytes of host memory used
-host_seconds                                   142.68                       # Real time elapsed on the host
+host_inst_rate                                1681123                       # Simulator instruction rate (inst/s)
+host_tick_rate                            32940960656                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 349824                       # Number of bytes of host memory used
+host_seconds                                   157.72                       # Real time elapsed on the host
 sim_insts                                   265147881                       # Number of instructions simulated
+system.physmem.bytes_read                    13764096                       # Number of bytes read from this memory
+system.physmem.bytes_inst_read                 974400                       # Number of instructions bytes read from this memory
+system.physmem.bytes_written                 10427072                       # Number of bytes written to this memory
+system.physmem.num_reads                       215064                       # Number of read requests responded to by this memory
+system.physmem.num_writes                      162923                       # Number of write requests responded to by this memory
+system.physmem.num_other                            0                       # Number of other requests responded to by this memory
+system.physmem.bw_read                        2649249                       # Total read bandwidth from this memory (bytes/s)
+system.physmem.bw_inst_read                    187548                       # Instruction read bandwidth from this memory (bytes/s)
+system.physmem.bw_write                       2006954                       # Write bandwidth from this memory (bytes/s)
+system.physmem.bw_total                       4656204                       # Total bandwidth to/from this memory (bytes/s)
 system.l2c.replacements                        136133                       # number of replacements
 system.l2c.tagsinuse                     31389.895470                       # Cycle average of tags in use
 system.l2c.total_refs                         3363370                       # Total number of references to valid blocks.