[src/netbsd-7]: src/sys/arch/sparc64/sparc64 Pull up following revision(s) (r...

[bouyer <bouyer%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/fb9be29c7536
branches:  netbsd-7
changeset: 799985:fb9be29c7536
user:      bouyer <bouyer%NetBSD.org@localhost>
date:      Sun Sep 25 12:13:39 2016 +0000

description:
Pull up following revision(s) (requested by nakayama in ticket #1257):
        sys/arch/sparc64/sparc64/locore.s: revision 1.401
Fix RAS for 32-bit kernels.  trapframe is always 64-bit.

diffstat:

 sys/arch/sparc64/sparc64/locore.s |  10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diffs (26 lines):

diff -r 3098305bb322 -r fb9be29c7536 sys/arch/sparc64/sparc64/locore.s
--- a/sys/arch/sparc64/sparc64/locore.s Sun Sep 25 12:11:33 2016 +0000
+++ b/sys/arch/sparc64/sparc64/locore.s Sun Sep 25 12:13:39 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: locore.s,v 1.369.2.3 2015/11/16 13:33:40 msaitoh Exp $ */
+/*     $NetBSD: locore.s,v 1.369.2.4 2016/09/25 12:13:39 bouyer Exp $  */
 
 /*
  * Copyright (c) 2006-2010 Matthew R. Green
@@ -5598,12 +5598,12 @@
        brz,pt  %o1, Lsw_noras          ! no, skip RAS check
         LDPTR  [%i1 + L_TF], %l3       ! pointer to trap frame
        call    _C_LABEL(ras_lookup)
-        LDPTR  [%l3 + TF_PC], %o1
+        ldx    [%l3 + TF_PC], %o1
        cmp     %o0, -1
-       be,pt   %xcc, Lsw_noras
+       be,pt   CCCR, Lsw_noras
         add    %o0, 4, %o1
-       STPTR   %o0, [%l3 + TF_PC]      ! store rewound %pc
-       STPTR   %o1, [%l3 + TF_NPC]     ! and %npc
+       stx     %o0, [%l3 + TF_PC]      ! store rewound %pc
+       stx     %o1, [%l3 + TF_NPC]     ! and %npc
 
 Lsw_noras: