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
361 lines
12 KiB
C++
361 lines
12 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.
|
|
*/
|
|
|
|
/* @file
|
|
* System Console Definition
|
|
*/
|
|
|
|
#include <cstddef>
|
|
#include <cstdio>
|
|
#include <string>
|
|
|
|
#include "base/inifile.hh"
|
|
#include "base/str.hh" // for to_number()
|
|
#include "base/trace.hh"
|
|
#include "cpu/base_cpu.hh"
|
|
#include "cpu/exec_context.hh"
|
|
#include "dev/alpha_console.hh"
|
|
#include "dev/simconsole.hh"
|
|
#include "dev/simple_disk.hh"
|
|
#include "dev/tlaser_clock.hh"
|
|
#include "mem/bus/bus.hh"
|
|
#include "mem/bus/pio_interface.hh"
|
|
#include "mem/bus/pio_interface_impl.hh"
|
|
#include "mem/functional_mem/memory_control.hh"
|
|
#include "sim/builder.hh"
|
|
#include "sim/system.hh"
|
|
#include "dev/tsunami_io.hh"
|
|
#include "sim/sim_object.hh"
|
|
#include "targetarch/byte_swap.hh"
|
|
|
|
using namespace std;
|
|
|
|
AlphaConsole::AlphaConsole(const string &name, SimConsole *cons, SimpleDisk *d,
|
|
System *system, BaseCPU *cpu, Platform *p,
|
|
int num_cpus, MemoryController *mmu, Addr a,
|
|
HierParams *hier, Bus *bus)
|
|
: PioDevice(name, p), disk(d), console(cons), addr(a)
|
|
{
|
|
mmu->add_child(this, RangeSize(addr, size));
|
|
|
|
if (bus) {
|
|
pioInterface = newPioInterface(name, hier, bus, this,
|
|
&AlphaConsole::cacheAccess);
|
|
pioInterface->addAddrRange(RangeSize(addr, size));
|
|
}
|
|
|
|
alphaAccess = new AlphaAccess;
|
|
alphaAccess->last_offset = size - 1;
|
|
alphaAccess->kernStart = system->getKernelStart();
|
|
alphaAccess->kernEnd = system->getKernelEnd();
|
|
alphaAccess->entryPoint = system->getKernelEntry();
|
|
|
|
alphaAccess->version = ALPHA_ACCESS_VERSION;
|
|
alphaAccess->numCPUs = num_cpus;
|
|
alphaAccess->mem_size = system->physmem->size();
|
|
alphaAccess->cpuClock = cpu->getFreq() / 1000000;
|
|
alphaAccess->intrClockFrequency = platform->intrFrequency();
|
|
alphaAccess->diskUnit = 1;
|
|
|
|
alphaAccess->diskCount = 0;
|
|
alphaAccess->diskPAddr = 0;
|
|
alphaAccess->diskBlock = 0;
|
|
alphaAccess->diskOperation = 0;
|
|
alphaAccess->outputChar = 0;
|
|
alphaAccess->inputChar = 0;
|
|
alphaAccess->bootStrapImpure = 0;
|
|
alphaAccess->bootStrapCPU = 0;
|
|
alphaAccess->align2 = 0;
|
|
}
|
|
|
|
Fault
|
|
AlphaConsole::read(MemReqPtr &req, uint8_t *data)
|
|
{
|
|
memset(data, 0, req->size);
|
|
|
|
Addr daddr = req->paddr - (addr & EV5::PAddrImplMask);
|
|
|
|
switch (req->size)
|
|
{
|
|
case sizeof(uint32_t):
|
|
DPRINTF(AlphaConsole, "read: offset=%#x val=%#x\n", daddr, *(uint32_t*)data);
|
|
switch (daddr)
|
|
{
|
|
case offsetof(AlphaAccess, last_offset):
|
|
*(uint32_t*)data = alphaAccess->last_offset;
|
|
break;
|
|
case offsetof(AlphaAccess, version):
|
|
*(uint32_t*)data = alphaAccess->version;
|
|
break;
|
|
case offsetof(AlphaAccess, numCPUs):
|
|
*(uint32_t*)data = alphaAccess->numCPUs;
|
|
break;
|
|
case offsetof(AlphaAccess, bootStrapCPU):
|
|
*(uint32_t*)data = alphaAccess->bootStrapCPU;
|
|
break;
|
|
case offsetof(AlphaAccess, intrClockFrequency):
|
|
*(uint32_t*)data = alphaAccess->intrClockFrequency;
|
|
break;
|
|
default:
|
|
// Old console code read in everyting as a 32bit int
|
|
*(uint32_t*)data = *(uint32_t*)(consoleData + daddr);
|
|
|
|
}
|
|
break;
|
|
case sizeof(uint64_t):
|
|
DPRINTF(AlphaConsole, "read: offset=%#x val=%#x\n", daddr, *(uint64_t*)data);
|
|
switch (daddr)
|
|
{
|
|
case offsetof(AlphaAccess, inputChar):
|
|
*(uint64_t*)data = console->console_in();
|
|
break;
|
|
case offsetof(AlphaAccess, cpuClock):
|
|
*(uint64_t*)data = alphaAccess->cpuClock;
|
|
break;
|
|
case offsetof(AlphaAccess, mem_size):
|
|
*(uint64_t*)data = alphaAccess->mem_size;
|
|
break;
|
|
case offsetof(AlphaAccess, kernStart):
|
|
*(uint64_t*)data = alphaAccess->kernStart;
|
|
break;
|
|
case offsetof(AlphaAccess, kernEnd):
|
|
*(uint64_t*)data = alphaAccess->kernEnd;
|
|
break;
|
|
case offsetof(AlphaAccess, entryPoint):
|
|
*(uint64_t*)data = alphaAccess->entryPoint;
|
|
break;
|
|
case offsetof(AlphaAccess, diskUnit):
|
|
*(uint64_t*)data = alphaAccess->diskUnit;
|
|
break;
|
|
case offsetof(AlphaAccess, diskCount):
|
|
*(uint64_t*)data = alphaAccess->diskCount;
|
|
break;
|
|
case offsetof(AlphaAccess, diskPAddr):
|
|
*(uint64_t*)data = alphaAccess->diskPAddr;
|
|
break;
|
|
case offsetof(AlphaAccess, diskBlock):
|
|
*(uint64_t*)data = alphaAccess->diskBlock;
|
|
break;
|
|
case offsetof(AlphaAccess, diskOperation):
|
|
*(uint64_t*)data = alphaAccess->diskOperation;
|
|
break;
|
|
case offsetof(AlphaAccess, outputChar):
|
|
*(uint64_t*)data = alphaAccess->outputChar;
|
|
break;
|
|
case offsetof(AlphaAccess, bootStrapImpure):
|
|
*(uint64_t*)data = alphaAccess->bootStrapImpure;
|
|
break;
|
|
default:
|
|
panic("Unknown 64bit access, %#x\n", daddr);
|
|
}
|
|
break;
|
|
default:
|
|
return Machine_Check_Fault;
|
|
}
|
|
|
|
return No_Fault;
|
|
}
|
|
|
|
Fault
|
|
AlphaConsole::write(MemReqPtr &req, const uint8_t *data)
|
|
{
|
|
uint64_t val;
|
|
|
|
switch (req->size) {
|
|
case sizeof(uint32_t):
|
|
val = *(uint32_t *)data;
|
|
break;
|
|
|
|
case sizeof(uint64_t):
|
|
val = *(uint64_t *)data;
|
|
break;
|
|
default:
|
|
return Machine_Check_Fault;
|
|
}
|
|
|
|
Addr daddr = req->paddr - (addr & EV5::PAddrImplMask);
|
|
ExecContext *other_xc;
|
|
|
|
switch (daddr) {
|
|
case offsetof(AlphaAccess, diskUnit):
|
|
alphaAccess->diskUnit = val;
|
|
break;
|
|
|
|
case offsetof(AlphaAccess, diskCount):
|
|
alphaAccess->diskCount = val;
|
|
break;
|
|
|
|
case offsetof(AlphaAccess, diskPAddr):
|
|
alphaAccess->diskPAddr = val;
|
|
break;
|
|
|
|
case offsetof(AlphaAccess, diskBlock):
|
|
alphaAccess->diskBlock = val;
|
|
break;
|
|
|
|
case offsetof(AlphaAccess, diskOperation):
|
|
if (val == 0x13)
|
|
disk->read(alphaAccess->diskPAddr, alphaAccess->diskBlock,
|
|
alphaAccess->diskCount);
|
|
else
|
|
panic("Invalid disk operation!");
|
|
|
|
break;
|
|
|
|
case offsetof(AlphaAccess, outputChar):
|
|
console->out((char)(val & 0xff));
|
|
break;
|
|
|
|
case offsetof(AlphaAccess, bootStrapImpure):
|
|
alphaAccess->bootStrapImpure = val;
|
|
break;
|
|
|
|
case offsetof(AlphaAccess, bootStrapCPU):
|
|
warn("%d: Trying to launch another CPU!", curTick);
|
|
assert(val > 0 && "Must not access primary cpu");
|
|
|
|
other_xc = req->xc->system->execContexts[val];
|
|
other_xc->regs.intRegFile[16] = val;
|
|
other_xc->regs.ipr[TheISA::IPR_PALtemp16] = val;
|
|
other_xc->regs.intRegFile[0] = val;
|
|
other_xc->regs.intRegFile[30] = alphaAccess->bootStrapImpure;
|
|
other_xc->activate(); //Start the cpu
|
|
break;
|
|
|
|
default:
|
|
return Machine_Check_Fault;
|
|
}
|
|
|
|
return No_Fault;
|
|
}
|
|
|
|
Tick
|
|
AlphaConsole::cacheAccess(MemReqPtr &req)
|
|
{
|
|
return curTick + 1000;
|
|
}
|
|
|
|
void
|
|
AlphaAccess::serialize(ostream &os)
|
|
{
|
|
SERIALIZE_SCALAR(last_offset);
|
|
SERIALIZE_SCALAR(version);
|
|
SERIALIZE_SCALAR(numCPUs);
|
|
SERIALIZE_SCALAR(mem_size);
|
|
SERIALIZE_SCALAR(cpuClock);
|
|
SERIALIZE_SCALAR(intrClockFrequency);
|
|
SERIALIZE_SCALAR(kernStart);
|
|
SERIALIZE_SCALAR(kernEnd);
|
|
SERIALIZE_SCALAR(entryPoint);
|
|
SERIALIZE_SCALAR(diskUnit);
|
|
SERIALIZE_SCALAR(diskCount);
|
|
SERIALIZE_SCALAR(diskPAddr);
|
|
SERIALIZE_SCALAR(diskBlock);
|
|
SERIALIZE_SCALAR(diskOperation);
|
|
SERIALIZE_SCALAR(outputChar);
|
|
SERIALIZE_SCALAR(inputChar);
|
|
SERIALIZE_SCALAR(bootStrapImpure);
|
|
SERIALIZE_SCALAR(bootStrapCPU);
|
|
}
|
|
|
|
void
|
|
AlphaAccess::unserialize(Checkpoint *cp, const std::string §ion)
|
|
{
|
|
UNSERIALIZE_SCALAR(last_offset);
|
|
UNSERIALIZE_SCALAR(version);
|
|
UNSERIALIZE_SCALAR(numCPUs);
|
|
UNSERIALIZE_SCALAR(mem_size);
|
|
UNSERIALIZE_SCALAR(cpuClock);
|
|
UNSERIALIZE_SCALAR(intrClockFrequency);
|
|
UNSERIALIZE_SCALAR(kernStart);
|
|
UNSERIALIZE_SCALAR(kernEnd);
|
|
UNSERIALIZE_SCALAR(entryPoint);
|
|
UNSERIALIZE_SCALAR(diskUnit);
|
|
UNSERIALIZE_SCALAR(diskCount);
|
|
UNSERIALIZE_SCALAR(diskPAddr);
|
|
UNSERIALIZE_SCALAR(diskBlock);
|
|
UNSERIALIZE_SCALAR(diskOperation);
|
|
UNSERIALIZE_SCALAR(outputChar);
|
|
UNSERIALIZE_SCALAR(inputChar);
|
|
UNSERIALIZE_SCALAR(bootStrapImpure);
|
|
UNSERIALIZE_SCALAR(bootStrapCPU);
|
|
}
|
|
|
|
void
|
|
AlphaConsole::serialize(ostream &os)
|
|
{
|
|
alphaAccess->serialize(os);
|
|
}
|
|
|
|
void
|
|
AlphaConsole::unserialize(Checkpoint *cp, const std::string §ion)
|
|
{
|
|
alphaAccess->unserialize(cp, section);
|
|
}
|
|
|
|
BEGIN_DECLARE_SIM_OBJECT_PARAMS(AlphaConsole)
|
|
|
|
SimObjectParam<SimConsole *> sim_console;
|
|
SimObjectParam<SimpleDisk *> disk;
|
|
Param<int> num_cpus;
|
|
SimObjectParam<MemoryController *> mmu;
|
|
Param<Addr> addr;
|
|
SimObjectParam<System *> system;
|
|
SimObjectParam<BaseCPU *> cpu;
|
|
SimObjectParam<Platform *> platform;
|
|
SimObjectParam<Bus*> io_bus;
|
|
Param<Tick> pio_latency;
|
|
SimObjectParam<HierParams *> hier;
|
|
|
|
END_DECLARE_SIM_OBJECT_PARAMS(AlphaConsole)
|
|
|
|
BEGIN_INIT_SIM_OBJECT_PARAMS(AlphaConsole)
|
|
|
|
INIT_PARAM(sim_console, "The Simulator Console"),
|
|
INIT_PARAM(disk, "Simple Disk"),
|
|
INIT_PARAM_DFLT(num_cpus, "Number of CPU's", 1),
|
|
INIT_PARAM(mmu, "Memory Controller"),
|
|
INIT_PARAM(addr, "Device Address"),
|
|
INIT_PARAM(system, "system object"),
|
|
INIT_PARAM(cpu, "Processor"),
|
|
INIT_PARAM(platform, "platform"),
|
|
INIT_PARAM_DFLT(io_bus, "The IO Bus to attach to", NULL),
|
|
INIT_PARAM_DFLT(pio_latency, "Programmed IO latency", 1000),
|
|
INIT_PARAM_DFLT(hier, "Hierarchy global variables", &defaultHierParams)
|
|
|
|
END_INIT_SIM_OBJECT_PARAMS(AlphaConsole)
|
|
|
|
CREATE_SIM_OBJECT(AlphaConsole)
|
|
{
|
|
return new AlphaConsole(getInstanceName(), sim_console, disk,
|
|
system, cpu, platform, num_cpus, mmu,
|
|
addr, hier, io_bus);
|
|
}
|
|
|
|
REGISTER_SIM_OBJECT("AlphaConsole", AlphaConsole)
|