python: Move more code into m5.util allow SCons to use that code.
Get rid of misc.py and just stick misc things in __init__.py Move utility functions out of SCons files and into m5.util Move utility type stuff from m5/__init__.py to m5/util/__init__.py Remove buildEnv from m5 and allow access only from m5.defines Rename AddToPath to addToPath while we're moving it to m5.util Rename read_command to readCommand while we're moving it Rename compare_versions to compareVersions while we're moving it. --HG-- rename : src/python/m5/convert.py => src/python/m5/util/convert.py rename : src/python/m5/smartdict.py => src/python/m5/util/smartdict.py
This commit is contained in:
@@ -25,106 +25,24 @@
|
||||
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
#
|
||||
# Authors: Nathan Binkert
|
||||
# Steve Reinhardt
|
||||
|
||||
import os
|
||||
import sys
|
||||
# Import useful subpackages of M5, but *only* when run as an m5
|
||||
# script. This is mostly to keep backward compatibility with existing
|
||||
# scripts while allowing new SCons code to operate properly.
|
||||
|
||||
import smartdict
|
||||
|
||||
# define a MaxTick parameter
|
||||
MaxTick = 2**63 - 1
|
||||
|
||||
# define this here so we can use it right away if necessary
|
||||
|
||||
def errorURL(prefix, s):
|
||||
try:
|
||||
import zlib
|
||||
hashstr = "%x" % zlib.crc32(s)
|
||||
except:
|
||||
hashstr = "UnableToHash"
|
||||
return "For more information see: http://www.m5sim.org/%s/%s" % \
|
||||
(prefix, hashstr)
|
||||
|
||||
|
||||
# panic() should be called when something happens that should never
|
||||
# ever happen regardless of what the user does (i.e., an acutal m5
|
||||
# bug).
|
||||
def panic(fmt, *args):
|
||||
print >>sys.stderr, 'panic:', fmt % args
|
||||
print >>sys.stderr, errorURL('panic',fmt)
|
||||
sys.exit(1)
|
||||
|
||||
# fatal() should be called when the simulation cannot continue due to
|
||||
# some condition that is the user's fault (bad configuration, invalid
|
||||
# arguments, etc.) and not a simulator bug.
|
||||
def fatal(fmt, *args):
|
||||
print >>sys.stderr, 'fatal:', fmt % args
|
||||
print >>sys.stderr, errorURL('fatal',fmt)
|
||||
sys.exit(1)
|
||||
|
||||
# force scalars to one-element lists for uniformity
|
||||
def makeList(objOrList):
|
||||
if isinstance(objOrList, list):
|
||||
return objOrList
|
||||
return [objOrList]
|
||||
|
||||
# Prepend given directory to system module search path. We may not
|
||||
# need this anymore if we can structure our config library more like a
|
||||
# Python package.
|
||||
def AddToPath(path):
|
||||
# if it's a relative path and we know what directory the current
|
||||
# python script is in, make the path relative to that directory.
|
||||
if not os.path.isabs(path) and sys.path[0]:
|
||||
path = os.path.join(sys.path[0], path)
|
||||
path = os.path.realpath(path)
|
||||
# sys.path[0] should always refer to the current script's directory,
|
||||
# so place the new dir right after that.
|
||||
sys.path.insert(1, path)
|
||||
|
||||
# make a SmartDict out of the build options for our local use
|
||||
build_env = smartdict.SmartDict()
|
||||
|
||||
# make a SmartDict out of the OS environment too
|
||||
env = smartdict.SmartDict()
|
||||
env.update(os.environ)
|
||||
|
||||
# Since we have so many mutual imports in this package, we should:
|
||||
# 1. Put all intra-package imports at the *bottom* of the file, unless
|
||||
# they're absolutely needed before that (for top-level statements
|
||||
# or class attributes). Imports of "trivial" packages that don't
|
||||
# import other packages (e.g., 'smartdict') can be at the top.
|
||||
# 2. Never use 'from foo import *' on an intra-package import since
|
||||
# you can get the wrong result if foo is only partially imported
|
||||
# at the point you do that (i.e., because foo is in the middle of
|
||||
# importing *you*).
|
||||
try:
|
||||
import internal
|
||||
except ImportError:
|
||||
internal = None
|
||||
|
||||
try:
|
||||
import defines
|
||||
build_env.update(defines.buildEnv)
|
||||
except ImportError:
|
||||
defines = None
|
||||
|
||||
if internal:
|
||||
defines.compileDate = internal.core.compileDate
|
||||
for k,v in internal.core.__dict__.iteritems():
|
||||
if k.startswith('flag_'):
|
||||
setattr(defines, k[5:], v)
|
||||
import SimObject
|
||||
import core
|
||||
import objects
|
||||
import params
|
||||
import stats
|
||||
import util
|
||||
|
||||
from event import *
|
||||
from simulate import *
|
||||
from main import options, main
|
||||
import stats
|
||||
import core
|
||||
|
||||
import SimObject
|
||||
import params
|
||||
|
||||
try:
|
||||
import objects
|
||||
except ImportError:
|
||||
objects = None
|
||||
from simulate import *
|
||||
|
||||
Reference in New Issue
Block a user