1b841a871e
.mpy SimObject descriptions. Structs are defined
in simobj/param/ObjectName.hh.
- Move compile-time python params (from CPPDEFINES) to
separate dict from run-time params (from os.environ).
The former are needed to generate proper param structs.
This also helps prevent users from messing things up
by setting the wrong environment vars (which could have
overridden compile-time settings in the old system).
- Other misc cleanup of m5 python package.
SConscript:
Include simobj/SConscript
build/SConstruct:
Fix type in comment
python/SConscript:
Move CPPDEFINES dict-generating code to m5scons.flatten_defines
python/m5/__init__.py:
- Generate a build_env SmartDict here to hold compile-time
params (passed in via __main__.m5_build_env).
- Move panic and env here from config.py.
python/m5/config.py:
Move panic, env to top level (m5/__init__.py)
python/m5/objects/BaseCPU.mpy:
Use build_env instead of env for compile-time params
python/m5/smartdict.py:
Add some comments.
sim/sim_object.hh:
Include auto-generated Param struct. Not used yet,
just here as proof of concept.
test/genini.py:
Put -E arguments in build_env as well as os.environ
--HG--
extra : convert_revision : cf6f4a2565b230c495b33b18612d6030988adac5
68 lines
2.5 KiB
Python
Executable file
68 lines
2.5 KiB
Python
Executable file
#!/usr/bin/env python
|
|
# Copyright (c) 2005 The Regents of The University of Michigan
|
|
# All rights reserved.
|
|
#
|
|
# Redistribution and use in source and binary forms, with or without
|
|
# modification, are permitted provided that the following conditions are
|
|
# met: redistributions of source code must retain the above copyright
|
|
# notice, this list of conditions and the following disclaimer;
|
|
# redistributions in binary form must reproduce the above copyright
|
|
# notice, this list of conditions and the following disclaimer in the
|
|
# documentation and/or other materials provided with the distribution;
|
|
# neither the name of the copyright holders nor the names of its
|
|
# contributors may be used to endorse or promote products derived from
|
|
# this software without specific prior written permission.
|
|
#
|
|
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
|
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
|
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
|
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
|
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
|
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
|
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
|
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
|
|
import getopt, os, os.path, sys
|
|
from os.path import join as joinpath, realpath
|
|
|
|
mypath = sys.path[0]
|
|
sys.path.append(joinpath(mypath, '..'))
|
|
sys.path.append(joinpath(mypath, '../python'))
|
|
sys.path.append(joinpath(mypath, '../util/pbs'))
|
|
|
|
pathlist = [ '.' ]
|
|
|
|
m5_build_env = {}
|
|
|
|
try:
|
|
opts, args = getopt.getopt(sys.argv[1:], '-E:I:')
|
|
for opt,arg in opts:
|
|
if opt == '-E':
|
|
offset = arg.find('=')
|
|
if offset == -1:
|
|
name = arg
|
|
value = '1'
|
|
else:
|
|
name = arg[:offset]
|
|
value = arg[offset+1:]
|
|
os.environ[name] = value
|
|
m5_build_env[name] = value
|
|
if opt == '-I':
|
|
pathlist.append(arg)
|
|
except getopt.GetoptError:
|
|
sys.exit('Improper Usage')
|
|
|
|
from m5 import *
|
|
|
|
for path in pathlist:
|
|
AddToPath(path)
|
|
|
|
for arg in args:
|
|
LoadMpyFile(arg)
|
|
|
|
if globals().has_key('root') and isinstance(root, type) \
|
|
and issubclass(root, Root):
|
|
instantiate(root)
|