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.1cpu.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.realview.nvmem system.physmem
---
> mem_ranges=2147483648:2415919103
> memories=system.physmem system.realview.vram system.realview.nvmem
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
280a281
> pmu=Null
347c348
< mem_side=system.membus.slave[1]
---
> mem_side=system.membus.slave[2]
401c402
< use_default_range=false
---
> use_default_range=true
403,404c404,406
< 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
409c411
< addr_ranges=0:134217727
---
> addr_ranges=2147483648:2415919103
428,429c430,431
< cpu_side=system.iobus.master[26]
< mem_side=system.membus.slave[2]
---
> cpu_side=system.iobus.master[27]
> mem_side=system.membus.slave[3]
452,453c454,455
< 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.cpu.l2cache.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.cpu.l2cache.mem_side system.iocache.mem_side
483,484c485,486
< range=0:134217727
< port=system.membus.master[6]
---
> range=2147483648:2415919103
> port=system.membus.master[5]
488c490
< 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
491c493
< pci_cfg_base=0
---
> pci_cfg_base=805306368
496,504d497
< [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]
<
511c504
< pio_addr=268451840
---
> pio_addr=470024192
514c507
< pio=system.iobus.master[21]
---
> pio=system.iobus.master[18]
518c511
< BAR0=402653184
---
> BAR0=471465984
520,521c513,514
< BAR0Size=16
< BAR1=402653440
---
> BAR0Size=256
> BAR1=471466240
523c516
< BAR1Size=1
---
> BAR1Size=4096
593c586
< disks=system.cf0
---
> disks=
595c588
< io_shift=1
---
> io_shift=2
597c590
< pci_dev=7
---
> pci_dev=0
602c595
< config=system.iobus.master[8]
---
> config=system.iobus.master[9]
604c597
< pio=system.iobus.master[7]
---
> pio=system.iobus.master[8]
613,614c606,607
< int_num=55
< pio_addr=268566528
---
> int_num=46
> pio_addr=471793664
622,624c615,616
< [system.realview.dmac_fake]
< type=AmbaFake
< amba_id=0
---
> [system.realview.energy_ctrl]
> type=EnergyCtrl
625a618
> dvfs_handler=system.dvfs_handler
627,628c620
< ignore_access=false
< pio_addr=268632064
---
> pio_addr=470286336
631c623
< pio=system.iobus.master[9]
---
> pio=system.iobus.master[22]
633,634c625,698
< [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
636c700
< dvfs_handler=system.dvfs_handler
---
> config_latency=20000
638,639c702,714
< 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
640a716,722
> 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]
643,645c725,726
< [system.realview.flash_fake]
< type=IsaFake
< clk_domain=system.clk_domain
---
> [system.realview.generic_timer]
> type=GenericTimer
647,655c728,729
< 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
657,659d730
< update_data=false
< warn_access=
< pio=system.iobus.master[24]
664c735
< cpu_addr=520093952
---
> cpu_addr=738205696
666c737
< dist_addr=520097792
---
> dist_addr=738201600
676,678c747,749
< [system.realview.gpio0_fake]
< type=AmbaFake
< amba_id=0
---
> [system.realview.hdlcd]
> type=HDLcd
> amba_id=1314816
679a751
> enable_capture=true
681,683c753,757
< 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
685c759,761
< pio=system.iobus.master[16]
---
> vnc=system.vncserver
> dma=system.membus.slave[0]
> pio=system.iobus.master[5]
687,689c763,836
< [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
690a838,840
> config_latency=20000
> ctrl_offset=0
> disks=system.cf0
692,694c842,847
< 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
696c849,851
< pio=system.iobus.master[17]
---
> config=system.iobus.master[24]
> dma=system.iobus.slave[3]
> pio=system.iobus.master[23]
698,708d852
< [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]
<
716c860
< int_num=52
---
> int_num=44
718c862
< pio_addr=268460032
---
> pio_addr=470155264
722c866
< pio=system.iobus.master[5]
---
> pio=system.iobus.master[6]
731c875
< int_num=53
---
> int_num=45
733c877
< pio_addr=268464128
---
> pio_addr=470220800
737c881
< pio=system.iobus.master[6]
---
> pio=system.iobus.master[7]
744c888
< pio_addr=520101888
---
> pio_addr=739246080
755c899
< pio=system.membus.master[3]
---
> pio=system.iobus.master[12]
756a901,918
> [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]
>
764c926
< pio_addr=520095232
---
> pio_addr=738721792
767c929
< pio=system.membus.master[5]
---
> pio=system.membus.master[3]
775c937
< pio_addr=268455936
---
> pio_addr=470089728
778c940
< pio=system.iobus.master[22]
---
> pio=system.iobus.master[21]
790c952
< range=2147483648:2214592511
---
> range=0:67108863
792a955,966
> [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
>
797,798c971,972
< idreg=0
< pio_addr=268435456
---
> idreg=35979264
> pio_addr=469827584
800,801c974,975
< proc_id0=201326592
< proc_id1=201327138
---
> proc_id0=335544320
> proc_id1=335544320
812,813c986,987
< int_num=42
< pio_addr=268529664
---
> int_num=36
> pio_addr=471269376
817c991
< pio=system.iobus.master[23]
---
> pio=system.iobus.master[10]
819,840d992
< [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]
<
847c999
< pio_addr=268439552
---
> pio_addr=469893120
850c1002
< pio=system.iobus.master[14]
---
> pio=system.iobus.master[16]
852,862d1003
< [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]
<
871,873c1012,1014
< int_num0=36
< int_num1=36
< pio_addr=268505088
---
> int_num0=34
> int_num1=34
> pio_addr=470876160
886,888c1027,1029
< int_num0=37
< int_num1=37
< pio_addr=268509184
---
> int_num0=35
> int_num1=35
> pio_addr=470941696
900,901c1041,1042
< int_num=44
< pio_addr=268472320
---
> int_num=37
> pio_addr=470351872
914c1055
< pio_addr=268476416
---
> pio_addr=470417408
917c1058
< pio=system.iobus.master[10]
---
> pio=system.iobus.master[13]
925c1066
< pio_addr=268480512
---
> pio_addr=470482944
928c1069
< pio=system.iobus.master[11]
---
> pio=system.iobus.master[14]
936c1077
< pio_addr=268484608
---
> pio_addr=470548480
939c1080
< pio=system.iobus.master[12]
---
> pio=system.iobus.master[15]
940a1082,1125
> [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]
>
947c1132
< pio_addr=268500992
---
> pio_addr=470745088
950c1135
< pio=system.iobus.master[15]
---
> pio=system.iobus.master[17]