allow the use of old console code and update elf_object not to rely on EM_ALPHA value.

base/loader/elf_object.cc:
    EM_ALPHA value isn't official, so perhaps we shouldn't use it
dev/alpha_console.cc:
dev/alpha_console.hh:
    this change allows the use of old console code

--HG--
extra : convert_revision : cfacd64ae7fd2595158ca1a83ebcdb66ee7e119b

2 files changed, 6 insertions, 1 deletions

diff --git a/dev/alpha_console.cc b/dev/alpha_console.cc
index 86851ff8b..680704b30 100644
--- a/dev/alpha_console.cc
+++ b/dev/alpha_console.cc
@@ -122,7 +122,9 @@ AlphaConsole::read(MemReqPtr &req, uint8_t *data)
                     *(uint32_t*)data = alphaAccess->intrClockFrequency;
                     break;
                 default:
-                    panic("Unknown 32bit access, %#x\n", daddr);
+                    // Old console code read in everyting as a 32bit int
+                    *(uint32_t*)data = *(uint32_t*)(consoleData + daddr);
+
             }
             break;
         case sizeof(uint64_t):
diff --git a/dev/alpha_console.hh b/dev/alpha_console.hh
index 47afa8f4a..49c3a9f78 100644
--- a/dev/alpha_console.hh
+++ b/dev/alpha_console.hh
@@ -73,7 +73,10 @@ class SimpleDisk;
 class AlphaConsole : public PioDevice
 {
   protected:
+    union {
         AlphaAccess *alphaAccess;
+    uint8_t *consoleData;
+    };
 
     /** the disk must be accessed from the console */
     SimpleDisk *disk;