fixed a bad merge from linux<->tru64
--HG-- extra : convert_revision : d7a5acd89a2bdc013c8a2bd022cc7048a3920f01
This commit is contained in:
parent
014f451d1f
commit
02dfbe92fc
|
@ -100,11 +100,11 @@ vtophys(ExecContext *xc, Addr vaddr)
|
|||
//so I put it back in. Perhaps something to do with gdb debugging?
|
||||
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);
|
||||
|
|
Loading…
Reference in a new issue