From 4799a7b87439913765029117eb51fcacd6f07edb Mon Sep 17 00:00:00 2001
From: Ali Saidi <saidi@eecs.umich.edu>
Date: Wed, 23 Jun 2004 18:39:11 -0400
Subject: [PATCH] minor changes to endian code so that it runs on x86 linux

base/intmath.hh:
    only need FloorLog2(size_t) on a mac, so ifdefed for this
dev/alpha_console.cc:
    Actually allocate the alphaAccess struct.

--HG--
extra : convert_revision : 1f50b1a025c8ee728a9f3d2c603ea38347234f54
---
 base/intmath.hh      | 4 +++-
 dev/alpha_console.cc | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/base/intmath.hh b/base/intmath.hh
index fc28eecef..821514668 100644
--- a/base/intmath.hh
+++ b/base/intmath.hh
@@ -119,7 +119,8 @@ FloorLog2(int64_t x)
     return FloorLog2((uint64_t)x);
 }
 
-inline int
+#if defined(__APPLE__)
+int
 FloorLog2(size_t x)
 {
     assert(x > 0);
@@ -132,6 +133,7 @@ FloorLog2(size_t x)
         return FloorLog2((uint64_t)x);
 
 }
+#endif
 
 template <class T>
 inline int
diff --git a/dev/alpha_console.cc b/dev/alpha_console.cc
index 5c4858ee5..e94ca82ea 100644
--- a/dev/alpha_console.cc
+++ b/dev/alpha_console.cc
@@ -69,6 +69,7 @@ AlphaConsole::AlphaConsole(const string &name, SimConsole *cons, SimpleDisk *d,
         pioInterface->addAddrRange(addr, addr + size);
     }
 
+    alphaAccess = new AlphaAccess;
     alphaAccess->last_offset = size - 1;
     alphaAccess->kernStart = system->getKernelStart();
     alphaAccess->kernEnd = system->getKernelEnd();