SE/FS: Get rid of FULL_SYSTEM in dev.
This commit is contained in:
@@ -37,5 +37,4 @@ class AlphaBackdoor(BasicPioDevice):
|
||||
disk = Param.SimpleDisk("Simple Disk")
|
||||
terminal = Param.Terminal(Parent.any, "The console terminal")
|
||||
platform = Param.Platform(Parent.any, "Platform this device is part of.")
|
||||
if buildEnv['FULL_SYSTEM']: # No AlphaSystem in SE mode.
|
||||
system = Param.AlphaSystem(Parent.any, "system object")
|
||||
system = Param.AlphaSystem(Parent.any, "system object")
|
||||
|
||||
@@ -38,11 +38,7 @@
|
||||
#include <cstddef>
|
||||
#include <string>
|
||||
|
||||
#include "config/full_system.hh"
|
||||
|
||||
#if FULL_SYSTEM //XXX No AlphaSystem in SE mode.
|
||||
#include "arch/alpha/system.hh"
|
||||
#endif
|
||||
#include "base/inifile.hh"
|
||||
#include "base/str.hh"
|
||||
#include "base/trace.hh"
|
||||
@@ -67,9 +63,7 @@ using namespace AlphaISA;
|
||||
|
||||
AlphaBackdoor::AlphaBackdoor(const Params *p)
|
||||
: BasicPioDevice(p), disk(p->disk), terminal(p->terminal),
|
||||
#if FULL_SYSTEM //XXX No system pointer in SE mode.
|
||||
system(p->system),
|
||||
#endif
|
||||
cpu(p->cpu)
|
||||
{
|
||||
|
||||
@@ -94,7 +88,6 @@ AlphaBackdoor::AlphaBackdoor(const Params *p)
|
||||
void
|
||||
AlphaBackdoor::startup()
|
||||
{
|
||||
#if FULL_SYSTEM //XXX No system pointer in SE mode.
|
||||
system->setAlphaAccess(pioAddr);
|
||||
alphaAccess->numCPUs = system->numContexts();
|
||||
alphaAccess->kernStart = system->getKernelStart();
|
||||
@@ -105,7 +98,6 @@ AlphaBackdoor::startup()
|
||||
Tsunami *tsunami = dynamic_cast<Tsunami *>(params()->platform);
|
||||
assert(tsunami);
|
||||
alphaAccess->intrClockFrequency = tsunami->io->frequency();
|
||||
#endif
|
||||
}
|
||||
|
||||
Tick
|
||||
|
||||
@@ -92,10 +92,8 @@ class AlphaBackdoor : public BasicPioDevice
|
||||
/** the system console (the terminal) is accessable from the console */
|
||||
Terminal *terminal;
|
||||
|
||||
#if FULL_SYSTEM //XXX No AlphaSystem defined in SE mode.
|
||||
/** a pointer to the system we are running in */
|
||||
AlphaSystem *system;
|
||||
#endif
|
||||
|
||||
/** a pointer to the CPU boot cpu */
|
||||
BaseCPU *cpu;
|
||||
|
||||
@@ -36,12 +36,7 @@
|
||||
#include <string>
|
||||
#include <vector>
|
||||
|
||||
#include "config/full_system.hh"
|
||||
|
||||
#if FULL_SYSTEM //XXX AlphaSystem doesn't build in SE mode yet.
|
||||
#include "arch/alpha/system.hh"
|
||||
#endif
|
||||
|
||||
#include "config/the_isa.hh"
|
||||
#include "cpu/intr_control.hh"
|
||||
#include "dev/alpha/tsunami.hh"
|
||||
@@ -64,11 +59,9 @@ Tsunami::Tsunami(const Params *p)
|
||||
void
|
||||
Tsunami::init()
|
||||
{
|
||||
#if FULL_SYSTEM //XXX AlphaSystem doesn't build in SE mode yet.
|
||||
AlphaSystem *alphaSystem = dynamic_cast<AlphaSystem *>(system);
|
||||
assert(alphaSystem);
|
||||
alphaSystem->setIntrFreq(io->frequency());
|
||||
#endif
|
||||
}
|
||||
|
||||
void
|
||||
|
||||
@@ -70,9 +70,7 @@ SimpleDisk::read(Addr addr, baddr_t block, int count) const
|
||||
for (int i = 0, j = 0; i < count; i += SectorSize, j++)
|
||||
image->read(data + i, block + j);
|
||||
|
||||
#if FULL_SYSTEM //XXX No functional port in SE mode.
|
||||
system->functionalPort->writeBlob(addr, data, count);
|
||||
#endif
|
||||
|
||||
DPRINTF(SimpleDisk, "read block=%#x len=%d\n", (uint64_t)block, count);
|
||||
DDUMP(SimpleDiskData, data, count);
|
||||
|
||||
Reference in New Issue
Block a user