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
131 lines
3.6 KiB
C++
131 lines
3.6 KiB
C++
/*
|
|
* Copyright (c) 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 <deque>
|
|
#include <string>
|
|
#include <vector>
|
|
|
|
#include "cpu/intr_control.hh"
|
|
#include "dev/simconsole.hh"
|
|
#include "dev/etherdev.hh"
|
|
#include "dev/ide_ctrl.hh"
|
|
#include "dev/tlaser_clock.hh"
|
|
#include "dev/tsunami_cchip.hh"
|
|
#include "dev/tsunami_pchip.hh"
|
|
#include "dev/tsunami_io.hh"
|
|
#include "dev/tsunami.hh"
|
|
#include "dev/pciconfigall.hh"
|
|
#include "sim/builder.hh"
|
|
#include "sim/system.hh"
|
|
|
|
using namespace std;
|
|
|
|
Tsunami::Tsunami(const string &name, System *s,
|
|
IntrControl *ic, PciConfigAll *pci, int intr_freq)
|
|
: Platform(name, ic, pci, intr_freq), system(s)
|
|
{
|
|
// set the back pointer from the system to myself
|
|
system->platform = this;
|
|
|
|
for (int i = 0; i < Tsunami::Max_CPUs; i++)
|
|
intr_sum_type[i] = 0;
|
|
}
|
|
|
|
Tick
|
|
Tsunami::intrFrequency()
|
|
{
|
|
return io->frequency();
|
|
}
|
|
|
|
void
|
|
Tsunami::postConsoleInt()
|
|
{
|
|
io->postPIC(0x10);
|
|
}
|
|
|
|
void
|
|
Tsunami::clearConsoleInt()
|
|
{
|
|
io->clearPIC(0x10);
|
|
}
|
|
|
|
void
|
|
Tsunami::postPciInt(int line)
|
|
{
|
|
cchip->postDRIR(line);
|
|
}
|
|
|
|
void
|
|
Tsunami::clearPciInt(int line)
|
|
{
|
|
cchip->clearDRIR(line);
|
|
}
|
|
|
|
Addr
|
|
Tsunami::pciToDma(Addr pciAddr) const
|
|
{
|
|
return pchip->translatePciToDma(pciAddr);
|
|
}
|
|
|
|
void
|
|
Tsunami::serialize(std::ostream &os)
|
|
{
|
|
SERIALIZE_ARRAY(intr_sum_type, Tsunami::Max_CPUs);
|
|
}
|
|
|
|
void
|
|
Tsunami::unserialize(Checkpoint *cp, const std::string §ion)
|
|
{
|
|
UNSERIALIZE_ARRAY(intr_sum_type, Tsunami::Max_CPUs);
|
|
}
|
|
|
|
BEGIN_DECLARE_SIM_OBJECT_PARAMS(Tsunami)
|
|
|
|
SimObjectParam<System *> system;
|
|
SimObjectParam<IntrControl *> intrctrl;
|
|
SimObjectParam<PciConfigAll *> pciconfig;
|
|
Param<int> interrupt_frequency;
|
|
|
|
END_DECLARE_SIM_OBJECT_PARAMS(Tsunami)
|
|
|
|
BEGIN_INIT_SIM_OBJECT_PARAMS(Tsunami)
|
|
|
|
INIT_PARAM(system, "system"),
|
|
INIT_PARAM(intrctrl, "interrupt controller"),
|
|
INIT_PARAM(pciconfig, "PCI configuration"),
|
|
INIT_PARAM_DFLT(interrupt_frequency, "frequency of interrupts", 1024)
|
|
|
|
END_INIT_SIM_OBJECT_PARAMS(Tsunami)
|
|
|
|
CREATE_SIM_OBJECT(Tsunami)
|
|
{
|
|
return new Tsunami(getInstanceName(), system, intrctrl, pciconfig,
|
|
interrupt_frequency);
|
|
}
|
|
|
|
REGISTER_SIM_OBJECT("Tsunami", Tsunami)
|