43,48d42
< def _memMode(cclass):
< if cclass == AtomicSimpleCPU:
< return "atomic", m5.objects.params.atomic
< else:
< return "timing", m5.objects.params.timing
<
107c101
< system.mem_mode = _memMode(type(current_cpu))[0]
---
> system.mem_mode = type(current_cpu).memory_mode()
125d118
< system.setMemoryMode(_memMode(type(next_cpu))[1])
127c120,121
< m5.switchCpus([ (current_cpu, next_cpu) ])
---
> m5.switchCpus(system, [ (current_cpu, next_cpu) ],
> do_drain=False)