1c1
< # Copyright (c) 2016 ARM Limited
---
> # Copyright (c) 2016-2017 ARM Limited
212c212
< def instantiate(checkpoint_path=None):
---
> def instantiate(options, checkpoint_dir=None):
214,216c214,221
< if checkpoint_path is not None:
< m5.util.inform("Restoring from checkpoint %s", checkpoint_path)
< m5.instantiate(checkpoint_path)
---
> if options.restore_from:
> if checkpoint_dir and not os.path.isabs(options.restore_from):
> cpt = os.path.join(checkpoint_dir, options.restore_from)
> else:
> cpt = options.restore_from
>
> m5.util.inform("Restoring from checkpoint %s", cpt)
> m5.instantiate(cpt)
244c249
< instantiate(options.restore_from)
---
> instantiate(options)