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
177 lines
5.6 KiB
C++
177 lines
5.6 KiB
C++
/*
|
|
* Copyright (c) 2003-2004 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.
|
|
*/
|
|
|
|
#include <assert.h>
|
|
|
|
#include "base/inifile.hh"
|
|
#include "base/misc.hh"
|
|
#include "sim/builder.hh"
|
|
#include "sim/configfile.hh"
|
|
#include "sim/config_node.hh"
|
|
#include "sim/host.hh"
|
|
#include "sim/sim_object.hh"
|
|
#include "sim/universe.hh"
|
|
|
|
using namespace std;
|
|
|
|
SimObjectBuilder::SimObjectBuilder(ConfigNode *_configNode)
|
|
: ParamContext(_configNode->getPath(), NoAutoInit),
|
|
configNode(_configNode)
|
|
{
|
|
}
|
|
|
|
SimObjectBuilder::~SimObjectBuilder()
|
|
{
|
|
}
|
|
|
|
///////////////////////////////////////////
|
|
//
|
|
// SimObjectBuilder member definitions
|
|
//
|
|
///////////////////////////////////////////
|
|
|
|
// override ParamContext::parseParams() to check params based on
|
|
// instance name first. If not found, then check based on iniSection
|
|
// (as in default ParamContext implementation).
|
|
void
|
|
SimObjectBuilder::parseParams(IniFile &iniFile)
|
|
{
|
|
iniFilePtr = &iniFile; // set object member
|
|
|
|
ParamList::iterator i;
|
|
|
|
for (i = paramList->begin(); i != paramList->end(); ++i) {
|
|
string string_value;
|
|
if (iniFile.find(iniSection, (*i)->name, string_value))
|
|
(*i)->parse(string_value);
|
|
}
|
|
}
|
|
|
|
|
|
void
|
|
SimObjectBuilder::printErrorProlog(ostream &os)
|
|
{
|
|
ccprintf(os, "Error creating object '%s' of type '%s':\n",
|
|
iniSection, configNode->getType());
|
|
}
|
|
|
|
|
|
////////////////////////////////////////////////////////////////////////
|
|
//
|
|
// SimObjectClass member definitions
|
|
//
|
|
////////////////////////////////////////////////////////////////////////
|
|
|
|
// Map of class names to SimObjectBuilder creation functions. Need to
|
|
// make this a pointer so we can force initialization on the first
|
|
// reference; otherwise, some SimObjectClass constructors may be invoked
|
|
// before the classMap constructor.
|
|
map<string,SimObjectClass::CreateFunc> *SimObjectClass::classMap = NULL;
|
|
|
|
// SimObjectClass constructor: add mapping to classMap
|
|
SimObjectClass::SimObjectClass(const string &className, CreateFunc createFunc)
|
|
{
|
|
if (classMap == NULL)
|
|
classMap = new map<string,SimObjectClass::CreateFunc>();
|
|
|
|
if ((*classMap)[className])
|
|
panic("Error: simulation object class '%s' redefined\n", className);
|
|
|
|
// add className --> createFunc to class map
|
|
(*classMap)[className] = createFunc;
|
|
}
|
|
|
|
|
|
//
|
|
//
|
|
SimObject *
|
|
SimObjectClass::createObject(IniFile &configDB, ConfigNode *configNode)
|
|
{
|
|
const string &type = configNode->getType();
|
|
|
|
// look up className to get appropriate createFunc
|
|
if (classMap->find(type) == classMap->end())
|
|
panic("Simulator object type '%s' not found.\n", type);
|
|
|
|
|
|
CreateFunc createFunc = (*classMap)[type];
|
|
|
|
// call createFunc with config hierarchy node to get object
|
|
// builder instance (context with parameters for object creation)
|
|
SimObjectBuilder *objectBuilder = (*createFunc)(configNode);
|
|
|
|
assert(objectBuilder != NULL);
|
|
|
|
// parse all parameters in context to generate parameter values
|
|
objectBuilder->parseParams(configDB);
|
|
|
|
// now create the actual simulation object
|
|
SimObject *object = objectBuilder->create();
|
|
|
|
assert(object != NULL);
|
|
|
|
// echo object parameters to stats file (for documenting the
|
|
// config used to generate the associated stats)
|
|
ccprintf(*configStream, "[%s]\n", object->name());
|
|
ccprintf(*configStream, "type=%s\n", type);
|
|
objectBuilder->showParams(*configStream);
|
|
ccprintf(*configStream, "\n");
|
|
|
|
// done with the SimObjectBuilder now
|
|
delete objectBuilder;
|
|
|
|
return object;
|
|
}
|
|
|
|
|
|
//
|
|
// static method:
|
|
//
|
|
void
|
|
SimObjectClass::describeAllClasses(ostream &os)
|
|
{
|
|
map<string,CreateFunc>::iterator iter;
|
|
|
|
for (iter = classMap->begin(); iter != classMap->end(); ++iter) {
|
|
const string &className = iter->first;
|
|
CreateFunc createFunc = iter->second;
|
|
|
|
os << "[" << className << "]\n";
|
|
|
|
// create dummy object builder just to instantiate parameters
|
|
SimObjectBuilder *objectBuilder = (*createFunc)(NULL);
|
|
|
|
// now get the object builder to describe ite params
|
|
objectBuilder->describeParams(os);
|
|
|
|
os << endl;
|
|
|
|
// done with the object builder now
|
|
delete objectBuilder;
|
|
}
|
|
}
|