127c127
< prototypes = [ MemTest(atomic=options.atomic, max_loads=options.maxloads,
---
> prototypes = [ MemTest(max_loads=options.maxloads,
149,151c149
< system = System(funcmem = SimpleMemory(in_addr_map = False),
< funcbus = NoncoherentXBar(),
< physmem = SimpleMemory(latency = "100ns"),
---
> system = System(physmem = SimpleMemory(latency = "100ns"),
154d151
<
185,186c182
< t.test = getattr(attach_obj, attach_port)
< t.functional = system.funcbus.slave
---
> t.port = getattr(attach_obj, attach_port)
190,192d185
< # connect reference memory to funcbus
< system.funcbus.master = system.funcmem.port
<
205c198
< root.system.system_port = root.system.funcbus.slave
---
> root.system.system_port = root.system.physmem.cpu_side_bus.slave