diff options
| author | Steve Reinhardt <stever@eecs.umich.edu> | 2004-10-24 23:06:35 -0400 |
|---|---|---|
| committer | Steve Reinhardt <stever@eecs.umich.edu> | 2004-10-24 23:06:35 -0400 |
| commit | 400daa7e41057ec358691afeffe35ffa430d11b0 (patch) | |
| tree | 06eaf8242206a12eb7a14281c7d112984c02ac89 /kern | |
| parent | 7c58c38e668ff4057820f8c6ee8cd8169b934051 (diff) | |
| parent | 6ac0d27b7dc130397b6ba9b11e593706c2f669fe (diff) | |
| download | gem5-400daa7e41057ec358691afeffe35ffa430d11b0.tar.xz | |
Merge zizzer.eecs.umich.edu:/z/m5/Bitkeeper/m5
into zizzer.eecs.umich.edu:/z/stever/bk/m5
--HG--
extra : convert_revision : aac76a4b82b3455620618bba6238507248cc68cc
Diffstat (limited to 'kern')
| -rw-r--r-- | kern/linux/aligned.hh | 8 | ||||
| -rw-r--r-- | kern/linux/hwrpb.hh | 6 | ||||
| -rw-r--r-- | kern/tru64/tru64_events.cc | 7 |
3 files changed, 11 insertions, 10 deletions
diff --git a/kern/linux/aligned.hh b/kern/linux/aligned.hh index 55035c6e4..042f0ad2c 100644 --- a/kern/linux/aligned.hh +++ b/kern/linux/aligned.hh @@ -1,7 +1,7 @@ -#ifndef __ALIGNED_HH__ -#define __ALIGNED_HH__ +#ifndef __KERN_LINUX_ALIGNED_HH__ +#define __KERN_LINUX_ALIGNED_HH__ -#include <stdint.h> +#include "sim/host.hh" #include "targetarch/isa_traits.hh" /* GCC 3.3.X has a bug in which attributes+typedefs don't work. 3.2.X is fine @@ -18,4 +18,4 @@ typedef Addr Addr_a __attribute__ ((aligned (8))) ; #define Addr_a Addr __attribute__ ((aligned (8))) #endif /* __GNUC__ __GNUC_MINOR__ */ -#endif /* __ALIGNED_H__ */ +#endif /* __KERN_LINUX_ALIGNED_HH__ */ diff --git a/kern/linux/hwrpb.hh b/kern/linux/hwrpb.hh index 3ce03efd7..16544f196 100644 --- a/kern/linux/hwrpb.hh +++ b/kern/linux/hwrpb.hh @@ -1,5 +1,5 @@ -#ifndef __ALPHA_HWRPB_H__ -#define __ALPHA_HWRPB_H__ +#ifndef __KERN_LINUX_HWRPB_HH__ +#define __KERN_LINUX_HWRPB_HH__ #include "kern/linux/aligned.hh" @@ -15,4 +15,4 @@ namespace Linux { uint64_ta res1, res2; }; } -#endif /* __ALPHA_HWRPB_H */ +#endif // __KERN_LINUX_HWRPB_HH__ diff --git a/kern/tru64/tru64_events.cc b/kern/tru64/tru64_events.cc index fb9d43a0e..a322060d8 100644 --- a/kern/tru64/tru64_events.cc +++ b/kern/tru64/tru64_events.cc @@ -32,8 +32,9 @@ #include "kern/tru64/tru64_events.hh" #include "kern/tru64/dump_mbuf.hh" #include "kern/tru64/printf.hh" -#include "targetarch/arguments.hh" #include "mem/functional_mem/memory_control.hh" +#include "targetarch/arguments.hh" +#include "targetarch/isa_traits.hh" //void SkipFuncEvent::process(ExecContext *xc); @@ -46,8 +47,8 @@ BadAddrEvent::process(ExecContext *xc) uint64_t a0 = xc->regs.intRegFile[ArgumentReg0]; - if (a0 < ALPHA_K0SEG_BASE || a0 >= ALPHA_K1SEG_BASE || - xc->memctrl->badaddr(ALPHA_K0SEG_TO_PHYS(a0) & PA_IMPL_MASK)) { + if (!TheISA::IsK0Seg(a0) || + xc->memctrl->badaddr(TheISA::K0Seg2Phys(a0) & PA_IMPL_MASK)) { DPRINTF(BADADDR, "badaddr arg=%#x bad\n", a0); xc->regs.intRegFile[ReturnValueReg] = 0x1; |