Update for console code reorganization

dev/alpha_access.h:
    Update the ALPHA_ACCESS_VERSION
    move typedefs to this file since they're only used here.
dev/alpha_console.cc:
    formatting
sim/system.cc:
    xxm -> m5

--HG--
extra : convert_revision : 3aeca50d1385034f5a1e20dd8b0abd03bd6f26f0

diff --git a/dev/alpha_access.h b/dev/alpha_access.h
index c0a571ced0b78431651e12b0238ede6aeb44fb64..07350d622ba0e5145960ba414aa6c84d8d095a64 100644 (file)
--- a/dev/alpha_access.h
+++ b/dev/alpha_access.h
@@ -33,12 +33,15 @@
  * System Console Memory Mapped Register Definition
  */
 
-#define ALPHA_ACCESS_VERSION (1301)
+#define ALPHA_ACCESS_VERSION (1302)
 
 #ifndef CONSOLE
 #include <iosfwd>
 #include <string>
 class Checkpoint;
+#else
+typedef unsigned uint32_t;
+typedef unsigned long uint64_t;
 #endif
 
 // This structure hacked up from simos

diff --git a/dev/alpha_console.cc b/dev/alpha_console.cc
index 3ae1aede5ad385d9994d0e1c950f29902eb11adb..2cbe60f47ad41cb4b8746a684fca4d5a8f48a171 100644 (file)
--- a/dev/alpha_console.cc
+++ b/dev/alpha_console.cc
@@ -108,7 +108,8 @@ AlphaConsole::read(MemReqPtr &req, uint8_t *data)
     switch (req->size)
     {
         case sizeof(uint32_t):
-            DPRINTF(AlphaConsole, "read: offset=%#x val=%#x\n", daddr, *(uint32_t*)data);
+            DPRINTF(AlphaConsole, "read: offset=%#x val=%#x\n", daddr,
+                    *(uint32_t*)data);
             switch (daddr)
             {
                 case offsetof(AlphaAccess, last_offset):
@@ -133,7 +134,8 @@ AlphaConsole::read(MemReqPtr &req, uint8_t *data)
             }
             break;
         case sizeof(uint64_t):
-            DPRINTF(AlphaConsole, "read: offset=%#x val=%#x\n", daddr, *(uint64_t*)data);
+            DPRINTF(AlphaConsole, "read: offset=%#x val=%#x\n", daddr,
+                    *(uint64_t*)data);
             switch (daddr)
             {
                 case offsetof(AlphaAccess, inputChar):

diff --git a/sim/system.cc b/sim/system.cc
index a51cc03bf28fde8fabacbe0c73ec54e8ed9c11bc..3ac0fdce16b8196060f5e18a5d47ddde1da106a2 100644 (file)
--- a/sim/system.cc
+++ b/sim/system.cc
@@ -147,7 +147,7 @@ System::System(Params *p)
      * Set the hardware reset parameter block system type and revision
      * information to Tsunami.
      */
-    if (consoleSymtab->findAddress("xxm_rpb", addr)) {
+    if (consoleSymtab->findAddress("m5_rpb", addr)) {
         Addr paddr = vtophys(physmem, addr);
         char *hwrpb = (char *)physmem->dma_addr(paddr, sizeof(uint64_t));