diff options
| author | Andrew Schultz <alschult@umich.edu> | 2004-02-19 16:32:13 -0500 |
|---|---|---|
| committer | Andrew Schultz <alschult@umich.edu> | 2004-02-19 16:32:13 -0500 |
| commit | d4637757f855c14ebecfa7e4bea93c86143e5e45 (patch) | |
| tree | e9a038d4a7e0a1649068557f243bd3786cf8a277 /arch/alpha | |
| parent | e3fb3d1ad01aa08ab6631c3f77e6f105d5a736a6 (diff) | |
| download | gem5-d4637757f855c14ebecfa7e4bea93c86143e5e45.tar.xz | |
Remote an old hack that is now unnecessary
base/cprintf_formats.hh:
Add additional format modifiers
--HG--
extra : convert_revision : f9ec0a664eeb96db7dacacd6b7636e3cb47555e7
Diffstat (limited to 'arch/alpha')
| -rw-r--r-- | arch/alpha/vtophys.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/alpha/vtophys.cc b/arch/alpha/vtophys.cc index 784c4af7e..c5fe8df10 100644 --- a/arch/alpha/vtophys.cc +++ b/arch/alpha/vtophys.cc @@ -96,13 +96,13 @@ vtophys(ExecContext *xc, Addr vaddr) { Addr ptbr = xc->regs.ipr[AlphaISA::IPR_PALtemp20]; Addr paddr = 0; - if (PC_PAL(vaddr) || vaddr < 0x10000) { + if (PC_PAL(vaddr)) { paddr = vaddr & ~ULL(1); - } else if (!ptbr) { - paddr = vaddr; } else { if (vaddr >= ALPHA_K0SEG_BASE && vaddr <= ALPHA_K0SEG_END) { paddr = ALPHA_K0SEG_TO_PHYS(vaddr); + } else if (!ptbr) { + paddr = vaddr; } else { Addr pte = kernel_pte_lookup(xc->physmem, ptbr, vaddr); uint64_t entry = xc->physmem->phys_read_qword(pte); |