summaryrefslogtreecommitdiff
path: root/kern
diff options
context:
space:
mode:
authorNathan Binkert <binkertn@umich.edu>2003-10-14 18:04:20 -0400
committerNathan Binkert <binkertn@umich.edu>2003-10-14 18:04:20 -0400
commitf8d850195bfb57650faa519764229d85445c2274 (patch)
tree60832bad14b4066ea6b6712e4aee99787c807a67 /kern
parent638a07d15a149b48c854b58e2b3f4df097aa5e2e (diff)
downloadgem5-f8d850195bfb57650faa519764229d85445c2274.tar.xz
try to get everything to compile correctly again
base/intmath.hh: Don't return -1 in FloorLog2. That's wierd. Assert instead. If you care about this, you should check for zero yourself. Create seprate versions for uint32_t, uint64_t, int32_t, and int64_t. signed vs unsigned so that error checking can be done correctly. 32 vs 64 for speed. Finally, fix a little bug in CeilLog2 that will make it return the correct result for 1. kern/tru64/tru64_events.cc: fix #includes --HG-- extra : convert_revision : c47915fc417fdc194a5561949a5366ffb266e693
Diffstat (limited to 'kern')
-rw-r--r--kern/tru64/tru64_events.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/kern/tru64/tru64_events.cc b/kern/tru64/tru64_events.cc
index ac25129e6..3717fd9a2 100644
--- a/kern/tru64/tru64_events.cc
+++ b/kern/tru64/tru64_events.cc
@@ -27,8 +27,9 @@
*/
#include "cpu/exec_context.hh"
+#include "cpu/base_cpu.hh"
#include "cpu/full_cpu/bpred.hh"
-#include "cpu/full_cpu/cpu.hh"
+#include "cpu/full_cpu/full_cpu.hh"
#include "kern/tru64/dump_mbuf.hh"
#include "kern/tru64/printf.hh"
#include "kern/tru64/tru64_events.hh"