From: Ali Saidi <saidi@eecs.umich.edu>
Date: Thu, 8 Jul 2004 04:28:02 +0000 (-0400)
Subject: fixed a bad merge from linux<->tru64
X-Git-Tag: m5_1.0_tutorial~265
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=02dfbe92fcbc016d176dca26c4d78706b9711099;p=gem5.git

fixed a bad merge from linux<->tru64

--HG--
extra : convert_revision : d7a5acd89a2bdc013c8a2bd022cc7048a3920f01
---

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);