14,16c14,16
< atags_addr=256
< boot_loader=/scratch/nilay/GEM5/system/binaries/boot.arm
< boot_osflags=earlyprintk=pl011,0x1c090000 console=ttyAMA0 lpj=19988480 norandmaps rw loglevel=8 mem=128MB root=/dev/sda1
---
> atags_addr=134217728
> boot_loader=/dist/binaries/boot_emm.arm
> boot_osflags=earlyprintk=pl011,0x1c090000 console=ttyAMA0 lpj=19988480 norandmaps rw loglevel=8 mem=256MB root=/dev/sda1
20c20
< dtb_filename=
---
> dtb_filename=/dist/binaries/vexpress.aarch32.ll_20131205.0-gem5.2cpu.dtb
24,25c24,25
< flags_addr=268435504
< gic_cpu_addr=520093952
---
> flags_addr=469827632
> gic_cpu_addr=738205696
33c33
< kernel=/scratch/nilay/GEM5/system/binaries/vmlinux.arm.smp.fb.2.6.38.8
---
> kernel=/dist/binaries/vmlinux.aarch32.ll_20131205.0-gem5
36,37c36,37
< load_offset=0
< machine_type=RealView_PBX
---
> load_offset=2147483648
> machine_type=VExpress_EMM
39,40c39,40
< mem_ranges=0:134217727
< memories=system.physmem system.realview.nvmem
---
> mem_ranges=2147483648:2415919103
> memories=system.realview.nvmem system.physmem system.realview.vram
46c46
< readfile=/scratch/nilay/GEM5/gem5/tests/halt.sh
---
> readfile=/work/gem5.latest/tests/halt.sh
56c56
< system_port=system.membus.slave[0]
---
> system_port=system.membus.slave[1]
63c63
< ranges=268435456:520093695 1073741824:1610612735
---
> ranges=788529152:805306367 721420288:725614591 805306368:1073741823 1073741824:1610612735 402653184:469762047 469762048:536870911
89c89
< image_file=/scratch/nilay/GEM5/system/disks/linux-arm-ael.img
---
> image_file=/dist/disks/linux-aarch32-ael.img
614a615
> pmu=Null
1240a1242
> pmu=Null
1378c1380
< use_default_range=false
---
> use_default_range=true
1380,1381c1382,1384
< master=system.realview.uart.pio system.realview.realview_io.pio system.realview.timer0.pio system.realview.timer1.pio system.realview.clcd.pio system.realview.kmi0.pio system.realview.kmi1.pio system.realview.cf_ctrl.pio system.realview.cf_ctrl.config system.realview.dmac_fake.pio system.realview.uart1_fake.pio system.realview.uart2_fake.pio system.realview.uart3_fake.pio system.realview.smc_fake.pio system.realview.sp810_fake.pio system.realview.watchdog_fake.pio system.realview.gpio0_fake.pio system.realview.gpio1_fake.pio system.realview.gpio2_fake.pio system.realview.ssp_fake.pio system.realview.sci_fake.pio system.realview.aaci_fake.pio system.realview.mmc_fake.pio system.realview.rtc.pio system.realview.flash_fake.pio system.realview.energy_ctrl.pio system.iocache.cpu_side
< slave=system.bridge.master system.realview.clcd.dma system.realview.cf_ctrl.dma
---
> default=system.realview.pciconfig.pio
> master=system.realview.uart.pio system.realview.realview_io.pio system.realview.timer0.pio system.realview.timer1.pio system.realview.clcd.pio system.realview.hdlcd.pio system.realview.kmi0.pio system.realview.kmi1.pio system.realview.cf_ctrl.pio system.realview.cf_ctrl.config system.realview.rtc.pio system.realview.vram.port system.realview.l2x0_fake.pio system.realview.uart1_fake.pio system.realview.uart2_fake.pio system.realview.uart3_fake.pio system.realview.sp810_fake.pio system.realview.watchdog_fake.pio system.realview.aaci_fake.pio system.realview.lan_fake.pio system.realview.usb_fake.pio system.realview.mmc_fake.pio system.realview.energy_ctrl.pio system.realview.ide.pio system.realview.ide.config system.realview.ethernet.pio system.realview.ethernet.config system.iocache.cpu_side
> slave=system.bridge.master system.realview.clcd.dma system.realview.cf_ctrl.dma system.realview.ide.dma system.realview.ethernet.dma
1386c1389
< addr_ranges=0:134217727
---
> addr_ranges=2147483648:2415919103
1405,1406c1408,1409
< cpu_side=system.iobus.master[26]
< mem_side=system.membus.slave[2]
---
> cpu_side=system.iobus.master[27]
> mem_side=system.membus.slave[3]
1441c1444
< mem_side=system.membus.slave[1]
---
> mem_side=system.membus.slave[2]
1464,1465c1467,1468
< master=system.bridge.slave system.realview.nvmem.port system.realview.gic.pio system.realview.l2x0_fake.pio system.realview.a9scu.pio system.realview.local_cpu_timer.pio system.physmem.port
< slave=system.system_port system.l2c.mem_side system.iocache.mem_side
---
> master=system.bridge.slave system.realview.nvmem.port system.realview.gic.pio system.realview.local_cpu_timer.pio system.realview.vgic.pio system.physmem.port
> slave=system.realview.hdlcd.dma system.system_port system.l2c.mem_side system.iocache.mem_side
1520a1524
> device_size=536870912
1530c1534
< range=0:134217727
---
> range=2147483648:2415919103
1559c1563
< port=system.membus.master[6]
---
> port=system.membus.master[5]
1563c1567
< children=a9scu aaci_fake cf_ctrl clcd dmac_fake energy_ctrl flash_fake gic gpio0_fake gpio1_fake gpio2_fake kmi0 kmi1 l2x0_fake local_cpu_timer mmc_fake nvmem realview_io rtc sci_fake smc_fake sp810_fake ssp_fake timer0 timer1 uart uart1_fake uart2_fake uart3_fake watchdog_fake
---
> children=aaci_fake cf_ctrl clcd energy_ctrl ethernet generic_timer gic hdlcd ide kmi0 kmi1 l2x0_fake lan_fake local_cpu_timer mmc_fake nvmem pciconfig realview_io rtc sp810_fake timer0 timer1 uart uart1_fake uart2_fake uart3_fake usb_fake vgic vram watchdog_fake
1566c1570
< pci_cfg_base=0
---
> pci_cfg_base=805306368
1571,1579d1574
< [system.realview.a9scu]
< type=A9SCU
< clk_domain=system.clk_domain
< eventq_index=0
< pio_addr=520093696
< pio_latency=100000
< system=system
< pio=system.membus.master[4]
<
1586c1581
< pio_addr=268451840
---
> pio_addr=470024192
1589c1584
< pio=system.iobus.master[21]
---
> pio=system.iobus.master[18]
1593c1588
< BAR0=402653184
---
> BAR0=471465984
1595,1596c1590,1591
< BAR0Size=16
< BAR1=402653440
---
> BAR0Size=256
> BAR1=471466240
1598c1593
< BAR1Size=1
---
> BAR1Size=4096
1668c1663
< disks=system.cf0
---
> disks=
1670c1665
< io_shift=1
---
> io_shift=2
1672c1667
< pci_dev=7
---
> pci_dev=0
1677c1672
< config=system.iobus.master[8]
---
> config=system.iobus.master[9]
1679c1674
< pio=system.iobus.master[7]
---
> pio=system.iobus.master[8]
1688,1689c1683,1684
< int_num=55
< pio_addr=268566528
---
> int_num=46
> pio_addr=471793664
1697,1699c1692,1693
< [system.realview.dmac_fake]
< type=AmbaFake
< amba_id=0
---
> [system.realview.energy_ctrl]
> type=EnergyCtrl
1700a1695
> dvfs_handler=system.dvfs_handler
1702,1703c1697
< ignore_access=false
< pio_addr=268632064
---
> pio_addr=470286336
1706c1700
< pio=system.iobus.master[9]
---
> pio=system.iobus.master[22]
1708,1709c1702,1775
< [system.realview.energy_ctrl]
< type=EnergyCtrl
---
> [system.realview.ethernet]
> type=IGbE
> BAR0=0
> BAR0LegacyIO=false
> BAR0Size=131072
> BAR1=0
> BAR1LegacyIO=false
> BAR1Size=0
> BAR2=0
> BAR2LegacyIO=false
> BAR2Size=0
> BAR3=0
> BAR3LegacyIO=false
> BAR3Size=0
> BAR4=0
> BAR4LegacyIO=false
> BAR4Size=0
> BAR5=0
> BAR5LegacyIO=false
> BAR5Size=0
> BIST=0
> CacheLineSize=0
> CapabilityPtr=0
> CardbusCIS=0
> ClassCode=2
> Command=0
> DeviceID=4213
> ExpansionROM=0
> HeaderType=0
> InterruptLine=1
> InterruptPin=1
> LatencyTimer=0
> LegacyIOBase=0
> MSICAPBaseOffset=0
> MSICAPCapId=0
> MSICAPMaskBits=0
> MSICAPMsgAddr=0
> MSICAPMsgCtrl=0
> MSICAPMsgData=0
> MSICAPMsgUpperAddr=0
> MSICAPNextCapability=0
> MSICAPPendingBits=0
> MSIXCAPBaseOffset=0
> MSIXCAPCapId=0
> MSIXCAPNextCapability=0
> MSIXMsgCtrl=0
> MSIXPbaOffset=0
> MSIXTableOffset=0
> MaximumLatency=0
> MinimumGrant=255
> PMCAPBaseOffset=0
> PMCAPCapId=0
> PMCAPCapabilities=0
> PMCAPCtrlStatus=0
> PMCAPNextCapability=0
> PXCAPBaseOffset=0
> PXCAPCapId=0
> PXCAPCapabilities=0
> PXCAPDevCap2=0
> PXCAPDevCapabilities=0
> PXCAPDevCtrl=0
> PXCAPDevCtrl2=0
> PXCAPDevStatus=0
> PXCAPLinkCap=0
> PXCAPLinkCtrl=0
> PXCAPLinkStatus=0
> PXCAPNextCapability=0
> ProgIF=0
> Revision=0
> Status=0
> SubClassCode=0
> SubsystemID=4104
> SubsystemVendorID=32902
> VendorID=32902
1711c1777
< dvfs_handler=system.dvfs_handler
---
> config_latency=20000
1713,1714c1779,1791
< pio_addr=268496896
< pio_latency=100000
---
> fetch_comp_delay=10000
> fetch_delay=10000
> hardware_address=00:90:00:00:00:01
> pci_bus=0
> pci_dev=0
> pci_func=0
> phy_epid=896
> phy_pid=680
> pio_latency=30000
> platform=system.realview
> rx_desc_cache_size=64
> rx_fifo_size=393216
> rx_write_delay=0
1715a1793,1799
> tx_desc_cache_size=64
> tx_fifo_size=393216
> tx_read_delay=0
> wb_comp_delay=10000
> wb_delay=10000
> config=system.iobus.master[26]
> dma=system.iobus.slave[4]
1718,1720c1802,1803
< [system.realview.flash_fake]
< type=IsaFake
< clk_domain=system.clk_domain
---
> [system.realview.generic_timer]
> type=GenericTimer
1722,1730c1805,1806
< fake_mem=true
< pio_addr=1073741824
< pio_latency=100000
< pio_size=536870912
< ret_bad_addr=false
< ret_data16=65535
< ret_data32=4294967295
< ret_data64=18446744073709551615
< ret_data8=255
---
> gic=system.realview.gic
> int_num=29
1732,1734d1807
< update_data=false
< warn_access=
< pio=system.iobus.master[24]
1739c1812
< cpu_addr=520093952
---
> cpu_addr=738205696
1741c1814
< dist_addr=520097792
---
> dist_addr=738201600
1751,1753c1824,1826
< [system.realview.gpio0_fake]
< type=AmbaFake
< amba_id=0
---
> [system.realview.hdlcd]
> type=HDLcd
> amba_id=1314816
1754a1828
> enable_capture=true
1756,1758c1830,1834
< ignore_access=false
< pio_addr=268513280
< pio_latency=100000
---
> gic=system.realview.gic
> int_num=117
> pio_addr=721420288
> pio_latency=10000
> pixel_clock=7299
1760c1836,1838
< pio=system.iobus.master[16]
---
> vnc=system.vncserver
> dma=system.membus.slave[0]
> pio=system.iobus.master[5]
1762,1764c1840,1913
< [system.realview.gpio1_fake]
< type=AmbaFake
< amba_id=0
---
> [system.realview.ide]
> type=IdeController
> BAR0=1
> BAR0LegacyIO=false
> BAR0Size=8
> BAR1=1
> BAR1LegacyIO=false
> BAR1Size=4
> BAR2=1
> BAR2LegacyIO=false
> BAR2Size=8
> BAR3=1
> BAR3LegacyIO=false
> BAR3Size=4
> BAR4=1
> BAR4LegacyIO=false
> BAR4Size=16
> BAR5=1
> BAR5LegacyIO=false
> BAR5Size=0
> BIST=0
> CacheLineSize=0
> CapabilityPtr=0
> CardbusCIS=0
> ClassCode=1
> Command=0
> DeviceID=28945
> ExpansionROM=0
> HeaderType=0
> InterruptLine=2
> InterruptPin=2
> LatencyTimer=0
> LegacyIOBase=0
> MSICAPBaseOffset=0
> MSICAPCapId=0
> MSICAPMaskBits=0
> MSICAPMsgAddr=0
> MSICAPMsgCtrl=0
> MSICAPMsgData=0
> MSICAPMsgUpperAddr=0
> MSICAPNextCapability=0
> MSICAPPendingBits=0
> MSIXCAPBaseOffset=0
> MSIXCAPCapId=0
> MSIXCAPNextCapability=0
> MSIXMsgCtrl=0
> MSIXPbaOffset=0
> MSIXTableOffset=0
> MaximumLatency=0
> MinimumGrant=0
> PMCAPBaseOffset=0
> PMCAPCapId=0
> PMCAPCapabilities=0
> PMCAPCtrlStatus=0
> PMCAPNextCapability=0
> PXCAPBaseOffset=0
> PXCAPCapId=0
> PXCAPCapabilities=0
> PXCAPDevCap2=0
> PXCAPDevCapabilities=0
> PXCAPDevCtrl=0
> PXCAPDevCtrl2=0
> PXCAPDevStatus=0
> PXCAPLinkCap=0
> PXCAPLinkCtrl=0
> PXCAPLinkStatus=0
> PXCAPNextCapability=0
> ProgIF=133
> Revision=0
> Status=640
> SubClassCode=1
> SubsystemID=0
> SubsystemVendorID=0
> VendorID=32902
1765a1915,1917
> config_latency=20000
> ctrl_offset=0
> disks=system.cf0
1767,1769c1919,1924
< ignore_access=false
< pio_addr=268517376
< pio_latency=100000
---
> io_shift=0
> pci_bus=0
> pci_dev=1
> pci_func=0
> pio_latency=30000
> platform=system.realview
1771c1926,1928
< pio=system.iobus.master[17]
---
> config=system.iobus.master[24]
> dma=system.iobus.slave[3]
> pio=system.iobus.master[23]
1773,1783d1929
< [system.realview.gpio2_fake]
< type=AmbaFake
< amba_id=0
< clk_domain=system.clk_domain
< eventq_index=0
< ignore_access=false
< pio_addr=268521472
< pio_latency=100000
< system=system
< pio=system.iobus.master[18]
<
1791c1937
< int_num=52
---
> int_num=44
1793c1939
< pio_addr=268460032
---
> pio_addr=470155264
1797c1943
< pio=system.iobus.master[5]
---
> pio=system.iobus.master[6]
1806c1952
< int_num=53
---
> int_num=45
1808c1954
< pio_addr=268464128
---
> pio_addr=470220800
1812c1958
< pio=system.iobus.master[6]
---
> pio=system.iobus.master[7]
1819c1965
< pio_addr=520101888
---
> pio_addr=739246080
1830c1976
< pio=system.membus.master[3]
---
> pio=system.iobus.master[12]
1831a1978,1995
> [system.realview.lan_fake]
> type=IsaFake
> clk_domain=system.clk_domain
> eventq_index=0
> fake_mem=false
> pio_addr=436207616
> pio_latency=100000
> pio_size=65535
> 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[19]
>
1839c2003
< pio_addr=520095232
---
> pio_addr=738721792
1842c2006
< pio=system.membus.master[5]
---
> pio=system.membus.master[3]
1850c2014
< pio_addr=268455936
---
> pio_addr=470089728
1853c2017
< pio=system.iobus.master[22]
---
> pio=system.iobus.master[21]
1865c2029
< range=2147483648:2214592511
---
> range=0:67108863
1867a2032,2043
> [system.realview.pciconfig]
> type=PciConfigAll
> bus=0
> clk_domain=system.clk_domain
> eventq_index=0
> pio_addr=0
> pio_latency=30000
> platform=system.realview
> size=268435456
> system=system
> pio=system.iobus.default
>
1872,1873c2048,2049
< idreg=0
< pio_addr=268435456
---
> idreg=35979264
> pio_addr=469827584
1875,1876c2051,2052
< proc_id0=201326592
< proc_id1=201327138
---
> proc_id0=335544320
> proc_id1=335544320
1887,1888c2063,2064
< int_num=42
< pio_addr=268529664
---
> int_num=36
> pio_addr=471269376
1892c2068
< pio=system.iobus.master[23]
---
> pio=system.iobus.master[10]
1894,1915d2069
< [system.realview.sci_fake]
< type=AmbaFake
< amba_id=0
< clk_domain=system.clk_domain
< eventq_index=0
< ignore_access=false
< pio_addr=268492800
< pio_latency=100000
< system=system
< pio=system.iobus.master[20]
<
< [system.realview.smc_fake]
< type=AmbaFake
< amba_id=0
< clk_domain=system.clk_domain
< eventq_index=0
< ignore_access=false
< pio_addr=269357056
< pio_latency=100000
< system=system
< pio=system.iobus.master[13]
<
1922c2076
< pio_addr=268439552
---
> pio_addr=469893120
1925c2079
< pio=system.iobus.master[14]
---
> pio=system.iobus.master[16]
1927,1937d2080
< [system.realview.ssp_fake]
< type=AmbaFake
< amba_id=0
< clk_domain=system.clk_domain
< eventq_index=0
< ignore_access=false
< pio_addr=268488704
< pio_latency=100000
< system=system
< pio=system.iobus.master[19]
<
1946,1948c2089,2091
< int_num0=36
< int_num1=36
< pio_addr=268505088
---
> int_num0=34
> int_num1=34
> pio_addr=470876160
1961,1963c2104,2106
< int_num0=37
< int_num1=37
< pio_addr=268509184
---
> int_num0=35
> int_num1=35
> pio_addr=470941696
1975,1976c2118,2119
< int_num=44
< pio_addr=268472320
---
> int_num=37
> pio_addr=470351872
1989c2132
< pio_addr=268476416
---
> pio_addr=470417408
1992c2135
< pio=system.iobus.master[10]
---
> pio=system.iobus.master[13]
2000c2143
< pio_addr=268480512
---
> pio_addr=470482944
2003c2146
< pio=system.iobus.master[11]
---
> pio=system.iobus.master[14]
2011c2154
< pio_addr=268484608
---
> pio_addr=470548480
2014c2157
< pio=system.iobus.master[12]
---
> pio=system.iobus.master[15]
2015a2159,2202
> [system.realview.usb_fake]
> type=IsaFake
> clk_domain=system.clk_domain
> eventq_index=0
> fake_mem=false
> pio_addr=452984832
> pio_latency=100000
> pio_size=131071
> 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[20]
>
> [system.realview.vgic]
> type=VGic
> clk_domain=system.clk_domain
> eventq_index=0
> gic=system.realview.gic
> hv_addr=738213888
> pio_delay=10000
> platform=system.realview
> ppint=25
> system=system
> vcpu_addr=738222080
> pio=system.membus.master[4]
>
> [system.realview.vram]
> type=SimpleMemory
> bandwidth=73.000000
> clk_domain=system.clk_domain
> conf_table_reported=false
> eventq_index=0
> in_addr_map=true
> latency=30000
> latency_var=0
> null=false
> range=402653184:436207615
> port=system.iobus.master[11]
>
2022c2209
< pio_addr=268500992
---
> pio_addr=470745088
2025c2212
< pio=system.iobus.master[15]
---
> pio=system.iobus.master[17]