changeset a8b63a0ee14c in /z/repo/gem5
details: http://repo.gem5.org/gem5?cmd=changeset;node=a8b63a0ee14c
description:
SE/FS: Get rid of FULL_SYSTEM in dev.
diffstat:
src/dev/alpha/AlphaBackdoor.py | 3 +--
src/dev/alpha/backdoor.cc | 8 --------
src/dev/alpha/backdoor.hh | 2 --
src/dev/alpha/tsunami.cc | 7 -------
src/dev/simple_disk.cc | 2 --
5 files changed, 1 insertions(+), 21 deletions(-)
diffs (106 lines):
diff -r 2d403a6d7078 -r a8b63a0ee14c src/dev/alpha/AlphaBackdoor.py
--- a/src/dev/alpha/AlphaBackdoor.py Sun Nov 13 02:05:32 2011 -0800
+++ b/src/dev/alpha/AlphaBackdoor.py Sun Nov 13 02:05:32 2011 -0800
@@ -37,5 +37,4 @@
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")
diff -r 2d403a6d7078 -r a8b63a0ee14c src/dev/alpha/backdoor.cc
--- a/src/dev/alpha/backdoor.cc Sun Nov 13 02:05:32 2011 -0800
+++ b/src/dev/alpha/backdoor.cc Sun Nov 13 02:05:32 2011 -0800
@@ -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 @@
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 @@
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 @@
Tsunami *tsunami = dynamic_cast<Tsunami *>(params()->platform);
assert(tsunami);
alphaAccess->intrClockFrequency = tsunami->io->frequency();
-#endif
}
Tick
diff -r 2d403a6d7078 -r a8b63a0ee14c src/dev/alpha/backdoor.hh
--- a/src/dev/alpha/backdoor.hh Sun Nov 13 02:05:32 2011 -0800
+++ b/src/dev/alpha/backdoor.hh Sun Nov 13 02:05:32 2011 -0800
@@ -92,10 +92,8 @@
/** 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;
diff -r 2d403a6d7078 -r a8b63a0ee14c src/dev/alpha/tsunami.cc
--- a/src/dev/alpha/tsunami.cc Sun Nov 13 02:05:32 2011 -0800
+++ b/src/dev/alpha/tsunami.cc Sun Nov 13 02:05:32 2011 -0800
@@ -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 @@
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
diff -r 2d403a6d7078 -r a8b63a0ee14c src/dev/simple_disk.cc
--- a/src/dev/simple_disk.cc Sun Nov 13 02:05:32 2011 -0800
+++ b/src/dev/simple_disk.cc Sun Nov 13 02:05:32 2011 -0800
@@ -70,9 +70,7 @@
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);
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev
