1 files changed, 20 insertions, 16 deletions

diff --git a/tests/quick/se/00.hello/ref/x86/linux/simple-timing-ruby/config.ini b/tests/quick/se/00.hello/ref/x86/linux/simple-timing-ruby/config.ini
index 95be41a11..e879347ff 100644
--- a/tests/quick/se/00.hello/ref/x86/linux/simple-timing-ruby/config.ini
+++ b/tests/quick/se/00.hello/ref/x86/linux/simple-timing-ruby/config.ini
@@ -16,7 +16,6 @@ load_addr_mask=1099511627775
 mem_mode=timing
 memories=system.physmem
 num_work_ids=16
-physmem=system.physmem
 readfile=
 symbolfile=
 work_begin_ckpt_count=0
@@ -26,7 +25,7 @@ work_cpus_ckpt_count=0
 work_end_ckpt_count=0
 work_end_exit_count=0
 work_item_id=-1
-system_port=system.sys_port_proxy.port[0]
+system_port=system.sys_port_proxy.slave[0]
 
 [system.cpu]
 type=TimingSimpleCPU
@@ -54,8 +53,8 @@ progress_interval=0
 system=system
 tracer=system.cpu.tracer
 workload=system.cpu.workload
-dcache_port=system.l1_cntrl0.sequencer.port[1]
-icache_port=system.l1_cntrl0.sequencer.port[0]
+dcache_port=system.l1_cntrl0.sequencer.slave[1]
+icache_port=system.l1_cntrl0.sequencer.slave[0]
 
 [system.cpu.dtb]
 type=X86TLB
@@ -66,7 +65,7 @@ walker=system.cpu.dtb.walker
 [system.cpu.dtb.walker]
 type=X86PagetableWalker
 system=system
-port=system.l1_cntrl0.sequencer.port[3]
+port=system.l1_cntrl0.sequencer.slave[3]
 
 [system.cpu.interrupts]
 type=X86LocalApic
@@ -74,8 +73,9 @@ int_latency=1
 pio_addr=2305843009213693952
 pio_latency=1
 system=system
-int_port=system.l1_cntrl0.sequencer.port[5]
-pio=system.l1_cntrl0.sequencer.port[4]
+int_master=system.l1_cntrl0.sequencer.slave[4]
+int_slave=system.l1_cntrl0.sequencer.master[1]
+pio=system.l1_cntrl0.sequencer.master[0]
 
 [system.cpu.itb]
 type=X86TLB
@@ -86,7 +86,7 @@ walker=system.cpu.itb.walker
 [system.cpu.itb.walker]
 type=X86PagetableWalker
 system=system
-port=system.l1_cntrl0.sequencer.port[2]
+port=system.l1_cntrl0.sequencer.slave[2]
 
 [system.cpu.tracer]
 type=ExeTracer
@@ -185,23 +185,26 @@ dcache=system.l1_cntrl0.cacheMemory
 deadlock_threshold=500000
 icache=system.l1_cntrl0.cacheMemory
 max_outstanding_requests=16
-physmem=system.physmem
 ruby_system=system.ruby
+support_data_reqs=true
+support_inst_reqs=true
+system=system
 using_network_tester=false
 using_ruby_tester=false
 version=0
-physMemPort=system.physmem.port[0]
-port=system.cpu.icache_port system.cpu.dcache_port system.cpu.itb.walker.port system.cpu.dtb.walker.port system.cpu.interrupts.pio system.cpu.interrupts.int_port
+master=system.cpu.interrupts.pio system.cpu.interrupts.int_slave
+slave=system.cpu.icache_port system.cpu.dcache_port system.cpu.itb.walker.port system.cpu.dtb.walker.port system.cpu.interrupts.int_master
 
 [system.physmem]
-type=PhysicalMemory
+type=SimpleMemory
+conf_table_reported=false
 file=
+in_addr_map=true
 latency=30
 latency_var=0
 null=false
 range=0:134217727
 zero=false
-port=system.l1_cntrl0.sequencer.physMemPort system.sys_port_proxy.physMemPort
 
 [system.ruby]
 type=RubySystem
@@ -292,11 +295,12 @@ ruby_system=system.ruby
 [system.sys_port_proxy]
 type=RubyPortProxy
 access_phys_mem=true
-physmem=system.physmem
 ruby_system=system.ruby
+support_data_reqs=true
+support_inst_reqs=true
+system=system
 using_network_tester=false
 using_ruby_tester=false
 version=0
-physMemPort=system.physmem.port[1]
-port=system.system_port
+slave=system.system_port