New and improved configuration mechanism. No more writing of
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
This commit is contained in:
Nathan Binkert
88
SConscript
88
SConscript
@@ -54,6 +54,7 @@ base_sources = Split('''
|
||||
base/circlebuf.cc
|
||||
base/copyright.cc
|
||||
base/cprintf.cc
|
||||
base/embedfile.cc
|
||||
base/fast_alloc.cc
|
||||
base/fifo_buffer.cc
|
||||
base/hostinfo.cc
|
||||
@@ -198,42 +199,9 @@ base_sources = Split('''
|
||||
sim/trace_context.cc
|
||||
sim/universe.cc
|
||||
sim/pyconfig/pyconfig.cc
|
||||
sim/pyconfig/code.cc
|
||||
sim/pyconfig/embedded_py.cc
|
||||
''')
|
||||
|
||||
base_obj_desc_files = Split('''
|
||||
cpu/full_cpu/iq/segmented/SegmentedIQ.od
|
||||
cpu/full_cpu/iq/seznec/SeznecIQ.od
|
||||
cpu/full_cpu/iq/standard/StandardIQ.od
|
||||
cpu/full_cpu/iq/BaseIQ.od
|
||||
cpu/full_cpu/BranchPred.od
|
||||
cpu/full_cpu/FUDesc.od
|
||||
cpu/full_cpu/FullCPU.od
|
||||
cpu/full_cpu/FuncUnitPool.od
|
||||
cpu/full_cpu/OpDesc.od
|
||||
cpu/full_cpu/PipeTrace.od
|
||||
cpu/sampling_cpu/SamplingCPU.od
|
||||
cpu/simple_cpu/SimpleCPU.od
|
||||
cpu/inorder_cpu/InorderCPU.od
|
||||
cpu/BaseCPU.od
|
||||
cpu/IntrControl.od
|
||||
mem/bus/Bus.od
|
||||
mem/bus/BusBridge.od
|
||||
mem/cache/coherence/CoherenceProtocol.od
|
||||
mem/cache/tags/repl/GenRepl.od
|
||||
mem/cache/tags/repl/Repl.od
|
||||
mem/cache/BaseCache.od
|
||||
mem/functional_mem/FunctionalMemory.od
|
||||
mem/functional_mem/MainMemory.od
|
||||
mem/functional_mem/MemoryController.od
|
||||
mem/functional_mem/PhysicalMemory.od
|
||||
mem/timing_mem/BaseMemory.od
|
||||
mem/BaseHier.od
|
||||
mem/BaseMem.od
|
||||
mem/HierParams.od
|
||||
''')
|
||||
|
||||
|
||||
# MySql sources
|
||||
mysql_sources = Split('''
|
||||
base/mysql.cc
|
||||
@@ -316,44 +284,6 @@ full_system_sources = Split('''
|
||||
sim/system.cc
|
||||
''')
|
||||
|
||||
full_system_obj_desc_files = Split('''
|
||||
arch/alpha/AlphaDTB.od
|
||||
arch/alpha/AlphaITB.od
|
||||
arch/alpha/AlphaTLB.od
|
||||
dev/AlphaConsole.od
|
||||
dev/ConsoleListener.od
|
||||
dev/CowDiskImage.od
|
||||
dev/DiskImage.od
|
||||
dev/DmaDevice.od
|
||||
dev/DmaEngine.od
|
||||
dev/EtherBus.od
|
||||
dev/EtherDev.od
|
||||
dev/EtherDevInt.od
|
||||
dev/EtherDump.od
|
||||
dev/EtherInt.od
|
||||
dev/EtherLink.od
|
||||
dev/EtherTap.od
|
||||
dev/PioDevice.od
|
||||
dev/RawDiskImage.od
|
||||
dev/ScsiController.od
|
||||
dev/ScsiDevice.od
|
||||
dev/ScsiDisk.od
|
||||
dev/SimConsole.od
|
||||
dev/SimpleDisk.od
|
||||
dev/TlaserClock.od
|
||||
dev/TlaserIpi.od
|
||||
dev/TlaserMBox.od
|
||||
dev/TlaserMC146818.od
|
||||
dev/TlaserNode.od
|
||||
dev/TlaserPciDev.od
|
||||
dev/TlaserPcia.od
|
||||
dev/TlaserSerial.od
|
||||
dev/TlaserUart.od
|
||||
dev/Turbolaser.od
|
||||
kern/tru64/Tru64System.od
|
||||
sim/System.od
|
||||
''')
|
||||
|
||||
# Syscall emulation (non-full-system) sources
|
||||
syscall_emulation_sources = Split('''
|
||||
arch/alpha/alpha_common_syscall_emul.cc
|
||||
@@ -369,13 +299,6 @@ syscall_emulation_sources = Split('''
|
||||
sim/syscall_emul.cc
|
||||
''')
|
||||
|
||||
syscall_emulation_obj_desc_files = Split('''
|
||||
cpu/memtest/MemTest.od
|
||||
eio/EioProcess.od
|
||||
sim/LiveProcess.od
|
||||
sim/Process.od
|
||||
''')
|
||||
|
||||
targetarch_files = Split('''
|
||||
alpha_common_syscall_emul.hh
|
||||
alpha_linux_process.hh
|
||||
@@ -404,14 +327,11 @@ for f in targetarch_files:
|
||||
|
||||
# Set up complete list of sources based on configuration.
|
||||
sources = base_sources
|
||||
obj_desc_files = base_obj_desc_files
|
||||
|
||||
if env['FULL_SYSTEM']:
|
||||
sources += full_system_sources
|
||||
obj_desc_files += full_system_obj_desc_files
|
||||
else:
|
||||
sources += syscall_emulation_sources
|
||||
obj_desc_files += syscall_emulation_obj_desc_files
|
||||
|
||||
extra_libraries = []
|
||||
env.Append(LIBS=['z'])
|
||||
@@ -455,9 +375,7 @@ env.Command(Split('''arch/alpha/decoder.cc
|
||||
# SConscript-local is the per-config build, which just copies some
|
||||
# header files into a place where they can be found.
|
||||
SConscript('libelf/SConscript-local', exports = 'env', duplicate=0)
|
||||
|
||||
SConscript('sim/pyconfig/SConscript', exports = ['env', 'obj_desc_files'],
|
||||
duplicate=0)
|
||||
SConscript('sim/pyconfig/SConscript', exports = ['env'], duplicate=0)
|
||||
|
||||
|
||||
# This function adds the specified sources to the given build
|
||||
|
||||
Reference in New Issue
Block a user