X86: Enable the unlink system call.
[gem5.git] / configs / common / Simulation.py
index 8374d2fb59dc5f7bca7de6d393f83af1021083ad..c655973671428118cff905d149c750ab318bf510 100644 (file)
@@ -64,7 +64,7 @@ def run(options, root, testsys, cpu_class):
     if options.maxtick:
         maxtick = options.maxtick
     elif options.maxtime:
-        simtime = int(options.maxtime * root.clock.value)
+        simtime = m5.ticks.seconds(simtime)
         print "simulating for: ", simtime
         maxtick = simtime
     else:
@@ -130,7 +130,7 @@ def run(options, root, testsys, cpu_class):
             m5.panic("checkpoint dir %s does not exist!" % cptdir)
 
         dirs = listdir(cptdir)
-        expr = re.compile('cpt.([0-9]*)')
+        expr = re.compile('cpt\.([0-9]*)')
         cpts = []
         for dir in dirs:
             match = expr.match(dir)
@@ -166,7 +166,9 @@ def run(options, root, testsys, cpu_class):
 
         if options.standard_switch:
             exit_event = m5.simulate(options.warmup)
+            m5.drain(testsys)
             m5.switchCpus(switch_cpu_list1)
+            m5.resume(testsys)
 
     num_checkpoints = 0
     exit_cause = ''