Split the string importer from the rest of the mpy parsing

and importing stuff to avoid some confusion.

sim/pyconfig/SConscript:
    Split the string importer from the rest of the importer code.
    The importer.py code can be embedded like m5config.py
sim/pyconfig/m5config.py:
    import what we need from importer

--HG--
extra : convert_revision : 9d57f43381b55e717b5b10adfb8f0a522280ac57

diff --git a/sim/pyconfig/SConscript b/sim/pyconfig/SConscript
index 9154d3b994f2b32d911fe804163b70228a76aefc..c8671b50f152e8b53b6f900ff46d994ac646dee3 100644 (file)
--- a/sim/pyconfig/SConscript
+++ b/sim/pyconfig/SConscript
@@ -170,7 +170,7 @@ EmbedMap %(name)s("%(fname)s",
 /* namespace */ }
 '''
 
-embedded_py_files = ['m5config.py', '../../util/pbs/jobfile.py']
+embedded_py_files = ['m5config.py', 'importer.py', '../../util/pbs/jobfile.py']
 objpath = os.path.join(env['SRCDIR'], 'objects')
 for root, dirs, files in os.walk(objpath, topdown=True):
     for i,dir in enumerate(dirs):
@@ -184,7 +184,7 @@ for root, dirs, files in os.walk(objpath, topdown=True):
             embedded_py_files.append(os.path.join(root, f))
 
 embedfile_hh = os.path.join(env['SRCDIR'], 'base/embedfile.hh')
-env.Depends('embedded_py.cc', embedfile_hh)
 env.Command('embedded_py.py', embedded_py_files, MakeEmbeddedPyFile)
-env.Command('embedded_py.cc', ['importer.py', 'embedded_py.py'],
+env.Depends('embedded_py.cc', embedfile_hh)
+env.Command('embedded_py.cc', ['string_importer.py', 'embedded_py.py'],
             MakePythonCFile)

diff --git a/sim/pyconfig/m5config.py b/sim/pyconfig/m5config.py
index 7b1719dfa79de8b2bafaf39d8e21bbbac9f2008e..f7bc900612accb815aa4f2d025bcc79ef12c2b09 100644 (file)
--- a/sim/pyconfig/m5config.py
+++ b/sim/pyconfig/m5config.py
@@ -26,6 +26,9 @@
 
 from __future__ import generators
 import os, re, sys, types, inspect
+
+from importer import AddToPath, LoadMpyFile
+
 noDot = False
 try:
     import pydot