Module Name: src
Committed By: snj
Date: Sat Mar 3 20:47:24 UTC 2018
Modified Files:
src/sys/arch/sparc/sparc [netbsd-6]: locore.s
Log Message:
Pull up following revision(s) (requested by maya in ticket #1513):
sys/arch/sparc/sparc/locore.s: 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.
To generate a diff of this commit:
cvs rdiff -u -r1.265 -r1.265.8.1 src/sys/arch/sparc/sparc/locore.s
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/sparc/sparc/locore.s
diff -u src/sys/arch/sparc/sparc/locore.s:1.265 src/sys/arch/sparc/sparc/locore.s:1.265.8.1
--- src/sys/arch/sparc/sparc/locore.s:1.265 Mon Aug 15 02:19:44 2011
+++ src/sys/arch/sparc/sparc/locore.s Sat Mar 3 20:47:24 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.265 2011/08/15 02:19:44 mrg Exp $ */
+/* $NetBSD: locore.s,v 1.265.8.1 2018/03/03 20:47:24 snj Exp $ */
/*
* Copyright (c) 1996 Paul Kranenburg
@@ -6286,8 +6286,9 @@ ENTRY(longjmp)
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
