rename AlphaConsole to AlphaBackdoor

--HG--
rename : src/dev/alpha/AlphaConsole.py => src/dev/alpha/AlphaBackdoor.py
rename : src/dev/alpha/console.cc => src/dev/alpha/backdoor.cc
rename : src/dev/alpha/console.hh => src/dev/alpha/backdoor.hh

5 files changed, 35 insertions, 36 deletions

diff --git a/src/dev/alpha/AlphaConsole.py b/src/dev/alpha/AlphaBackdoor.py
index 8983fcbed..fa9627164 100644
--- a/src/dev/alpha/AlphaConsole.py
+++ b/src/dev/alpha/AlphaBackdoor.py
@@ -30,8 +30,8 @@ from m5.params import *
 from m5.proxy import *
 from Device import BasicPioDevice
 
-class AlphaConsole(BasicPioDevice):
-    type = 'AlphaConsole'
+class AlphaBackdoor(BasicPioDevice):
+    type = 'AlphaBackdoor'
     cpu = Param.BaseCPU(Parent.cpu[0], "Processor")
     disk = Param.SimpleDisk("Simple Disk")
     terminal = Param.Terminal(Parent.any, "The console terminal")
diff --git a/src/dev/alpha/SConscript b/src/dev/alpha/SConscript
index 6bd26a9b1..4dbb73903 100644
--- a/src/dev/alpha/SConscript
+++ b/src/dev/alpha/SConscript
@@ -32,14 +32,14 @@
 Import('*')
 
 if env['FULL_SYSTEM'] and env['TARGET_ISA'] == 'alpha':
-    SimObject('AlphaConsole.py')
+    SimObject('AlphaBackdoor.py')
     SimObject('Tsunami.py')
 
-    Source('console.cc')
+    Source('backdoor.cc')
     Source('tsunami.cc')
     Source('tsunami_cchip.cc')
     Source('tsunami_io.cc')
     Source('tsunami_pchip.cc')
 
-    TraceFlag('AlphaConsole')
+    TraceFlag('AlphaBackdoor')
     TraceFlag('Tsunami')
diff --git a/src/dev/alpha/Tsunami.py b/src/dev/alpha/Tsunami.py
index 5c5207a33..5440486b6 100644
--- a/src/dev/alpha/Tsunami.py
+++ b/src/dev/alpha/Tsunami.py
@@ -28,12 +28,12 @@
 
 from m5.params import *
 from m5.proxy import *
+from BadDevice import BadDevice
+from AlphaBackdoor import AlphaBackdoor
 from Device import BasicPioDevice, IsaFake, BadAddr
+from Pci import PciConfigAll
 from Platform import Platform
-from AlphaConsole import AlphaConsole
 from Uart import Uart8250
-from Pci import PciConfigAll
-from BadDevice import BadDevice
 
 class TsunamiCChip(BasicPioDevice):
     type = 'TsunamiCChip'
@@ -87,8 +87,7 @@ class Tsunami(Platform):
     fb = BadDevice(pio_addr=0x801fc0003d0, devicename='FrameBuffer')
     io = TsunamiIO(pio_addr=0x801fc000000)
     uart = Uart8250(pio_addr=0x801fc0003f8)
-    alpha_console = AlphaConsole(pio_addr=0x80200000000,
-                                 disk=Parent.simple_disk)
+    backdoor = AlphaBackdoor(pio_addr=0x80200000000, disk=Parent.simple_disk)
 
     # Attach I/O devices to specified bus object.  Can't do this
     # earlier, since the bus object itself is typically defined at the
@@ -121,4 +120,4 @@ class Tsunami(Platform):
         self.fb.pio = bus.port
         self.io.pio = bus.port
         self.uart.pio = bus.port
-        self.alpha_console.pio = bus.port
+        self.backdoor.pio = bus.port
diff --git a/src/dev/alpha/console.cc b/src/dev/alpha/backdoor.cc
index d7b2b5b02..3ba6cbd24 100644
--- a/src/dev/alpha/console.cc
+++ b/src/dev/alpha/backdoor.cc
@@ -32,7 +32,7 @@
  */
 
 /** @file
- * Alpha Console Definition
+ * Alpha Console Backdoor Definition
  */
 
 #include <cstddef>
@@ -44,20 +44,20 @@
 #include "base/trace.hh"
 #include "cpu/base.hh"
 #include "cpu/thread_context.hh"
-#include "dev/alpha/console.hh"
+#include "dev/alpha/backdoor.hh"
 #include "dev/platform.hh"
 #include "dev/simple_disk.hh"
 #include "dev/terminal.hh"
 #include "mem/packet.hh"
 #include "mem/packet_access.hh"
 #include "mem/physical.hh"
-#include "params/AlphaConsole.hh"
+#include "params/AlphaBackdoor.hh"
 #include "sim/sim_object.hh"
 
 using namespace std;
 using namespace AlphaISA;
 
-AlphaConsole::AlphaConsole(const Params *p)
+AlphaBackdoor::AlphaBackdoor(const Params *p)
     : BasicPioDevice(p), disk(p->disk), terminal(p->terminal),
       system(p->system), cpu(p->cpu)
 {
@@ -81,7 +81,7 @@ AlphaConsole::AlphaConsole(const Params *p)
 }
 
 void
-AlphaConsole::startup()
+AlphaBackdoor::startup()
 {
     system->setAlphaAccess(pioAddr);
     alphaAccess->numCPUs = system->getNumCPUs();
@@ -94,7 +94,7 @@ AlphaConsole::startup()
 }
 
 Tick
-AlphaConsole::read(PacketPtr pkt)
+AlphaBackdoor::read(PacketPtr pkt)
 {
 
     /** XXX Do we want to push the addr munging to a bus brige or something? So
@@ -132,7 +132,7 @@ AlphaConsole::read(PacketPtr pkt)
                      */
                   pkt->setBadAddress();
             }
-            DPRINTF(AlphaConsole, "read: offset=%#x val=%#x\n", daddr,
+            DPRINTF(AlphaBackdoor, "read: offset=%#x val=%#x\n", daddr,
                     pkt->get<uint32_t>());
             break;
         case sizeof(uint64_t):
@@ -183,7 +183,7 @@ AlphaConsole::read(PacketPtr pkt)
                     else
                         panic("Unknown 64bit access, %#x\n", daddr);
             }
-            DPRINTF(AlphaConsole, "read: offset=%#x val=%#x\n", daddr,
+            DPRINTF(AlphaBackdoor, "read: offset=%#x val=%#x\n", daddr,
                     pkt->get<uint64_t>());
             break;
         default:
@@ -193,7 +193,7 @@ AlphaConsole::read(PacketPtr pkt)
 }
 
 Tick
-AlphaConsole::write(PacketPtr pkt)
+AlphaBackdoor::write(PacketPtr pkt)
 {
     assert(pkt->getAddr() >= pioAddr && pkt->getAddr() < pioAddr + pioSize);
     Addr daddr = pkt->getAddr() - pioAddr;
@@ -248,7 +248,7 @@ AlphaConsole::write(PacketPtr pkt)
 }
 
 void
-AlphaConsole::Access::serialize(ostream &os)
+AlphaBackdoor::Access::serialize(ostream &os)
 {
     SERIALIZE_SCALAR(last_offset);
     SERIALIZE_SCALAR(version);
@@ -270,7 +270,7 @@ AlphaConsole::Access::serialize(ostream &os)
 }
 
 void
-AlphaConsole::Access::unserialize(Checkpoint *cp, const std::string &section)
+AlphaBackdoor::Access::unserialize(Checkpoint *cp, const std::string &section)
 {
     UNSERIALIZE_SCALAR(last_offset);
     UNSERIALIZE_SCALAR(version);
@@ -292,19 +292,19 @@ AlphaConsole::Access::unserialize(Checkpoint *cp, const std::string &section)
 }
 
 void
-AlphaConsole::serialize(ostream &os)
+AlphaBackdoor::serialize(ostream &os)
 {
     alphaAccess->serialize(os);
 }
 
 void
-AlphaConsole::unserialize(Checkpoint *cp, const std::string &section)
+AlphaBackdoor::unserialize(Checkpoint *cp, const std::string &section)
 {
     alphaAccess->unserialize(cp, section);
 }
 
-AlphaConsole *
-AlphaConsoleParams::create()
+AlphaBackdoor *
+AlphaBackdoorParams::create()
 {
-    return new AlphaConsole(this);
+    return new AlphaBackdoor(this);
 }
diff --git a/src/dev/alpha/console.hh b/src/dev/alpha/backdoor.hh
index b6145ef38..ad3c79823 100644
--- a/src/dev/alpha/console.hh
+++ b/src/dev/alpha/backdoor.hh
@@ -29,16 +29,16 @@
  */
 
 /** @file
- * System Console Interface
+ * System Console Backdoor Interface
  */
 
-#ifndef __ALPHA_CONSOLE_HH__
-#define __ALPHA_CONSOLE_HH__
+#ifndef __DEV_ALPHA_BACKDOOR_HH__
+#define __DEV_ALPHA_BACKDOOR_HH__
 
 #include "base/range.hh"
 #include "dev/alpha/access.h"
 #include "dev/io_device.hh"
-#include "params/AlphaConsole.hh"
+#include "params/AlphaBackdoor.hh"
 #include "sim/host.hh"
 #include "sim/sim_object.hh"
 
@@ -50,7 +50,7 @@ class SimpleDisk;
 /**
  * Memory mapped interface to the system console. This device
  * represents a shared data region between the OS Kernel and the
- * System Console.
+ * System Console Backdoor.
  *
  * The system console is a small standalone program that is initially
  * run when the system boots.  It contains the necessary code to
@@ -72,7 +72,7 @@ class SimpleDisk;
  * primarily used doing boot before the kernel has loaded its device
  * drivers.
  */
-class AlphaConsole : public BasicPioDevice
+class AlphaBackdoor : public BasicPioDevice
 {
   protected:
     struct Access : public AlphaAccess
@@ -99,8 +99,8 @@ class AlphaConsole : public BasicPioDevice
     BaseCPU *cpu;
 
   public:
-    typedef AlphaConsoleParams Params;
-    AlphaConsole(const Params *p);
+    typedef AlphaBackdoorParams Params;
+    AlphaBackdoor(const Params *p);
 
     const Params *
     params() const
@@ -123,4 +123,4 @@ class AlphaConsole : public BasicPioDevice
     virtual void unserialize(Checkpoint *cp, const std::string &section);
 };
 
-#endif // __ALPHA_CONSOLE_HH__
+#endif // __DEV_ALPHA_BACKDOOR_HH__