90a91
> (CPUClass, test_mem_mode, FutureClass) = Simulation.setCPUClass(options)
92,101d92
< if options.timing:
< CPUClass = TimingSimpleCPU
< test_mem_mode = 'timing'
< elif options.detailed:
< CPUClass = DerivO3CPU
< test_mem_mode = 'timing'
< else:
< CPUClass = AtomicSimpleCPU
< test_mem_mode = 'atomic'
<
113c104
< if options.caches and not options.standard_switch:
---
> if options.caches and not options.standard_switch and not FutureClass:
121c112
< Simulation.run(options, root, system)
---
> Simulation.run(options, root, system, FutureClass)