3ece6ab029
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
350 lines
7.8 KiB
C++
350 lines
7.8 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.
|
|
*/
|
|
|
|
#include <ctype.h>
|
|
#include <fstream>
|
|
#include <iostream>
|
|
#include <list>
|
|
#include <string>
|
|
#include <vector>
|
|
|
|
#include "base/misc.hh"
|
|
#include "base/trace.hh"
|
|
#include "base/str.hh"
|
|
|
|
using namespace std;
|
|
|
|
namespace Trace {
|
|
const string DefaultName("global");
|
|
FlagVec flags(NumFlags, false);
|
|
|
|
//
|
|
// This variable holds the output stream for debug information. Other
|
|
// than setting up/redirecting this stream, do *NOT* reference this
|
|
// directly; use DebugOut() (see below) to access this stream for
|
|
// output.
|
|
//
|
|
ostream *dprintf_stream = &cerr;
|
|
|
|
ObjectMatch ignore;
|
|
|
|
Log theLog;
|
|
|
|
Log::Log()
|
|
{
|
|
size = 0;
|
|
buffer = NULL;
|
|
}
|
|
|
|
|
|
void
|
|
Log::init(int _size)
|
|
{
|
|
if (buffer != NULL) {
|
|
fatal("Trace::Log::init called twice!");
|
|
}
|
|
|
|
size = _size;
|
|
|
|
buffer = new (Record *)[size];
|
|
|
|
for (int i = 0; i < size; ++i) {
|
|
buffer[i] = NULL;
|
|
}
|
|
|
|
nextRecPtr = &buffer[0];
|
|
wrapRecPtr = &buffer[size];
|
|
}
|
|
|
|
|
|
Log::~Log()
|
|
{
|
|
for (int i = 0; i < size; ++i) {
|
|
delete buffer[i];
|
|
}
|
|
|
|
delete [] buffer;
|
|
}
|
|
|
|
|
|
void
|
|
Log::append(Record *rec)
|
|
{
|
|
// dump record to output stream if there's one open
|
|
if (dprintf_stream != NULL) {
|
|
rec->dump(*dprintf_stream);
|
|
} else {
|
|
rec->dump(cout);
|
|
}
|
|
|
|
// no buffering: justget rid of it now
|
|
if (buffer == NULL) {
|
|
delete rec;
|
|
return;
|
|
}
|
|
|
|
Record *oldRec = *nextRecPtr;
|
|
|
|
if (oldRec != NULL) {
|
|
// log has wrapped: overwrite
|
|
delete oldRec;
|
|
}
|
|
|
|
*nextRecPtr = rec;
|
|
|
|
if (++nextRecPtr == wrapRecPtr) {
|
|
nextRecPtr = &buffer[0];
|
|
}
|
|
}
|
|
|
|
|
|
void
|
|
Log::dump(ostream &os)
|
|
{
|
|
if (buffer == NULL) {
|
|
return;
|
|
}
|
|
|
|
Record **bufPtr = nextRecPtr;
|
|
|
|
if (*bufPtr == NULL) {
|
|
// next record slot is empty: log must not be full yet.
|
|
// start dumping from beginning of buffer
|
|
bufPtr = buffer;
|
|
}
|
|
|
|
do {
|
|
Record *rec = *bufPtr;
|
|
|
|
rec->dump(os);
|
|
|
|
if (++bufPtr == wrapRecPtr) {
|
|
bufPtr = &buffer[0];
|
|
}
|
|
} while (bufPtr != nextRecPtr);
|
|
}
|
|
|
|
PrintfRecord::~PrintfRecord()
|
|
{
|
|
delete &args;
|
|
}
|
|
|
|
void
|
|
PrintfRecord::dump(ostream &os)
|
|
{
|
|
string fmt = "";
|
|
|
|
if (!name.empty()) {
|
|
fmt = "%s: " + fmt;
|
|
args.prepend(name);
|
|
}
|
|
|
|
if (cycle != (Tick)-1) {
|
|
fmt = "%7d: " + fmt;
|
|
args.prepend(cycle);
|
|
}
|
|
|
|
fmt += format;
|
|
|
|
args.dump(os, fmt);
|
|
os.flush();
|
|
}
|
|
|
|
DataRecord::DataRecord(Tick _cycle, const string &_name,
|
|
const void *_data, int _len)
|
|
: Record(_cycle), name(_name), len(_len)
|
|
{
|
|
data = new uint8_t[len];
|
|
memcpy(data, _data, len);
|
|
}
|
|
|
|
DataRecord::~DataRecord()
|
|
{
|
|
delete [] data;
|
|
}
|
|
|
|
void
|
|
DataRecord::dump(ostream &os)
|
|
{
|
|
int c, i, j;
|
|
|
|
for (i = 0; i < len; i += 16) {
|
|
ccprintf(os, "%d: %s: %08x ", cycle, name, i);
|
|
c = len - i;
|
|
if (c > 16) c = 16;
|
|
|
|
for (j = 0; j < c; j++) {
|
|
ccprintf(os, "%02x ", data[i + j] & 0xff);
|
|
if ((j & 0xf) == 7 && j > 0)
|
|
ccprintf(os, " ");
|
|
}
|
|
|
|
for (; j < 16; j++)
|
|
ccprintf(os, " ");
|
|
ccprintf(os, " ");
|
|
|
|
for (j = 0; j < c; j++) {
|
|
int ch = data[i + j] & 0x7f;
|
|
ccprintf(os,
|
|
"%c", (char)(isprint(ch) ? ch : ' '));
|
|
}
|
|
|
|
ccprintf(os, "\n");
|
|
|
|
if (c < 16)
|
|
break;
|
|
}
|
|
}
|
|
} // namespace Trace
|
|
|
|
//
|
|
// Returns the current output stream for debug information. As a
|
|
// wrapper around Trace::dprintf_stream, this handles cases where debug
|
|
// information is generated in the process of parsing .ini options,
|
|
// before we process the option that sets up the debug output stream
|
|
// itself.
|
|
//
|
|
std::ostream &
|
|
DebugOut()
|
|
{
|
|
return *Trace::dprintf_stream;
|
|
}
|
|
|
|
/////////////////////////////////////////////
|
|
//
|
|
// C-linkage functions for invoking from gdb
|
|
//
|
|
/////////////////////////////////////////////
|
|
|
|
//
|
|
// Dump trace buffer to specified file (cout if NULL)
|
|
//
|
|
extern "C"
|
|
void
|
|
dumpTrace(const char *filename)
|
|
{
|
|
if (filename != NULL) {
|
|
ofstream out(filename);
|
|
Trace::theLog.dump(out);
|
|
out.close();
|
|
}
|
|
else {
|
|
Trace::theLog.dump(cout);
|
|
}
|
|
}
|
|
|
|
|
|
//
|
|
// Turn on/off trace output to cerr. Typically used when trace output
|
|
// is only going to circular buffer, but you want to see what's being
|
|
// sent there as you step through some code in gdb. This uses the
|
|
// same facility as the "trace to file" feature, and will print error
|
|
// messages rather than clobbering an existing ostream pointer.
|
|
//
|
|
extern "C"
|
|
void
|
|
echoTrace(bool on)
|
|
{
|
|
if (on) {
|
|
if (Trace::dprintf_stream != NULL) {
|
|
cerr << "Already echoing trace to a file... go do a 'tail -f'"
|
|
<< " on that file instead." << endl;
|
|
} else {
|
|
Trace::dprintf_stream = &cerr;
|
|
}
|
|
} else {
|
|
if (Trace::dprintf_stream != &cerr) {
|
|
cerr << "Not echoing trace to cerr." << endl;
|
|
} else {
|
|
Trace::dprintf_stream = NULL;
|
|
}
|
|
}
|
|
}
|
|
|
|
extern "C"
|
|
void
|
|
printTraceFlags()
|
|
{
|
|
using namespace Trace;
|
|
for (int i = 0; i < numFlagStrings; ++i)
|
|
if (flags[i])
|
|
cprintf("%s\n", flagStrings[i]);
|
|
}
|
|
|
|
void
|
|
tweakTraceFlag(const char *string, bool value)
|
|
{
|
|
using namespace Trace;
|
|
std::string str(string);
|
|
|
|
for (int i = 0; i < numFlagStrings; ++i) {
|
|
if (str != flagStrings[i])
|
|
continue;
|
|
|
|
int idx = i;
|
|
|
|
if (idx < NumFlags) {
|
|
flags[idx] = value;
|
|
} else {
|
|
idx -= NumFlags;
|
|
if (idx >= NumCompoundFlags) {
|
|
ccprintf(cerr, "Invalid compound flag");
|
|
return;
|
|
}
|
|
|
|
const Flags *flagVec = compoundFlags[idx];
|
|
|
|
for (int j = 0; flagVec[j] != -1; ++j) {
|
|
if (flagVec[j] >= NumFlags) {
|
|
ccprintf(cerr, "Invalid compound flag");
|
|
return;
|
|
}
|
|
flags[flagVec[j]] = value;
|
|
}
|
|
}
|
|
|
|
cprintf("flag %s was %s\n", string, value ? "set" : "cleared");
|
|
return;
|
|
}
|
|
|
|
cprintf("could not find flag %s\n", string);
|
|
}
|
|
|
|
extern "C"
|
|
void
|
|
setTraceFlag(const char *string)
|
|
{
|
|
tweakTraceFlag(string, true);
|
|
}
|
|
|
|
extern "C"
|
|
void
|
|
clearTraceFlag(const char *string)
|
|
{
|
|
tweakTraceFlag(string, false);
|
|
}
|