diff options
author | Gabe Black <gblack@eecs.umich.edu> | 2012-01-16 04:27:10 -0800 |
---|---|---|
committer | Gabe Black <gblack@eecs.umich.edu> | 2012-01-16 04:27:10 -0800 |
commit | da2a4acc26ba264c3c4a12495776fd6a1c4fb133 (patch) | |
tree | f142100388b9d1403492c97b0d323728ce18ef8a /tests/quick/10.linux-boot/ref/x86/linux/pc-simple-atomic/config.ini | |
parent | 241cc0c8402f1b9f2ec20d1cc152d96930959b2a (diff) | |
parent | a7394ad6807bd5e85f680184bf308673ca00534a (diff) | |
download | gem5-da2a4acc26ba264c3c4a12495776fd6a1c4fb133.tar.xz |
Merge yet again with the main repository.
Diffstat (limited to 'tests/quick/10.linux-boot/ref/x86/linux/pc-simple-atomic/config.ini')
-rw-r--r-- | tests/quick/10.linux-boot/ref/x86/linux/pc-simple-atomic/config.ini | 119 |
1 files changed, 70 insertions, 49 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 1f83b404b..bea7090e9 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 @@ -15,9 +15,11 @@ e820_table=system.e820_table init_param=0 intel_mp_pointer=system.intel_mp_pointer intel_mp_table=system.intel_mp_table -kernel=/dist/m5/system/binaries/x86_64-vmlinux-2.6.22.9 +kernel=/scratch/nilay/GEM5/system/binaries/x86_64-vmlinux-2.6.22.9 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 @@ -707,6 +709,7 @@ port=system.physmem.port[0] system.bridge.side_b system.iocache.mem_side system. [system.membus.badaddr_responder] type=IsaFake +fake_mem=false pio_addr=0 pio_latency=1000 pio_size=8 @@ -729,6 +732,7 @@ system=system [system.pc.behind_pci] type=IsaFake +fake_mem=false pio_addr=9223372036854779128 pio_latency=1000 pio_size=8 @@ -745,15 +749,31 @@ pio=system.iobus.port[12] [system.pc.com_1] type=Uart8250 +children=terminal pio_addr=9223372036854776824 pio_latency=1000 platform=system.pc system=system -terminal=system.pc.terminal +terminal=system.pc.com_1.terminal pio=system.iobus.port[13] +[system.pc.com_1.terminal] +type=Terminal +intr_control=system.intrctrl +number=0 +output=true +port=3456 + +[system.pc.com_1.terminal] +type=Terminal +intr_control=system.intrctrl +number=0 +output=true +port=3456 + [system.pc.fake_com_2] type=IsaFake +fake_mem=false pio_addr=9223372036854776568 pio_latency=1000 pio_size=8 @@ -770,6 +790,7 @@ pio=system.iobus.port[14] [system.pc.fake_com_3] type=IsaFake +fake_mem=false pio_addr=9223372036854776808 pio_latency=1000 pio_size=8 @@ -786,6 +807,7 @@ pio=system.iobus.port[15] [system.pc.fake_com_4] type=IsaFake +fake_mem=false pio_addr=9223372036854776552 pio_latency=1000 pio_size=8 @@ -802,6 +824,7 @@ pio=system.iobus.port[16] [system.pc.fake_floppy] type=IsaFake +fake_mem=false pio_addr=9223372036854776818 pio_latency=1000 pio_size=2 @@ -818,6 +841,7 @@ pio=system.iobus.port[17] [system.pc.i_dont_exist] type=IsaFake +fake_mem=false pio_addr=9223372036854775936 pio_latency=1000 pio_size=1 @@ -846,7 +870,6 @@ type=SouthBridge children=cmos dma1 ide int_lines0 int_lines1 int_lines2 int_lines3 int_lines4 int_lines5 int_lines6 io_apic keyboard pic1 pic2 pit speaker cmos=system.pc.south_bridge.cmos dma1=system.pc.south_bridge.dma1 -int_lines=system.pc.south_bridge.int_lines0 system.pc.south_bridge.int_lines1 system.pc.south_bridge.int_lines2 system.pc.south_bridge.int_lines3 system.pc.south_bridge.int_lines4 system.pc.south_bridge.int_lines5 system.pc.south_bridge.int_lines6 io_apic=system.pc.south_bridge.io_apic keyboard=system.pc.south_bridge.keyboard pic1=system.pc.south_bridge.pic1 @@ -858,7 +881,8 @@ speaker=system.pc.south_bridge.speaker [system.pc.south_bridge.cmos] type=Cmos -int_pin=system.pc.south_bridge.int_lines2.source +children=int_pin +int_pin=system.pc.south_bridge.cmos.int_pin pio_addr=9223372036854775920 pio_latency=1000 platform=system.pc @@ -866,6 +890,9 @@ system=system time=Sun Jan 1 00:00:00 2012 pio=system.iobus.port[1] +[system.pc.south_bridge.cmos.int_pin] +type=X86IntSourcePin + [system.pc.south_bridge.dma1] type=I8237 pio_addr=9223372036854775808 @@ -948,7 +975,7 @@ table_size=65536 [system.pc.south_bridge.ide.disks0.image.child] type=RawDiskImage -image_file=/dist/m5/system/disks/linux-x86.img +image_file=/scratch/nilay/GEM5/system/disks/linux-x86.img read_only=true [system.pc.south_bridge.ide.disks1] @@ -968,70 +995,58 @@ table_size=65536 [system.pc.south_bridge.ide.disks1.image.child] type=RawDiskImage -image_file=/dist/m5/system/disks/linux-bigswap2.img +image_file=/scratch/nilay/GEM5/system/disks/linux-bigswap2.img read_only=true [system.pc.south_bridge.int_lines0] type=X86IntLine -children=sink source +children=sink sink=system.pc.south_bridge.int_lines0.sink -source=system.pc.south_bridge.int_lines0.source +source=system.pc.south_bridge.pic1.output [system.pc.south_bridge.int_lines0.sink] type=X86IntSinkPin device=system.pc.south_bridge.io_apic number=0 -[system.pc.south_bridge.int_lines0.source] -type=X86IntSourcePin - [system.pc.south_bridge.int_lines1] type=X86IntLine -children=sink source +children=sink sink=system.pc.south_bridge.int_lines1.sink -source=system.pc.south_bridge.int_lines1.source +source=system.pc.south_bridge.pic2.output [system.pc.south_bridge.int_lines1.sink] type=X86IntSinkPin device=system.pc.south_bridge.pic1 number=2 -[system.pc.south_bridge.int_lines1.source] -type=X86IntSourcePin - [system.pc.south_bridge.int_lines2] type=X86IntLine -children=sink source +children=sink sink=system.pc.south_bridge.int_lines2.sink -source=system.pc.south_bridge.int_lines2.source +source=system.pc.south_bridge.cmos.int_pin [system.pc.south_bridge.int_lines2.sink] type=X86IntSinkPin device=system.pc.south_bridge.pic2 number=0 -[system.pc.south_bridge.int_lines2.source] -type=X86IntSourcePin - [system.pc.south_bridge.int_lines3] type=X86IntLine -children=sink source +children=sink sink=system.pc.south_bridge.int_lines3.sink -source=system.pc.south_bridge.int_lines3.source +source=system.pc.south_bridge.pit.int_pin [system.pc.south_bridge.int_lines3.sink] type=X86IntSinkPin device=system.pc.south_bridge.pic1 number=0 -[system.pc.south_bridge.int_lines3.source] -type=X86IntSourcePin - [system.pc.south_bridge.int_lines4] type=X86IntLine children=sink sink=system.pc.south_bridge.int_lines4.sink -source=system.pc.south_bridge.int_lines3.source +source=system.pc.south_bridge.pit.int_pin [system.pc.south_bridge.int_lines4.sink] type=X86IntSinkPin @@ -1040,32 +1055,26 @@ number=2 [system.pc.south_bridge.int_lines5] type=X86IntLine -children=sink source +children=sink sink=system.pc.south_bridge.int_lines5.sink -source=system.pc.south_bridge.int_lines5.source +source=system.pc.south_bridge.keyboard.keyboard_int_pin [system.pc.south_bridge.int_lines5.sink] type=X86IntSinkPin device=system.pc.south_bridge.io_apic number=1 -[system.pc.south_bridge.int_lines5.source] -type=X86IntSourcePin - [system.pc.south_bridge.int_lines6] type=X86IntLine -children=sink source +children=sink sink=system.pc.south_bridge.int_lines6.sink -source=system.pc.south_bridge.int_lines6.source +source=system.pc.south_bridge.keyboard.mouse_int_pin [system.pc.south_bridge.int_lines6.sink] type=X86IntSinkPin device=system.pc.south_bridge.io_apic number=12 -[system.pc.south_bridge.int_lines6.source] -type=X86IntSourcePin - [system.pc.south_bridge.io_apic] type=I82094AA apic_id=1 @@ -1080,20 +1089,28 @@ pio=system.iobus.port[9] [system.pc.south_bridge.keyboard] type=I8042 +children=keyboard_int_pin mouse_int_pin command_port=9223372036854775908 data_port=9223372036854775904 -keyboard_int_pin=system.pc.south_bridge.int_lines5.source -mouse_int_pin=system.pc.south_bridge.int_lines6.source +keyboard_int_pin=system.pc.south_bridge.keyboard.keyboard_int_pin +mouse_int_pin=system.pc.south_bridge.keyboard.mouse_int_pin pio_addr=0 pio_latency=1000 platform=system.pc system=system pio=system.iobus.port[4] +[system.pc.south_bridge.keyboard.keyboard_int_pin] +type=X86IntSourcePin + +[system.pc.south_bridge.keyboard.mouse_int_pin] +type=X86IntSourcePin + [system.pc.south_bridge.pic1] type=I8259 +children=output mode=I8259Master -output=system.pc.south_bridge.int_lines0.source +output=system.pc.south_bridge.pic1.output pio_addr=9223372036854775840 pio_latency=1000 platform=system.pc @@ -1101,10 +1118,14 @@ slave=system.pc.south_bridge.pic2 system=system pio=system.iobus.port[5] +[system.pc.south_bridge.pic1.output] +type=X86IntSourcePin + [system.pc.south_bridge.pic2] type=I8259 +children=output mode=I8259Slave -output=system.pc.south_bridge.int_lines1.source +output=system.pc.south_bridge.pic2.output pio_addr=9223372036854775968 pio_latency=1000 platform=system.pc @@ -1112,15 +1133,22 @@ slave=Null system=system pio=system.iobus.port[6] +[system.pc.south_bridge.pic2.output] +type=X86IntSourcePin + [system.pc.south_bridge.pit] type=I8254 -int_pin=system.pc.south_bridge.int_lines3.source +children=int_pin +int_pin=system.pc.south_bridge.pit.int_pin pio_addr=9223372036854775872 pio_latency=1000 platform=system.pc system=system pio=system.iobus.port[7] +[system.pc.south_bridge.pit.int_pin] +type=X86IntSourcePin + [system.pc.south_bridge.speaker] type=PcSpeaker i8254=system.pc.south_bridge.pit @@ -1130,13 +1158,6 @@ platform=system.pc system=system pio=system.iobus.port[8] -[system.pc.terminal] -type=Terminal -intr_control=system.intrctrl -number=0 -output=true -port=3456 - [system.physmem] type=PhysicalMemory file= |