diff options
| -rw-r--r-- | base/intmath.hh | 4 | ||||
| -rw-r--r-- | dev/alpha_console.cc | 1 |
2 files changed, 4 insertions, 1 deletions
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(); |