diff options
| author | Nathan Binkert <binkertn@umich.edu> | 2004-10-23 10:41:35 -0400 |
|---|---|---|
| committer | Nathan Binkert <binkertn@umich.edu> | 2004-10-23 10:41:35 -0400 |
| commit | 224acc2abccec14ab3846f1b3308e642ed094456 (patch) | |
| tree | d1637118879813f20f9ed202c8d93bec13914b24 /kern | |
| parent | 3ab83348d2baa56b41f4bd35c65bb0bcaa4fb035 (diff) | |
| download | gem5-224acc2abccec14ab3846f1b3308e642ed094456.tar.xz | |
get rid of pmap.h and make things variables and inline
functions instead of preprocessor macros.
arch/alpha/vtophys.cc:
use new constants, functions and structs to clean up the
vtophys code.
arch/alpha/vtophys.hh:
Clean up a little bit and make the protypes match new changes.
base/remote_gdb.cc:
dev/ide_disk.cc:
kern/tru64/tru64_events.cc:
use new constants from isa_traits.hh instead of ones from
old pmap.h
--HG--
extra : convert_revision : 5dce34e3b0c84ba72cefca34e5999b99898edcef
Diffstat (limited to 'kern')
| -rw-r--r-- | kern/tru64/tru64_events.cc | 7 |
1 files changed, 4 insertions, 3 deletions
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; |