From 2974dc7a3771e34542ed5bd1baf88e4ced8cf139 Mon Sep 17 00:00:00 2001 From: Andreas Sandberg Date: Fri, 27 Jan 2017 12:40:01 +0000 Subject: python: Move native wrappers to the _m5 namespace Swig wrappers for native objects currently share the _m5.internal name space with Python code. This is undesirable if we ever want to switch from Swig to some other framework for native binding (e.g., PyBind11 or Boost::Python). This changeset moves all of such wrappers to the _m5 namespace, which is now reserved for native code. Change-Id: I2d2bc12dbc05b57b7c5a75f072e08124413d77f3 Signed-off-by: Andreas Sandberg Reviewed-by: Curtis Dunham Reviewed-by: Jason Lowe-Power --- src/python/m5/__init__.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'src/python/m5/__init__.py') diff --git a/src/python/m5/__init__.py b/src/python/m5/__init__.py index 9df3f4bfe..1edf933f9 100644 --- a/src/python/m5/__init__.py +++ b/src/python/m5/__init__.py @@ -32,15 +32,16 @@ try: # Try to import something that's generated by swig - import internal.core + import _m5.core # Try to grab something from it in case demandimport is being used - internal.core.curTick + _m5.core.curTick + in_gem5 = True except ImportError: - # The import failed - internal = None + # The import failed, we're being called from the build system + in_gem5 = False -if internal: +if in_gem5: import SimObject import core import objects -- cgit v1.2.3