diff options
Diffstat (limited to 'tests/quick/fs/10.linux-boot/ref/x86/linux/pc-simple-atomic/config.ini')
| -rw-r--r-- | tests/quick/fs/10.linux-boot/ref/x86/linux/pc-simple-atomic/config.ini | 98 |
1 files changed, 52 insertions, 46 deletions
diff --git a/tests/quick/fs/10.linux-boot/ref/x86/linux/pc-simple-atomic/config.ini b/tests/quick/fs/10.linux-boot/ref/x86/linux/pc-simple-atomic/config.ini index 1885ca8f8..d5bc006d3 100644 --- a/tests/quick/fs/10.linux-boot/ref/x86/linux/pc-simple-atomic/config.ini +++ b/tests/quick/fs/10.linux-boot/ref/x86/linux/pc-simple-atomic/config.ini @@ -20,7 +20,6 @@ load_addr_mask=18446744073709551615 mem_mode=atomic memories=system.physmem num_work_ids=16 -physmem=system.physmem readfile=tests/halt.sh smbios_table=system.smbios_table symbolfile= @@ -31,7 +30,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_port=system.membus.slave[1] [system.acpi_description_table_pointer] type=X86ACPIRSDP @@ -58,8 +57,8 @@ ranges=11529215046068469760:11529215046068473855 req_size=16 resp_size=16 write_ack=false -master=system.membus.port[2] -slave=system.iobus.port[1] +master=system.membus.slave[0] +slave=system.iobus.master[0] [system.bridge] type=Bridge @@ -69,8 +68,8 @@ ranges=4273995776:4273999871 9223372036854775808:11529215046068469759 1383505805 req_size=16 resp_size=16 write_ack=false -master=system.iobus.port[0] -slave=system.membus.port[1] +master=system.iobus.slave[0] +slave=system.membus.master[1] [system.cpu] type=AtomicSimpleCPU @@ -83,6 +82,7 @@ do_checkpoint_insts=true do_quiesce=true do_statistics_insts=true dtb=system.cpu.dtb +fastmem=false function_trace=false function_trace_start=0 interrupts=system.cpu.interrupts @@ -106,7 +106,7 @@ icache_port=system.cpu.icache.cpu_side [system.cpu.dcache] type=BaseCache -addr_range=0:18446744073709551615 +addr_ranges=0:18446744073709551615 assoc=4 block_size=64 forward_snoops=true @@ -127,7 +127,7 @@ trace_addr=0 two_queue=false write_buffers=8 cpu_side=system.cpu.dcache_port -mem_side=system.toL2Bus.port[2] +mem_side=system.toL2Bus.slave[1] [system.cpu.dtb] type=X86TLB @@ -142,7 +142,7 @@ port=system.cpu.dtb_walker_cache.cpu_side [system.cpu.dtb_walker_cache] type=BaseCache -addr_range=0:18446744073709551615 +addr_ranges=0:18446744073709551615 assoc=2 block_size=64 forward_snoops=true @@ -163,11 +163,11 @@ trace_addr=0 two_queue=false write_buffers=8 cpu_side=system.cpu.dtb.walker.port -mem_side=system.toL2Bus.port[4] +mem_side=system.toL2Bus.slave[3] [system.cpu.icache] type=BaseCache -addr_range=0:18446744073709551615 +addr_ranges=0:18446744073709551615 assoc=1 block_size=64 forward_snoops=true @@ -188,7 +188,7 @@ trace_addr=0 two_queue=false write_buffers=8 cpu_side=system.cpu.icache_port -mem_side=system.toL2Bus.port[1] +mem_side=system.toL2Bus.slave[0] [system.cpu.interrupts] type=X86LocalApic @@ -196,8 +196,9 @@ int_latency=1000 pio_addr=2305843009213693952 pio_latency=1000 system=system -int_port=system.membus.port[7] -pio=system.membus.port[6] +int_master=system.membus.slave[4] +int_slave=system.membus.master[3] +pio=system.membus.master[2] [system.cpu.itb] type=X86TLB @@ -212,7 +213,7 @@ port=system.cpu.itb_walker_cache.cpu_side [system.cpu.itb_walker_cache] type=BaseCache -addr_range=0:18446744073709551615 +addr_ranges=0:18446744073709551615 assoc=2 block_size=64 forward_snoops=true @@ -233,7 +234,7 @@ trace_addr=0 two_queue=false write_buffers=8 cpu_side=system.cpu.itb.walker.port -mem_side=system.toL2Bus.port[3] +mem_side=system.toL2Bus.slave[2] [system.cpu.tracer] type=ExeTracer @@ -610,11 +611,12 @@ header_cycles=1 use_default_range=true width=64 default=system.pc.pciconfig.pio -port=system.bridge.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.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 +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 +slave=system.bridge.master system.pc.south_bridge.ide.dma system.pc.south_bridge.io_apic.int_master [system.iocache] type=BaseCache -addr_range=0:134217727 +addr_ranges=0:134217727 assoc=8 block_size=64 forward_snoops=false @@ -634,12 +636,12 @@ tgts_per_mshr=12 trace_addr=0 two_queue=false write_buffers=8 -cpu_side=system.iobus.port[21] -mem_side=system.membus.port[4] +cpu_side=system.iobus.master[18] +mem_side=system.membus.slave[2] [system.l2c] type=BaseCache -addr_range=0:18446744073709551615 +addr_ranges=0:18446744073709551615 assoc=8 block_size=64 forward_snoops=true @@ -659,8 +661,8 @@ tgts_per_mshr=16 trace_addr=0 two_queue=false write_buffers=8 -cpu_side=system.toL2Bus.port[0] -mem_side=system.membus.port[5] +cpu_side=system.toL2Bus.master[0] +mem_side=system.membus.slave[3] [system.membus] type=Bus @@ -672,7 +674,8 @@ header_cycles=1 use_default_range=false width=64 default=system.membus.badaddr_responder.pio -port=system.physmem.port[0] system.bridge.slave system.apicbridge.master system.system_port system.iocache.mem_side system.l2c.mem_side system.cpu.interrupts.pio system.cpu.interrupts.int_port +master=system.physmem.port[0] system.bridge.slave system.cpu.interrupts.pio system.cpu.interrupts.int_slave +slave=system.apicbridge.master system.system_port system.iocache.mem_side system.l2c.mem_side system.cpu.interrupts.int_master [system.membus.badaddr_responder] type=IsaFake @@ -710,7 +713,7 @@ ret_data8=255 system=system update_data=false warn_access= -pio=system.iobus.port[15] +pio=system.iobus.master[12] [system.pc.com_1] type=Uart8250 @@ -720,7 +723,7 @@ pio_latency=1000 platform=system.pc system=system terminal=system.pc.com_1.terminal -pio=system.iobus.port[16] +pio=system.iobus.master[13] [system.pc.com_1.terminal] type=Terminal @@ -750,7 +753,7 @@ ret_data8=255 system=system update_data=false warn_access= -pio=system.iobus.port[17] +pio=system.iobus.master[14] [system.pc.fake_com_3] type=IsaFake @@ -766,7 +769,7 @@ ret_data8=255 system=system update_data=false warn_access= -pio=system.iobus.port[18] +pio=system.iobus.master[15] [system.pc.fake_com_4] type=IsaFake @@ -782,7 +785,7 @@ ret_data8=255 system=system update_data=false warn_access= -pio=system.iobus.port[19] +pio=system.iobus.master[16] [system.pc.fake_floppy] type=IsaFake @@ -798,7 +801,7 @@ ret_data8=255 system=system update_data=false warn_access= -pio=system.iobus.port[20] +pio=system.iobus.master[17] [system.pc.i_dont_exist] type=IsaFake @@ -814,7 +817,7 @@ ret_data8=255 system=system update_data=false warn_access= -pio=system.iobus.port[14] +pio=system.iobus.master[11] [system.pc.pciconfig] type=PciConfigAll @@ -847,7 +850,7 @@ pio_addr=9223372036854775920 pio_latency=1000 system=system time=Sun Jan 1 00:00:00 2012 -pio=system.iobus.port[2] +pio=system.iobus.master[1] [system.pc.south_bridge.cmos.int_pin] type=X86IntSourcePin @@ -857,7 +860,7 @@ type=I8237 pio_addr=9223372036854775808 pio_latency=1000 system=system -pio=system.iobus.port[3] +pio=system.iobus.master[2] [system.pc.south_bridge.ide] type=IdeController @@ -912,9 +915,9 @@ pci_func=0 pio_latency=1000 platform=system.pc system=system -config=system.iobus.port[5] -dma=system.iobus.port[6] -pio=system.iobus.port[4] +config=system.iobus.master[4] +dma=system.iobus.slave[1] +pio=system.iobus.master[3] [system.pc.south_bridge.ide.disks0] type=IdeDisk @@ -1041,8 +1044,8 @@ int_latency=1000 pio_addr=4273995776 pio_latency=1000 system=system -int_port=system.iobus.port[13] -pio=system.iobus.port[12] +int_master=system.iobus.slave[2] +pio=system.iobus.master[10] [system.pc.south_bridge.keyboard] type=I8042 @@ -1054,7 +1057,7 @@ mouse_int_pin=system.pc.south_bridge.keyboard.mouse_int_pin pio_addr=0 pio_latency=1000 system=system -pio=system.iobus.port[7] +pio=system.iobus.master[5] [system.pc.south_bridge.keyboard.keyboard_int_pin] type=X86IntSourcePin @@ -1071,7 +1074,7 @@ pio_addr=9223372036854775840 pio_latency=1000 slave=system.pc.south_bridge.pic2 system=system -pio=system.iobus.port[8] +pio=system.iobus.master[6] [system.pc.south_bridge.pic1.output] type=X86IntSourcePin @@ -1085,7 +1088,7 @@ pio_addr=9223372036854775968 pio_latency=1000 slave=Null system=system -pio=system.iobus.port[9] +pio=system.iobus.master[7] [system.pc.south_bridge.pic2.output] type=X86IntSourcePin @@ -1097,7 +1100,7 @@ int_pin=system.pc.south_bridge.pit.int_pin pio_addr=9223372036854775872 pio_latency=1000 system=system -pio=system.iobus.port[10] +pio=system.iobus.master[8] [system.pc.south_bridge.pit.int_pin] type=X86IntSourcePin @@ -1108,17 +1111,19 @@ i8254=system.pc.south_bridge.pit pio_addr=9223372036854775905 pio_latency=1000 system=system -pio=system.iobus.port[11] +pio=system.iobus.master[9] [system.physmem] -type=PhysicalMemory +type=SimpleMemory +conf_table_reported=false file= +in_addr_map=true latency=30000 latency_var=0 null=false range=0:134217727 zero=false -port=system.membus.port[0] +port=system.membus.master[0] [system.smbios_table] type=X86SMBiosSMBiosTable @@ -1149,5 +1154,6 @@ clock=1000 header_cycles=1 use_default_range=false width=64 -port=system.l2c.cpu_side system.cpu.icache.mem_side system.cpu.dcache.mem_side system.cpu.itb_walker_cache.mem_side system.cpu.dtb_walker_cache.mem_side +master=system.l2c.cpu_side +slave=system.cpu.icache.mem_side system.cpu.dcache.mem_side system.cpu.itb_walker_cache.mem_side system.cpu.dtb_walker_cache.mem_side |