From dcedf26597875d979195b4cfcb5e8b722d08251c Mon Sep 17 00:00:00 2001 From: Jake Burkholder Date: Mon, 23 Dec 2002 02:18:45 +0000 Subject: [PATCH] - Fix a bug where the faulting address for an mmu miss could sometimes be clobbered due to some debug code. This was harmless and just superfluous soft faults. - Update some comments. --- sys/sparc64/sparc64/exception.S | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/sparc64/sparc64/exception.S b/sys/sparc64/sparc64/exception.S index cc8cba95f58b..fa0f64047582 100644 --- a/sys/sparc64/sparc64/exception.S +++ b/sys/sparc64/sparc64/exception.S @@ -1334,7 +1334,7 @@ END(tl1_immu_miss_trap) /* * Extract the context from the contents of the tag access register. * If its non-zero this is a fault on a user address. Note that the - * faulting address is passed in %g2. + * faulting address is passed in %g1. */ sllx %g5, 64 - TAR_VPN_SHIFT, %g6 brnz,a,pn %g6, tl1_dmmu_miss_user @@ -1430,10 +1430,10 @@ ENTRY(tl1_dmmu_miss_trap) */ wrpr %g0, PSTATE_ALT, %pstate - KSTACK_CHECK - ldxa [%g0 + AA_DMMU_TAR] %asi, %g2 + KSTACK_CHECK + tl1_split clr %o1 set trap, %o2 @@ -1524,8 +1524,8 @@ ENTRY(tl1_dmmu_prot_1) /* * Extract the context from the contents of the tag access register. - * If its non-zero this is a fault on a user address, otherwise get - * the virtual page number. + * If its non-zero this is a fault on a user address. Note that the + * faulting address is passed in %g1. */ sllx %g5, 64 - TAR_VPN_SHIFT, %g6 brnz,a,pn %g6, tl1_dmmu_prot_user