5 files changed, 34 insertions, 33 deletions

diff --git a/src/dev/mips/Malta.py b/src/dev/mips/Malta.py
index d321a6361..d215bf329 100755
--- a/src/dev/mips/Malta.py
+++ b/src/dev/mips/Malta.py
@@ -28,12 +28,13 @@
 
 from m5.params import *
 from m5.proxy import *
+
+from BadDevice import BadDevice
 from Device import BasicPioDevice
+from MipsBackdoor import MipsBackdoor
+from Pci import PciConfigAll
 from Platform import Platform
-from MipsConsole import MipsConsole
 from Uart import Uart8250
-from Pci import PciConfigAll
-from BadDevice import BadDevice
 
 class MaltaCChip(BasicPioDevice):
     type = 'MaltaCChip'
@@ -56,7 +57,7 @@ class Malta(Platform):
     cchip = MaltaCChip(pio_addr=0x801a0000000)
     io = MaltaIO(pio_addr=0x801fc000000)
     uart = Uart8250(pio_addr=0xBFD003F8)
-    console = MipsConsole(pio_addr=0xBFD00F00, disk=Parent.simple_disk)
+    backdoor = MipsBackdoor(pio_addr=0xBFD00F00, 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
@@ -65,4 +66,4 @@ class Malta(Platform):
         self.cchip.pio = bus.port
         self.io.pio = bus.port
         self.uart.pio = bus.port
-        self.console.pio = bus.port
+        self.backdoor.pio = bus.port
diff --git a/src/dev/mips/MipsConsole.py b/src/dev/mips/MipsBackdoor.py
index 8b724991a..f65250238 100644
--- a/src/dev/mips/MipsConsole.py
+++ b/src/dev/mips/MipsBackdoor.py
@@ -30,8 +30,8 @@ from m5.params import *
 from m5.proxy import *
 from Device import BasicPioDevice
 
-class MipsConsole(BasicPioDevice):
-    type = 'MipsConsole'
+class MipsBackdoor(BasicPioDevice):
+    type = 'MipsBackdoor'
     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/mips/SConscript b/src/dev/mips/SConscript
index 22e91ff09..e83e47ebd 100755
--- a/src/dev/mips/SConscript
+++ b/src/dev/mips/SConscript
@@ -32,13 +32,13 @@
 Import('*')
 
 if env['FULL_SYSTEM'] and env['TARGET_ISA'] == 'mips':
-    SimObject('MipsConsole.py')
+    SimObject('MipsBackdoor.py')
     SimObject('Malta.py')
 
     TraceFlag('Malta')
     TraceFlag('MC146818')
 
-    Source('console.cc')
+    Source('backdoor.cc')
     Source('malta.cc')
     Source('malta_cchip.cc')
     Source('malta_io.cc')
diff --git a/src/dev/mips/console.cc b/src/dev/mips/backdoor.cc
index d1663999a..313f12567 100755
--- a/src/dev/mips/console.cc
+++ b/src/dev/mips/backdoor.cc
@@ -32,7 +32,7 @@
  */
 
 /** @file
- * Mips Console Definition
+ * Mips Console Backdoor Definition
  */
 #include <cstddef>
 #include <string>
@@ -43,21 +43,21 @@
 #include "base/trace.hh"
 #include "cpu/base.hh"
 #include "cpu/thread_context.hh"
-#include "dev/mips/console.hh"
+#include "dev/mips/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/MipsConsole.hh"
+#include "params/MipsBackdoor.hh"
 #include "sim/sim_object.hh"
 
 
 using namespace std;
 using namespace MipsISA;
 
-MipsConsole::MipsConsole(const Params *p)
+MipsBackdoor::MipsBackdoor(const Params *p)
   : BasicPioDevice(p), disk(p->disk), terminal(p->terminal),
     system(p->system), cpu(p->cpu)
 {
@@ -81,7 +81,7 @@ MipsConsole::MipsConsole(const Params *p)
 }
 
 void
-MipsConsole::startup()
+MipsBackdoor::startup()
 {
     system->setMipsAccess(pioAddr);
     mipsAccess->numCPUs = system->getNumCPUs();
@@ -94,7 +94,7 @@ MipsConsole::startup()
 }
 
 Tick
-MipsConsole::read(PacketPtr pkt)
+MipsBackdoor::read(PacketPtr pkt)
 {
 
     /** XXX Do we want to push the addr munging to a bus brige or something? So
@@ -169,7 +169,7 @@ MipsConsole::read(PacketPtr pkt)
                     else
                         panic("Unknown 32bit access, %#x\n", daddr);
             }
-            //DPRINTF(MipsConsole, "read: offset=%#x val=%#x\n", daddr,
+            //DPRINTF(MipsBackdoor, "read: offset=%#x val=%#x\n", daddr,
                    // pkt->get<uint64_t>());
             break;
         default:
@@ -181,7 +181,7 @@ MipsConsole::read(PacketPtr pkt)
 }
 
 Tick
-MipsConsole::write(PacketPtr pkt)
+MipsBackdoor::write(PacketPtr pkt)
 {
     assert(pkt->getAddr() >= pioAddr && pkt->getAddr() < pioAddr + pioSize);
     Addr daddr = pkt->getAddr() - pioAddr;
@@ -235,7 +235,7 @@ MipsConsole::write(PacketPtr pkt)
 }
 
 void
-MipsConsole::Access::serialize(ostream &os)
+MipsBackdoor::Access::serialize(ostream &os)
 {
     SERIALIZE_SCALAR(last_offset);
     SERIALIZE_SCALAR(version);
@@ -257,7 +257,7 @@ MipsConsole::Access::serialize(ostream &os)
 }
 
 void
-MipsConsole::Access::unserialize(Checkpoint *cp, const std::string &section)
+MipsBackdoor::Access::unserialize(Checkpoint *cp, const std::string &section)
 {
     UNSERIALIZE_SCALAR(last_offset);
     UNSERIALIZE_SCALAR(version);
@@ -279,19 +279,19 @@ MipsConsole::Access::unserialize(Checkpoint *cp, const std::string &section)
 }
 
 void
-MipsConsole::serialize(ostream &os)
+MipsBackdoor::serialize(ostream &os)
 {
     mipsAccess->serialize(os);
 }
 
 void
-MipsConsole::unserialize(Checkpoint *cp, const std::string &section)
+MipsBackdoor::unserialize(Checkpoint *cp, const std::string &section)
 {
     mipsAccess->unserialize(cp, section);
 }
 
-MipsConsole *
-MipsConsoleParams::create()
+MipsBackdoor *
+MipsBackdoorParams::create()
 {
-    return new MipsConsole(this);
+    return new MipsBackdoor(this);
 }
diff --git a/src/dev/mips/console.hh b/src/dev/mips/backdoor.hh
index a78343f35..b8cc0ae46 100755
--- a/src/dev/mips/console.hh
+++ b/src/dev/mips/backdoor.hh
@@ -29,16 +29,16 @@
  */
 
 /** @file
- * System Console Interface
+ * System Console Backdoor Interface
  */
 
-#ifndef __MIPS_CONSOLE_HH__
-#define __MIPS_CONSOLE_HH__
+#ifndef __DEV_MIPS_BACKDOOR_HH__
+#define __DEV_MIPS_BACKDOOR_HH__
 
 #include "base/range.hh"
 #include "dev/mips/access.h"
 #include "dev/io_device.hh"
-#include "params/MipsConsole.hh"
+#include "params/MipsBackdoor.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 MipsConsole : public BasicPioDevice
+class MipsBackdoor : public BasicPioDevice
 {
   protected:
     struct Access : public MipsAccess
@@ -99,8 +99,8 @@ class MipsConsole : public BasicPioDevice
     BaseCPU *cpu;
 
   public:
-    typedef MipsConsoleParams Params;
-    MipsConsole(const Params *p);
+    typedef MipsBackdoorParams Params;
+    MipsBackdoor(const Params *p);
 
     const Params *
     params() const
@@ -123,4 +123,4 @@ class MipsConsole : public BasicPioDevice
     virtual void unserialize(Checkpoint *cp, const std::string &section);
 };
 
-#endif // __MIPS_CONSOLE_HH__
+#endif // __DEV_MIPS_BACKDOOR_HH__