summaryrefslogtreecommitdiff
path: root/dev/alpha_console.cc
diff options
context:
space:
mode:
authorNathan Binkert <binkertn@umich.edu>2005-06-28 12:42:15 -0400
committerNathan Binkert <binkertn@umich.edu>2005-06-28 12:42:15 -0400
commit036a8ceb8da8aff10b819b4aab32584d41282a64 (patch)
treee3d1c6bd8572ec503ff53e6b1b27bcd0f292f247 /dev/alpha_console.cc
parentd172447a7ae945139d0c3465b8504cd6b77ae819 (diff)
downloadgem5-036a8ceb8da8aff10b819b4aab32584d41282a64.tar.xz
Don't hard code the location of m5AlphaAccess. Instead, move the
code into a function that can be called by the AlphaConsole class. AlphaConsole will pass in its address. arch/alpha/ev5.hh: Move Phys2K0Seg to ev5.hh and fixup the TSUNAMI uncacheable bits so that they will be converted correctly. dev/alpha_access.h: Do not hard code the location of the AlphaConsole dev/alpha_console.cc: fixup #includes tell the system where the alpha console is sim/system.hh: Provide a function that will tell the system where the AlphaAccess structure (device) lives --HG-- extra : convert_revision : 92d70ca926151a32eebe9925de597459ac58013e
Diffstat (limited to 'dev/alpha_console.cc')
-rw-r--r--dev/alpha_console.cc9
1 files changed, 5 insertions, 4 deletions
diff --git a/dev/alpha_console.cc b/dev/alpha_console.cc
index 3c009d4bd..34c2978aa 100644
--- a/dev/alpha_console.cc
+++ b/dev/alpha_console.cc
@@ -35,23 +35,22 @@
#include <string>
#include "base/inifile.hh"
-#include "base/str.hh" // for to_number()
+#include "base/str.hh"
#include "base/trace.hh"
#include "cpu/base.hh"
#include "cpu/exec_context.hh"
#include "dev/alpha_console.hh"
#include "dev/simconsole.hh"
#include "dev/simple_disk.hh"
+#include "dev/tsunami_io.hh"
#include "mem/bus/bus.hh"
#include "mem/bus/pio_interface.hh"
#include "mem/bus/pio_interface_impl.hh"
#include "mem/functional/memory_control.hh"
#include "mem/functional/physical.hh"
#include "sim/builder.hh"
-#include "sim/system.hh"
-#include "dev/tsunami_io.hh"
#include "sim/sim_object.hh"
-#include "targetarch/byte_swap.hh"
+#include "sim/system.hh"
using namespace std;
@@ -85,6 +84,8 @@ AlphaConsole::AlphaConsole(const string &name, SimConsole *cons, SimpleDisk *d,
alphaAccess->bootStrapImpure = 0;
alphaAccess->bootStrapCPU = 0;
alphaAccess->align2 = 0;
+
+ system->setAlphaAccess(addr);
}
void