From 2974dc7a3771e34542ed5bd1baf88e4ced8cf139 Mon Sep 17 00:00:00 2001
From: Andreas Sandberg <andreas.sandberg@arm.com>
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 <andreas.sandberg@arm.com>
Reviewed-by: Curtis Dunham <curtis.dunham@arm.com>
Reviewed-by: Jason Lowe-Power <jason@lowepower.com>
---
 src/python/swig/core.i      | 2 +-
 src/python/swig/debug.i     | 2 +-
 src/python/swig/drain.i     | 2 +-
 src/python/swig/event.i     | 2 +-
 src/python/swig/pyobject.i  | 2 +-
 src/python/swig/range.i     | 2 +-
 src/python/swig/serialize.i | 2 +-
 src/python/swig/stats.i     | 2 +-
 src/python/swig/trace.i     | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'src/python/swig')

diff --git a/src/python/swig/core.i b/src/python/swig/core.i
index 08fbe01d1..45337c3a5 100644
--- a/src/python/swig/core.i
+++ b/src/python/swig/core.i
@@ -29,7 +29,7 @@
  *          Steve Reinhardt
  */
 
-%module(package="m5.internal") core
+%module(package="_m5") core
 
 %{
 #include "base/misc.hh"
diff --git a/src/python/swig/debug.i b/src/python/swig/debug.i
index c2eb3ed80..b05b66e47 100644
--- a/src/python/swig/debug.i
+++ b/src/python/swig/debug.i
@@ -29,7 +29,7 @@
  * Authors: Nathan Binkert
  */
 
-%module(package="m5.internal") debug
+%module(package="_m5") debug
 
 %{
 #include <cassert>
diff --git a/src/python/swig/drain.i b/src/python/swig/drain.i
index 59474f190..8bd7ef9ef 100644
--- a/src/python/swig/drain.i
+++ b/src/python/swig/drain.i
@@ -37,7 +37,7 @@
  * Authors: Andreas Sandberg
  */
 
-%module(package="m5.internal") drain
+%module(package="_m5") drain
 
 %{
 #include "sim/drain.hh"
diff --git a/src/python/swig/event.i b/src/python/swig/event.i
index 60a789c1a..464be8289 100644
--- a/src/python/swig/event.i
+++ b/src/python/swig/event.i
@@ -30,7 +30,7 @@
  * Authors: Nathan Binkert
  */
 
-%module(package="m5.internal") event
+%module(package="_m5") event
 
 %{
 #include "base/types.hh"
diff --git a/src/python/swig/pyobject.i b/src/python/swig/pyobject.i
index a26f569ce..d4601d6a9 100644
--- a/src/python/swig/pyobject.i
+++ b/src/python/swig/pyobject.i
@@ -28,7 +28,7 @@
  * Authors: Nathan Binkert
  */
 
-%module(package="m5.internal") pyobject
+%module(package="_m5") pyobject
 
 %{
 #include "python/swig/pyobject.hh"
diff --git a/src/python/swig/range.i b/src/python/swig/range.i
index e3a794310..7ee27679f 100644
--- a/src/python/swig/range.i
+++ b/src/python/swig/range.i
@@ -28,7 +28,7 @@
  * Authors: Nathan Binkert
  */
 
-%module(package="m5.internal") range
+%module(package="_m5") range
 
 %{
 #include "base/types.hh"
diff --git a/src/python/swig/serialize.i b/src/python/swig/serialize.i
index 9a232fb09..2ade6157a 100644
--- a/src/python/swig/serialize.i
+++ b/src/python/swig/serialize.i
@@ -37,7 +37,7 @@
  * Authors: Andreas Sandberg
  */
 
-%module(package="m5.internal") serialize
+%module(package="_m5") serialize
 
 %{
 #include "sim/serialize.hh"
diff --git a/src/python/swig/stats.i b/src/python/swig/stats.i
index b9da5a5ad..c22cd45a3 100644
--- a/src/python/swig/stats.i
+++ b/src/python/swig/stats.i
@@ -28,7 +28,7 @@
  * Authors: Nathan Binkert
  */
 
-%module(package="m5.internal") stats
+%module(package="_m5") stats
 
 %include <std_list.i>
 %include <std_string.i>
diff --git a/src/python/swig/trace.i b/src/python/swig/trace.i
index 48caf456a..9ea60b816 100644
--- a/src/python/swig/trace.i
+++ b/src/python/swig/trace.i
@@ -28,7 +28,7 @@
  * Authors: Nathan Binkert
  */
 
-%module(package="m5.internal") trace
+%module(package="_m5") trace
 
 %{
 #include "base/trace.hh"
-- 
cgit v1.2.3