wierd ini files. The ini files are still used as an intermediate step,
but a sophisticated python library exists to help build them more
easily.
SConscript:
add the new embedded file stuff
remove all of the old object description junk
base/inifile.cc:
base/inifile.hh:
get rid of findDefault and findAppend since they were the source
of much evil.
base/trace.cc:
For now, if we don't have the dprintf_stream set up, dump
to standard out. We probably want a command line option
for this.
dev/alpha_console.cc:
PioDevice now takes a platform parameter.
All PioDevices must have a pio_latency parameter. We stick
a dummy parameter in here for now until we get rid of the
builder stuff.
dev/alpha_console.hh:
don't need Platform anymore
dev/baddev.cc:
PioDevice now takes a platform parameter.
All PioDevices must have a pio_latency parameter. We stick
a dummy parameter in here for now until we get rid of the
builder stuff. Same for the platform parameter, though we just
pass the PioDevice a null parameter since it isn't used by
this device and it's quicker.
dev/baddev.hh:
fix #include guards
dev/etherlink.cc:
rename parameters.
dev/ethertap.cc:
rename parameters
dev/ide_ctrl.cc:
All devices need an address even if it will get overwritten later.
dev/ide_disk.cc:
use an enum for the drive ID stuff.
rename disk_delay -> delay
Actually, I think that we should implement "cable select" and
have the controller tell the drive what it is.
dev/io_device.cc:
dev/io_device.hh:
All IO devices take a Platform *
dev/ns_gige.cc:
all devices need an io_bus. rename header_bus to io_bus
We don't need stuff for the interrupt controller since
it's all in the platform now.
dev/ns_gige.hh:
We don't need stuff for the interrupt controller now since
it's all in the platform.
dev/pciconfigall.cc:
Pass a dummy NULL to the PioDevice for the platform since
we don't need one.
dev/pcidev.cc:
Move a bunch of common functionality into the PciDev
dev/platform.hh:
remove unneeded code
dev/tsunami.cc:
remove unused param
dev/tsunami_cchip.cc:
pass platform pointer
dev/tsunami_io.cc:
dev/tsunami_pchip.cc:
dev/uart.cc:
pass platform variable
dev/uart.hh:
don't need to keep a platform pointer. it's in the base class
kern/linux/linux_system.cc:
kern/tru64/tru64_system.cc:
rename some parameters
sim/builder.cc:
clean up builder code. use more parameters from the
config node. all sections with a type= are now created,
the old mechanisms no longer work
sim/builder.hh:
remove some extra variables since they are found in the ConfigNode
sim/main.cc:
add a quick hack command line argument -X to dump out the
embedded files. (probably should be fixed up a little.)
accept .mpy files
printing to the streams has to happen after the hierarchy
is built since we're moving away from param contexts
sim/param.cc:
add parsing support for ranges
sim/process.cc:
isValid isn't very useful anymore. interpret the names
stdout, stderr, cout, cerr for the file descriptors
sim/pyconfig/SConscript:
Add Action handlers for creating an embedded python file
and for creating an embedded C file.
use these action handlers to embed all objects found in the objects
tree into the binary along with the importer and the m5config stuff
sim/pyconfig/m5config.py:
Major changes to the original configuration file generator. These
changes largely involve implementing copy-on-write like semantics
for all of the SimObjects. Real documentation must be written.
sim/universe.cc:
Universe becomes a SimObject since we don't really have the notion of
param contexts in the python code.
--HG--
rename : sim/pyconfig/m5configbase.py => sim/pyconfig/m5config.py
extra : convert_revision : c353453e5beb91c37f15755998fc0d8858c6829a
190 lines
6.0 KiB
Python
190 lines
6.0 KiB
Python
# -*- mode: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 os, os.path, re
|
|
|
|
def WriteEmbeddedPyFile(target, source, path, name, ext):
|
|
if isinstance(source, str):
|
|
source = file(source, 'r')
|
|
|
|
if isinstance(target, str):
|
|
target = file(target, 'w')
|
|
|
|
print >>target, "AddModule(%s, %s, %s, '''\\" % (`path`, `name`, `ext`)
|
|
|
|
for line in source:
|
|
line = line
|
|
# escape existing backslashes
|
|
line = line.replace('\\', '\\\\')
|
|
# escape existing triple quotes
|
|
line = line.replace("'''", r"\'\'\'")
|
|
|
|
print >>target, line,
|
|
|
|
print >>target, "''')"
|
|
print >>target
|
|
|
|
def WriteCFile(target, source, name):
|
|
if isinstance(source, str):
|
|
source = file(source, 'r')
|
|
|
|
if isinstance(target, str):
|
|
target = file(target, 'w')
|
|
|
|
print >>target, 'const char %s_string[] = {' % name
|
|
|
|
count = 0
|
|
from array import array
|
|
try:
|
|
while True:
|
|
foo = array('B')
|
|
foo.fromfile(source, 10000)
|
|
l = [ str(i) for i in foo.tolist() ]
|
|
count += len(l)
|
|
for i in xrange(0,9999,20):
|
|
print >>target, ','.join(l[i:i+20]) + ','
|
|
except EOFError:
|
|
l = [ str(i) for i in foo.tolist() ]
|
|
count += len(l)
|
|
for i in xrange(0,len(l),20):
|
|
print >>target, ','.join(l[i:i+20]) + ','
|
|
print >>target, ','.join(l[i:]) + ','
|
|
|
|
print >>target, '};'
|
|
print >>target, 'const int %s_length = %d;' % (name, count)
|
|
print >>target
|
|
|
|
def splitpath(path):
|
|
dir,file = os.path.split(path)
|
|
path = []
|
|
assert(file)
|
|
while dir:
|
|
dir,base = os.path.split(dir)
|
|
path.insert(0, base)
|
|
return path, file
|
|
|
|
Import('env')
|
|
def MakeEmbeddedPyFile(target, source, env):
|
|
target = file(str(target[0]), 'w')
|
|
|
|
tree = {}
|
|
for src in source:
|
|
src = str(src)
|
|
path,pyfile = splitpath(src)
|
|
node = tree
|
|
for dir in path:
|
|
if not node.has_key(dir):
|
|
node[dir] = { }
|
|
node = node[dir]
|
|
|
|
name,ext = pyfile.split('.')
|
|
if name == '__init__':
|
|
node['.hasinit'] = True
|
|
node[pyfile] = (src,name,ext)
|
|
|
|
done = False
|
|
while not done:
|
|
done = True
|
|
for name,entry in tree.items():
|
|
if not isinstance(entry, dict): continue
|
|
if entry.has_key('.hasinit'): continue
|
|
|
|
done = False
|
|
del tree[name]
|
|
for key,val in entry.iteritems():
|
|
if tree.has_key(key):
|
|
raise NameError, \
|
|
"dir already has %s can't add it again" % key
|
|
tree[key] = val
|
|
|
|
files = []
|
|
def populate(node, path = []):
|
|
names = node.keys()
|
|
names.sort()
|
|
for name in names:
|
|
if name == '.hasinit':
|
|
continue
|
|
|
|
entry = node[name]
|
|
if isinstance(entry, dict):
|
|
if not entry.has_key('.hasinit'):
|
|
raise NameError, 'package directory missing __init__.py'
|
|
populate(entry, path + [ name ])
|
|
else:
|
|
pyfile,name,ext = entry
|
|
files.append((pyfile, path, name, ext))
|
|
populate(tree)
|
|
|
|
for pyfile, path, name, ext in files:
|
|
WriteEmbeddedPyFile(target, pyfile, path, name, ext)
|
|
|
|
CFileCounter = 0
|
|
def MakePythonCFile(target, source, env):
|
|
global CFileCounter
|
|
target = file(str(target[0]), 'w')
|
|
|
|
print >>target, '''\
|
|
#include "base/embedfile.hh"
|
|
|
|
namespace {
|
|
'''
|
|
for src in source:
|
|
src = str(src)
|
|
fname = os.path.basename(src)
|
|
name = 'embedded_file%d' % CFileCounter
|
|
CFileCounter += 1
|
|
WriteCFile(target, src, name)
|
|
print >>target, '''\
|
|
EmbedMap %(name)s("%(fname)s",
|
|
%(name)s_string, %(name)s_length);
|
|
|
|
''' % locals()
|
|
print >>target, '''\
|
|
|
|
/* namespace */ }
|
|
'''
|
|
|
|
embedded_py_files = ['m5config.py']
|
|
objpath = os.path.join(env['SRCDIR'], 'objects')
|
|
for root, dirs, files in os.walk(objpath, topdown=True):
|
|
for i,dir in enumerate(dirs):
|
|
if dir == 'SCCS':
|
|
del dirs[i]
|
|
break
|
|
|
|
assert(root.startswith(objpath))
|
|
for f in files:
|
|
if f.endswith('.mpy') or f.endswith('.py'):
|
|
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'],
|
|
MakePythonCFile)
|