23c23
< kernel=/usr/local/google/home/gabeblack/gem5/x86_system_files/binaries/x86_64-vmlinux-2.6.22.9
---
> kernel=/usr/local/google/home/gabeblack/gem5/dist/m5/system/binaries/x86_64-vmlinux-2.6.22.9
1196c1196
< master=system.apicbridge.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.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.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
---
> master=system.apicbridge.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.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.i_dont_exist1.pio system.pc.i_dont_exist2.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
1221c1221
< cpu_side=system.iobus.master[18]
---
> cpu_side=system.iobus.master[19]
1268c1268
< children=behind_pci com_1 fake_com_2 fake_com_3 fake_com_4 fake_floppy i_dont_exist pciconfig south_bridge
---
> children=behind_pci com_1 fake_com_2 fake_com_3 fake_com_4 fake_floppy i_dont_exist1 i_dont_exist2 pciconfig south_bridge
1289c1289
< pio=system.iobus.master[12]
---
> pio=system.iobus.master[13]
1301c1301
< pio=system.iobus.master[13]
---
> pio=system.iobus.master[14]
1327c1327
< pio=system.iobus.master[14]
---
> pio=system.iobus.master[15]
1345c1345
< pio=system.iobus.master[15]
---
> pio=system.iobus.master[16]
1363c1363
< pio=system.iobus.master[16]
---
> pio=system.iobus.master[17]
1381c1381
< pio=system.iobus.master[17]
---
> pio=system.iobus.master[18]
1383c1383
< [system.pc.i_dont_exist]
---
> [system.pc.i_dont_exist1]
1400a1401,1418
> [system.pc.i_dont_exist2]
> type=IsaFake
> clk_domain=system.clk_domain
> eventq_index=0
> fake_mem=false
> pio_addr=9223372036854776045
> pio_latency=100000
> pio_size=1
> ret_bad_addr=false
> ret_data16=65535
> ret_data32=4294967295
> ret_data64=18446744073709551615
> ret_data8=255
> system=system
> update_data=false
> warn_access=
> pio=system.iobus.master[12]
>
1563c1581
< image_file=/usr/local/google/home/gabeblack/gem5/x86_system_files/disks/linux-x86.img
---
> image_file=/usr/local/google/home/gabeblack/gem5/dist/m5/system/disks/linux-x86.img
1586c1604
< image_file=/usr/local/google/home/gabeblack/gem5/x86_system_files/disks/linux-bigswap2.img
---
> image_file=/usr/local/google/home/gabeblack/gem5/dist/m5/system/disks/linux-bigswap2.img
< kernel=/usr/local/google/home/gabeblack/gem5/x86_system_files/binaries/x86_64-vmlinux-2.6.22.9
---
> kernel=/usr/local/google/home/gabeblack/gem5/dist/m5/system/binaries/x86_64-vmlinux-2.6.22.9
1196c1196
< master=system.apicbridge.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.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.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
---
> master=system.apicbridge.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.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.i_dont_exist1.pio system.pc.i_dont_exist2.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
1221c1221
< cpu_side=system.iobus.master[18]
---
> cpu_side=system.iobus.master[19]
1268c1268
< children=behind_pci com_1 fake_com_2 fake_com_3 fake_com_4 fake_floppy i_dont_exist pciconfig south_bridge
---
> children=behind_pci com_1 fake_com_2 fake_com_3 fake_com_4 fake_floppy i_dont_exist1 i_dont_exist2 pciconfig south_bridge
1289c1289
< pio=system.iobus.master[12]
---
> pio=system.iobus.master[13]
1301c1301
< pio=system.iobus.master[13]
---
> pio=system.iobus.master[14]
1327c1327
< pio=system.iobus.master[14]
---
> pio=system.iobus.master[15]
1345c1345
< pio=system.iobus.master[15]
---
> pio=system.iobus.master[16]
1363c1363
< pio=system.iobus.master[16]
---
> pio=system.iobus.master[17]
1381c1381
< pio=system.iobus.master[17]
---
> pio=system.iobus.master[18]
1383c1383
< [system.pc.i_dont_exist]
---
> [system.pc.i_dont_exist1]
1400a1401,1418
> [system.pc.i_dont_exist2]
> type=IsaFake
> clk_domain=system.clk_domain
> eventq_index=0
> fake_mem=false
> pio_addr=9223372036854776045
> pio_latency=100000
> pio_size=1
> ret_bad_addr=false
> ret_data16=65535
> ret_data32=4294967295
> ret_data64=18446744073709551615
> ret_data8=255
> system=system
> update_data=false
> warn_access=
> pio=system.iobus.master[12]
>
1563c1581
< image_file=/usr/local/google/home/gabeblack/gem5/x86_system_files/disks/linux-x86.img
---
> image_file=/usr/local/google/home/gabeblack/gem5/dist/m5/system/disks/linux-x86.img
1586c1604
< image_file=/usr/local/google/home/gabeblack/gem5/x86_system_files/disks/linux-bigswap2.img
---
> image_file=/usr/local/google/home/gabeblack/gem5/dist/m5/system/disks/linux-bigswap2.img