summaryrefslogtreecommitdiff
path: root/base
diff options
context:
space:
mode:
authorNathan Binkert <binkertn@umich.edu>2004-10-23 10:41:35 -0400
committerNathan Binkert <binkertn@umich.edu>2004-10-23 10:41:35 -0400
commit224acc2abccec14ab3846f1b3308e642ed094456 (patch)
treed1637118879813f20f9ed202c8d93bec13914b24 /base
parent3ab83348d2baa56b41f4bd35c65bb0bcaa4fb035 (diff)
downloadgem5-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 'base')
-rw-r--r--base/remote_gdb.cc15
1 files changed, 7 insertions, 8 deletions
diff --git a/base/remote_gdb.cc b/base/remote_gdb.cc
index 41f11005d..598f03c35 100644
--- a/base/remote_gdb.cc
+++ b/base/remote_gdb.cc
@@ -326,14 +326,13 @@ bool
RemoteGDB::acc(Addr va, size_t len)
{
Addr last_va;
- Addr pte;
- va = alpha_trunc_page(va);
- last_va = alpha_round_page(va + len);
+ va = TheISA::TruncPage(va);
+ last_va = TheISA::RoundPage(va + len);
do {
- if (va >= ALPHA_K0SEG_BASE && va < ALPHA_K1SEG_BASE) {
- if (va < (ALPHA_K0SEG_BASE + pmem->size())) {
+ if (TheISA::IsK0Seg(va)) {
+ if (va < (TheISA::K0SegBase + pmem->size())) {
DPRINTF(GDBAcc, "acc: Mapping is valid K0SEG <= "
"%#x < K0SEG + size\n", va);
return true;
@@ -355,12 +354,12 @@ RemoteGDB::acc(Addr va, size_t len)
return true;
Addr ptbr = context->regs.ipr[AlphaISA::IPR_PALtemp20];
- pte = kernel_pte_lookup(pmem, ptbr, va);
- if (!pte || !entry_valid(pmem->phys_read_qword(pte))) {
+ TheISA::PageTableEntry pte = kernel_pte_lookup(pmem, ptbr, va);
+ if (!pte.valid()) {
DPRINTF(GDBAcc, "acc: %#x pte is invalid\n", va);
return false;
}
- va += ALPHA_PGBYTES;
+ va += TheISA::PageBytes;
} while (va < last_va);
DPRINTF(GDBAcc, "acc: %#x mapping is valid\n", va);