[src/trunk]: src/sys/arch/sparc/sparc Avoid an instruction requiring a higher...

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

details:   https://anonhg.NetBSD.org/src/rev/d92a684ea921
branches:  trunk
changeset: 828044:d92a684ea921
user:      maya <maya%NetBSD.org@localhost>
date:      Sat Nov 25 04:11:37 2017 +0000

description:
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 2c7e8737ad47 -r d92a684ea921 sys/arch/sparc/sparc/locore.s
--- a/sys/arch/sparc/sparc/locore.s     Sat Nov 25 02:37:04 2017 +0000
+++ b/sys/arch/sparc/sparc/locore.s     Sat Nov 25 04:11:37 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: locore.s,v 1.268 2012/11/04 00:32:47 chs Exp $ */
+/*     $NetBSD: locore.s,v 1.269 2017/11/25 04:11:37 maya 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