[src/netbsd-7-1]: src/sys/arch/sparc/sparc Pull up following revision(s) (req...

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

details:   https://anonhg.NetBSD.org/src/rev/ab116af2a548
branches:  netbsd-7-1
changeset: 800828:ab116af2a548
user:      snj <snj%NetBSD.org@localhost>
date:      Wed Jan 03 20:06:04 2018 +0000

description:
Pull up following revision(s) (requested by maya in ticket #1530):
        sys/arch/sparc/sparc/locore.s: revision 1.269
Avoid an instruction requiring a higher alignment than we are guaranteed
Fixes PR port-sparc/52721: ddb errors on ps command
Thanks to mlelstv.

diffstat:

 sys/arch/sparc/sparc/locore.s |  7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diffs (21 lines):

diff -r d043c53c67d1 -r ab116af2a548 sys/arch/sparc/sparc/locore.s
--- a/sys/arch/sparc/sparc/locore.s     Wed Jan 03 19:58:12 2018 +0000
+++ b/sys/arch/sparc/sparc/locore.s     Wed Jan 03 20:06:04 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: locore.s,v 1.268 2012/11/04 00:32:47 chs Exp $ */
+/*     $NetBSD: locore.s,v 1.268.24.1 2018/01/03 20:06:04 snj Exp $    */
 
 /*
  * Copyright (c) 1996 Paul Kranenburg
@@ -6288,8 +6288,9 @@
        cmp     %fp, %g7        ! compare against desired frame
        bl,a    1b              ! if below,
         restore                !    pop frame and loop
-       be,a    2f              ! if there,
-        ldd    [%g1+0], %o2    !    fetch return %sp and pc, and get out
+       ld      [%g1+0], %o2    ! fetch return %sp
+       be,a    2f              ! we're there, get out
+        ld     [%g1+4], %o3    ! fetch return pc
 
 Llongjmpbotch:
                                ! otherwise, went too far; bomb out