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
433 lines
9.9 KiB
C++
433 lines
9.9 KiB
C++
/*
|
|
* Copyright (c) 2001-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.
|
|
*/
|
|
|
|
#define USE_CPP
|
|
|
|
#ifdef USE_CPP
|
|
#include <sys/signal.h>
|
|
#include <sys/types.h>
|
|
#include <sys/wait.h>
|
|
|
|
#include <libgen.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <unistd.h>
|
|
#endif
|
|
|
|
#include <fstream>
|
|
#include <iostream>
|
|
|
|
#include <vector>
|
|
#include <string>
|
|
|
|
#include "base/inifile.hh"
|
|
#include "base/str.hh"
|
|
|
|
using namespace std;
|
|
|
|
IniFile::IniFile()
|
|
{}
|
|
|
|
IniFile::~IniFile()
|
|
{
|
|
SectionTable::iterator i = table.begin();
|
|
SectionTable::iterator end = table.end();
|
|
|
|
while (i != end) {
|
|
delete (*i).second;
|
|
++i;
|
|
}
|
|
}
|
|
|
|
|
|
#ifdef USE_CPP
|
|
bool
|
|
IniFile::loadCPP(const string &file, vector<char *> &cppArgs)
|
|
{
|
|
// Open the file just to verify that we can. Otherwise if the
|
|
// file doesn't exist or has bad permissions the user will get
|
|
// confusing errors from cpp/g++.
|
|
ifstream tmpf(file.c_str());
|
|
|
|
if (!tmpf.is_open())
|
|
return false;
|
|
|
|
tmpf.close();
|
|
|
|
char *cfile = strcpy(new char[file.size() + 1], file.c_str());
|
|
char *dir = dirname(cfile);
|
|
char *dir_arg = NULL;
|
|
if (*dir != '.') {
|
|
string arg = "-I";
|
|
arg += dir;
|
|
|
|
dir_arg = new char[arg.size() + 1];
|
|
strcpy(dir_arg, arg.c_str());
|
|
}
|
|
|
|
delete [] cfile;
|
|
|
|
char tempfile[] = "/tmp/configXXXXXX";
|
|
int tmp_fd = mkstemp(tempfile);
|
|
|
|
int pid = fork();
|
|
|
|
if (pid == -1)
|
|
return false;
|
|
|
|
if (pid == 0) {
|
|
char filename[FILENAME_MAX];
|
|
string::size_type i = file.copy(filename, sizeof(filename) - 1);
|
|
filename[i] = '\0';
|
|
|
|
int arg_count = cppArgs.size();
|
|
|
|
char **args = new char *[arg_count + 20];
|
|
|
|
int nextArg = 0;
|
|
args[nextArg++] = "g++";
|
|
args[nextArg++] = "-E";
|
|
args[nextArg++] = "-P";
|
|
args[nextArg++] = "-nostdinc";
|
|
args[nextArg++] = "-nostdinc++";
|
|
args[nextArg++] = "-x";
|
|
args[nextArg++] = "c++";
|
|
args[nextArg++] = "-undef";
|
|
|
|
for (int i = 0; i < arg_count; i++)
|
|
args[nextArg++] = cppArgs[i];
|
|
|
|
if (dir_arg)
|
|
args[nextArg++] = dir_arg;
|
|
|
|
args[nextArg++] = filename;
|
|
args[nextArg++] = NULL;
|
|
|
|
close(STDOUT_FILENO);
|
|
if (dup2(tmp_fd, STDOUT_FILENO) == -1)
|
|
exit(1);
|
|
|
|
execvp("g++", args);
|
|
|
|
exit(0);
|
|
}
|
|
|
|
int retval;
|
|
waitpid(pid, &retval, 0);
|
|
|
|
delete [] dir_arg;
|
|
|
|
// check for normal completion of CPP
|
|
if (!WIFEXITED(retval) || WEXITSTATUS(retval) != 0)
|
|
return false;
|
|
|
|
close(tmp_fd);
|
|
|
|
bool status = false;
|
|
|
|
status = load(tempfile);
|
|
|
|
unlink(tempfile);
|
|
|
|
return status;
|
|
}
|
|
#endif
|
|
|
|
bool
|
|
IniFile::load(const string &file)
|
|
{
|
|
ifstream f(file.c_str());
|
|
|
|
if (!f.is_open())
|
|
return false;
|
|
|
|
return load(f);
|
|
}
|
|
|
|
|
|
const string &
|
|
IniFile::Entry::getValue() const
|
|
{
|
|
referenced = true;
|
|
return value;
|
|
}
|
|
|
|
|
|
void
|
|
IniFile::Section::addEntry(const std::string &entryName,
|
|
const std::string &value,
|
|
bool append)
|
|
{
|
|
EntryTable::iterator ei = table.find(entryName);
|
|
|
|
if (ei == table.end()) {
|
|
// new entry
|
|
table[entryName] = new Entry(value);
|
|
}
|
|
else if (append) {
|
|
// append new reult to old entry
|
|
ei->second->appendValue(value);
|
|
}
|
|
else {
|
|
// override old entry
|
|
ei->second->setValue(value);
|
|
}
|
|
}
|
|
|
|
|
|
bool
|
|
IniFile::Section::add(const std::string &assignment)
|
|
{
|
|
string::size_type offset = assignment.find('=');
|
|
if (offset == string::npos) {
|
|
// no '=' found
|
|
cerr << "Can't parse .ini line " << assignment << endl;
|
|
return false;
|
|
}
|
|
|
|
// if "+=" rather than just "=" then append value
|
|
bool append = (assignment[offset-1] == '+');
|
|
|
|
string entryName = assignment.substr(0, append ? offset-1 : offset);
|
|
string value = assignment.substr(offset + 1);
|
|
|
|
eat_white(entryName);
|
|
eat_white(value);
|
|
|
|
addEntry(entryName, value, append);
|
|
return true;
|
|
}
|
|
|
|
|
|
IniFile::Entry *
|
|
IniFile::Section::findEntry(const std::string &entryName) const
|
|
{
|
|
referenced = true;
|
|
|
|
EntryTable::const_iterator ei = table.find(entryName);
|
|
|
|
return (ei == table.end()) ? NULL : ei->second;
|
|
}
|
|
|
|
|
|
IniFile::Section *
|
|
IniFile::addSection(const string §ionName)
|
|
{
|
|
SectionTable::iterator i = table.find(sectionName);
|
|
|
|
if (i != table.end()) {
|
|
return i->second;
|
|
}
|
|
else {
|
|
// new entry
|
|
Section *sec = new Section();
|
|
table[sectionName] = sec;
|
|
return sec;
|
|
}
|
|
}
|
|
|
|
|
|
IniFile::Section *
|
|
IniFile::findSection(const string §ionName) const
|
|
{
|
|
SectionTable::const_iterator i = table.find(sectionName);
|
|
|
|
return (i == table.end()) ? NULL : i->second;
|
|
}
|
|
|
|
|
|
// Take string of the form "<section>:<parameter>=<value>" and add to
|
|
// database. Return true if successful, false if parse error.
|
|
bool
|
|
IniFile::add(const string &str)
|
|
{
|
|
// find ':'
|
|
string::size_type offset = str.find(':');
|
|
if (offset == string::npos) // no ':' found
|
|
return false;
|
|
|
|
string sectionName = str.substr(0, offset);
|
|
string rest = str.substr(offset + 1);
|
|
|
|
eat_white(sectionName);
|
|
Section *s = addSection(sectionName);
|
|
|
|
return s->add(rest);
|
|
}
|
|
|
|
bool
|
|
IniFile::load(istream &f)
|
|
{
|
|
Section *section = NULL;
|
|
|
|
while (!f.eof()) {
|
|
f >> ws; // Eat whitespace
|
|
if (f.eof()) {
|
|
break;
|
|
}
|
|
|
|
string line;
|
|
getline(f, line);
|
|
if (line.size() == 0)
|
|
continue;
|
|
|
|
eat_end_white(line);
|
|
int last = line.size() - 1;
|
|
|
|
if (line[0] == '[' && line[last] == ']') {
|
|
string sectionName = line.substr(1, last - 1);
|
|
eat_white(sectionName);
|
|
section = addSection(sectionName);
|
|
continue;
|
|
}
|
|
|
|
if (section == NULL)
|
|
continue;
|
|
|
|
if (!section->add(line))
|
|
return false;
|
|
}
|
|
|
|
return true;
|
|
}
|
|
|
|
bool
|
|
IniFile::find(const string §ionName, const string &entryName,
|
|
string &value) const
|
|
{
|
|
Section *section = findSection(sectionName);
|
|
if (section == NULL)
|
|
return false;
|
|
|
|
Entry *entry = section->findEntry(entryName);
|
|
if (entry == NULL)
|
|
return false;
|
|
|
|
value = entry->getValue();
|
|
|
|
return true;
|
|
}
|
|
|
|
bool
|
|
IniFile::sectionExists(const string §ionName) const
|
|
{
|
|
return findSection(sectionName) != NULL;
|
|
}
|
|
|
|
|
|
bool
|
|
IniFile::Section::printUnreferenced(const string §ionName)
|
|
{
|
|
bool unref = false;
|
|
bool search_unref_entries = false;
|
|
vector<string> unref_ok_entries;
|
|
|
|
Entry *entry = findEntry("unref_entries_ok");
|
|
if (entry != NULL) {
|
|
tokenize(unref_ok_entries, entry->getValue(), ' ');
|
|
if (unref_ok_entries.size()) {
|
|
search_unref_entries = true;
|
|
}
|
|
}
|
|
|
|
for (EntryTable::iterator ei = table.begin();
|
|
ei != table.end(); ++ei) {
|
|
const string &entryName = ei->first;
|
|
Entry *entry = ei->second;
|
|
|
|
if (entryName == "unref_section_ok" ||
|
|
entryName == "unref_entries_ok")
|
|
{
|
|
continue;
|
|
}
|
|
|
|
if (!entry->isReferenced()) {
|
|
if (search_unref_entries &&
|
|
(std::find(unref_ok_entries.begin(), unref_ok_entries.end(),
|
|
entryName) != unref_ok_entries.end()))
|
|
{
|
|
continue;
|
|
}
|
|
|
|
cerr << "Parameter " << sectionName << ":" << entryName
|
|
<< " not referenced." << endl;
|
|
unref = true;
|
|
}
|
|
}
|
|
|
|
return unref;
|
|
}
|
|
|
|
|
|
bool
|
|
IniFile::printUnreferenced()
|
|
{
|
|
bool unref = false;
|
|
|
|
for (SectionTable::iterator i = table.begin();
|
|
i != table.end(); ++i) {
|
|
const string §ionName = i->first;
|
|
Section *section = i->second;
|
|
|
|
if (!section->isReferenced()) {
|
|
if (section->findEntry("unref_section_ok") == NULL) {
|
|
cerr << "Section " << sectionName << " not referenced."
|
|
<< endl;
|
|
unref = true;
|
|
}
|
|
}
|
|
else {
|
|
if (section->printUnreferenced(sectionName)) {
|
|
unref = true;
|
|
}
|
|
}
|
|
}
|
|
|
|
return unref;
|
|
}
|
|
|
|
|
|
void
|
|
IniFile::Section::dump(const string §ionName)
|
|
{
|
|
for (EntryTable::iterator ei = table.begin();
|
|
ei != table.end(); ++ei) {
|
|
cout << sectionName << ": " << (*ei).first << " => "
|
|
<< (*ei).second->getValue() << "\n";
|
|
}
|
|
}
|
|
|
|
void
|
|
IniFile::dump()
|
|
{
|
|
for (SectionTable::iterator i = table.begin();
|
|
i != table.end(); ++i) {
|
|
i->second->dump(i->first);
|
|
}
|
|
}
|