e981a97dec
into Python.
Add Port and VectorPort objects and support for
specifying port connections via assignment.
The whole C++ ConfigNode hierarchy is gone now, as are
C++ Connector objects.
configs/test/fs.py:
configs/test/test.py:
Rewrite for new port connector syntax.
src/SConscript:
Remove unneeded files:
- mem/connector.*
- sim/config*
src/dev/io_device.hh:
src/mem/bridge.cc:
src/mem/bridge.hh:
src/mem/bus.cc:
src/mem/bus.hh:
src/mem/mem_object.hh:
src/mem/physical.cc:
src/mem/physical.hh:
Allow getPort() to take an optional index to
support vector ports (eventually).
src/python/m5/__init__.py:
Move SimObject construction and port connection
operations into Python (with C++ calls).
src/python/m5/config.py:
Move SimObject construction and port connection
operations into Python (with C++ calls).
Add support for declaring and connecting MemObject
ports in Python.
src/python/m5/objects/Bus.py:
src/python/m5/objects/PhysicalMemory.py:
Add port declaration.
src/sim/builder.cc:
src/sim/builder.hh:
src/sim/serialize.cc:
src/sim/serialize.hh:
ConfigNodes are gone; builder just gets the
name of a .ini file section now.
src/sim/main.cc:
Move SimObject construction and port connection
operations into Python (with C++ calls).
Split remaining initialization operations into two parts,
loadIniFile() and finalInit().
src/sim/param.cc:
src/sim/param.hh:
SimObject resolution done globally in Python now
(not via ConfigNode hierarchy).
src/sim/sim_object.cc:
Remove unneeded #include.
--HG--
extra : convert_revision : 2fa4001eaaec0c9a4231ef6e854f8e156d930dfe
55 lines
1.2 KiB
Python
55 lines
1.2 KiB
Python
# Simple test script
|
|
#
|
|
# Alpha: "m5 test.py"
|
|
# MIPS: "m5 test.py -a Mips -c hello_mips"
|
|
|
|
import os, optparse, sys
|
|
import m5
|
|
from m5.objects import *
|
|
from FullO3Config import *
|
|
|
|
# parse command-line arguments
|
|
parser = optparse.OptionParser(option_list=m5.standardOptions)
|
|
|
|
parser.add_option("-c", "--cmd", default="hello")
|
|
parser.add_option("-t", "--timing", action="store_true")
|
|
parser.add_option("-f", "--full", action="store_true")
|
|
|
|
(options, args) = parser.parse_args()
|
|
|
|
if args:
|
|
print "Error: script doesn't take any positional arguments"
|
|
sys.exit(1)
|
|
|
|
# build configuration
|
|
this_dir = os.path.dirname(__file__)
|
|
|
|
process = LiveProcess()
|
|
process.executable = os.path.join(this_dir, options.cmd)
|
|
process.cmd = options.cmd
|
|
|
|
magicbus = Bus()
|
|
mem = PhysicalMemory()
|
|
|
|
if options.timing:
|
|
cpu = TimingSimpleCPU()
|
|
elif options.full:
|
|
cpu = DetailedCPU()
|
|
else:
|
|
cpu = AtomicSimpleCPU()
|
|
cpu.workload = process
|
|
cpu.mem = magicbus
|
|
|
|
system = System(physmem = mem, cpu = cpu)
|
|
mem.port = magicbus.port
|
|
root = Root(system = system)
|
|
|
|
# instantiate configuration
|
|
m5.instantiate(root)
|
|
|
|
# simulate until program terminates
|
|
exit_event = m5.simulate()
|
|
|
|
print 'Exiting @', m5.curTick(), 'because', exit_event.getCause()
|
|
|