48,49c48,51
< import internal
< import core
---
> import _m5.drain
> import _m5.core
> from _m5.stats import updateEvents as updateStatEvents
>
55d56
< from m5.internal.stats import updateEvents as updateStatEvents
69c70
< _drain_manager = internal.drain.DrainManager.instance()
---
> _drain_manager = _m5.drain.DrainManager.instance()
141,142c142,143
< ckpt = internal.core.getCheckpoint(ckpt_dir)
< internal.core.unserializeGlobals(ckpt);
---
> ckpt = _m5.core.getCheckpoint(ckpt_dir)
> _m5.core.unserializeGlobals(ckpt);
165c166
< atexit.register(internal.core.doExitCleanup)
---
> atexit.register(_m5.core.doExitCleanup)
173c174
< return internal.event.simulate(*args, **kwargs)
---
> return _m5.event.simulate(*args, **kwargs)
175,178d175
< # Export curTick to user script.
< def curTick():
< return internal.core.curTick()
<
201c198
< exit_event = internal.event.simulate()
---
> exit_event = _m5.event.simulate()
230c227
< internal.core.serializeAll(dir)
---
> _m5.core.serializeAll(dir)
346c343
< if not internal.core.listenersDisabled():
---
> if not _m5.core.listenersDisabled():
367c364
< core.setOutputDir(options.outdir)
---
> _m5.core.setOutputDir(options.outdir)
373,374c370,371
< from internal.core import disableAllListeners
< from internal.core import listenersDisabled
---
> from _m5.core import disableAllListeners, listenersDisabled
> from _m5.core import curTick