diff options
| author | Ali Saidi <saidi@eecs.umich.edu> | 2004-07-08 00:28:02 -0400 |
|---|---|---|
| committer | Ali Saidi <saidi@eecs.umich.edu> | 2004-07-08 00:28:02 -0400 |
| commit | 02dfbe92fcbc016d176dca26c4d78706b9711099 (patch) | |
| tree | b244f149af7d2d4e11185c9c2d3e3303283ed74e /arch | |
| parent | 014f451d1fa63c4027b49c090441f2cd09269b0f (diff) | |
| download | gem5-02dfbe92fcbc016d176dca26c4d78706b9711099.tar.xz | |
fixed a bad merge from linux<->tru64
--HG--
extra : convert_revision : d7a5acd89a2bdc013c8a2bd022cc7048a3920f01
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/alpha/vtophys.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/alpha/vtophys.cc b/arch/alpha/vtophys.cc index f4b2c7ed3..464ed41e6 100644 --- a/arch/alpha/vtophys.cc +++ b/arch/alpha/vtophys.cc @@ -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); |