Hand merge. Stuff probably doesn't compile.

--HG--
rename : arch/alpha/isa_desc => arch/alpha/isa/main.isa
rename : arch/alpha/alpha_linux_process.cc => arch/alpha/linux/process.cc
rename : arch/alpha/alpha_linux_process.hh => arch/alpha/linux/process.hh
rename : arch/alpha/alpha_tru64_process.cc => arch/alpha/tru64/process.cc
rename : arch/alpha/alpha_tru64_process.hh => arch/alpha/tru64/process.hh
rename : cpu/exec_context.cc => cpu/cpu_exec_context.cc
rename : cpu/exec_context.hh => cpu/cpu_exec_context.hh
extra : convert_revision : 7d1efcedd708815d985a951f6f010fbd83dc27e8

1 files changed, 5 insertions, 4 deletions

diff --git a/dev/alpha_console.hh b/dev/alpha_console.hh
index 74ad795f0..f63c6ad7e 100644
--- a/dev/alpha_console.hh
+++ b/dev/alpha_console.hh
@@ -41,8 +41,9 @@
 
 class BaseCPU;
 class SimConsole;
-class System;
+class AlphaSystem;
 class SimpleDisk;
+class MemoryController;
 
 /**
  * Memory mapped interface to the system console. This device
@@ -90,18 +91,18 @@ class AlphaConsole : public PioDevice
     SimConsole *console;
 
     /** a pointer to the system we are running in */
-    System *system;
+    AlphaSystem *system;
 
     /** a pointer to the CPU boot cpu */
     BaseCPU *cpu;
 
     Addr addr;
-    static const Addr size = 0x80; // equal to sizeof(alpha_access);
+    static const Addr size = sizeof(struct AlphaAccess);
 
   public:
     /** Standard Constructor */
     AlphaConsole(const std::string &name, SimConsole *cons, SimpleDisk *d,
-                 System *s, BaseCPU *c, Platform *platform,
+                 AlphaSystem *s, BaseCPU *c, Platform *platform,
                  MemoryController *mmu, Addr addr,
                  HierParams *hier, Bus *pio_bus);