86a87,91
> # Match the memories with the CPUs, the driver system always simple,
> # and based on the options for the test system
> DriveMemClass = SimpleMemory
> TestMemClass = Simulation.setMemClass(options)
>
103c108
< test_sys = makeLinuxAlphaSystem(test_mem_mode, bm[0])
---
> test_sys = makeLinuxAlphaSystem(test_mem_mode, TestMemClass, bm[0])
105c110
< test_sys = makeLinuxMipsSystem(test_mem_mode, bm[0])
---
> test_sys = makeLinuxMipsSystem(test_mem_mode, TestMemClass, bm[0])
107c112
< test_sys = makeSparcSystem(test_mem_mode, bm[0])
---
> test_sys = makeSparcSystem(test_mem_mode, TestMemClass, bm[0])
109c114,115
< test_sys = makeLinuxX86System(test_mem_mode, options.num_cpus, bm[0])
---
> test_sys = makeLinuxX86System(test_mem_mode, TestMemClass,
> options.num_cpus, bm[0])
111,112c117,119
< test_sys = makeArmSystem(test_mem_mode, options.machine_type, bm[0],
< options.dtb_filename, bare_metal=options.bare_metal)
---
> test_sys = makeArmSystem(test_mem_mode, options.machine_type,
> TestMemClass, bm[0], options.dtb_filename,
> bare_metal=options.bare_metal)
157c164
< drive_sys = makeLinuxAlphaSystem(drive_mem_mode, bm[1])
---
> drive_sys = makeLinuxAlphaSystem(drive_mem_mode, DriveMemClass, bm[1])
159c166
< drive_sys = makeLinuxMipsSystem(drive_mem_mode, bm[1])
---
> drive_sys = makeLinuxMipsSystem(drive_mem_mode, DriveMemClass, bm[1])
161c168
< drive_sys = makeSparcSystem(drive_mem_mode, bm[1])
---
> drive_sys = makeSparcSystem(drive_mem_mode, DriveMemClass, bm[1])
163c170
< drive_sys = makeX86System(drive_mem_mode, np, bm[1])
---
> drive_sys = makeX86System(drive_mem_mode, DriveMemClass, np, bm[1])
165c172,173
< drive_sys = makeArmSystem(drive_mem_mode, options.machine_type, bm[1])
---
> drive_sys = makeArmSystem(drive_mem_mode, options.machine_type,
> DriveMemClass, bm[1])