58,59d57
< parser.add_option("-c", "--checkpoint", action="store", type="int",
< help="restore from checkpoint <N>")
68,69c66,67
< cpu = DetailedO3CPU()
< cpu2 = DetailedO3CPU()
---
> cpu = DerivO3CPU()
> cpu2 = DerivO3CPU()
82,83d79
< cpu.cpu_id = 0
< cpu2.cpu_id = 0
120,144d115
< if options.checkpoint:
< from os.path import isdir
< from os import listdir, getcwd
< import re
< if options.checkpoint_dir:
< cptdir = options.checkpoint_dir
< else:
< cptdir = getcwd()
<
< if not isdir(cptdir):
< m5.panic("checkpoint dir %s does not exist!" % cptdir)
<
< dirs = listdir(cptdir)
< expr = re.compile('cpt.([0-9]*)')
< cpts = []
< for dir in dirs:
< match = expr.match(dir)
< if match:
< cpts.append(match.group(1))
<
< if options.checkpoint > len(cpts):
< m5.panic('Checkpoint %d not found' % options.checkpoint)
<
< m5.restoreCheckpoint(root, "/".join([cptdir, "cpt.%s" % cpts[options.checkpoint - 1]]))
<