[src/netbsd-1-5]: src/lib/libc/arch/sparc64/gen Pull up revision 1.5 (approve...

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

details:   https://anonhg.NetBSD.org/src/rev/72245637b2f1
branches:  netbsd-1-5
changeset: 489381:72245637b2f1
user:      eeh <eeh%NetBSD.org@localhost>
date:      Mon Sep 04 21:36:34 2000 +0000

description:
Pull up revision 1.5 (approved by thorpej):

        date: 2000/08/28 00:45:59;  author: eeh;  state: Exp;  lines: +7 -7
        Fix layout of fields in jmp_buf.  [N.B. we could make JMP_BUFLEN 9 if we want.]

diffstat:

 lib/libc/arch/sparc64/gen/sigsetjmp.S |  14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diffs (47 lines):

diff -r d63b55c642e1 -r 72245637b2f1 lib/libc/arch/sparc64/gen/sigsetjmp.S
--- a/lib/libc/arch/sparc64/gen/sigsetjmp.S     Mon Sep 04 21:34:17 2000 +0000
+++ b/lib/libc/arch/sparc64/gen/sigsetjmp.S     Mon Sep 04 21:36:34 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sigsetjmp.S,v 1.2.10.1 2000/07/26 23:55:00 mycroft Exp $       */
+/*     $NetBSD: sigsetjmp.S,v 1.2.10.2 2000/09/04 21:36:34 eeh Exp $   */
 /*
  * Copyright (c) 1995 Paul Kranenburg
  * All rights reserved.
@@ -39,17 +39,17 @@
        set     _C_LABEL(setjmp), %o2   ! if (%o1 != 0) goto _setjmp;
        set     _C_LABEL(_setjmp), %o3  ! else goto __setjmp;
        movrnz  %o1, %o2, %o3
-       ldx [%g1+%o2], %g1
+       ldx [%g1+%o3], %g1
        jmp %g1
-        st     %o1,[%o0+0x38]          ! jmpbuf[JBLEN]
+        st     %o1,[%o0+0x48]          ! jmpbuf[JBLEN]
 
 
 ENTRY(siglongjmp)
        PIC_PROLOGUE(%g1,%o2)           ! %g1 = _GLOBAL_OFFSET_TABLE
-       ld      [%o0 + 0x38],%o2        ! jmpbuf[JBLEN]
+       ld      [%o0 + 0x48],%o2        ! jmpbuf[JBLEN]
        set     _C_LABEL(longjmp), %o3  ! if (%o2 != 0) goto _longjmp;
        set     _C_LABEL(_longjmp), %o4 ! else goto __longjmp;
-       movrz   %o2, %o3, %o4 
+       movrnz  %o2, %o3, %o4 
        ldx     [%g1 + %o4], %g1
        jmp %g1
         nop
@@ -59,13 +59,13 @@
 
 ENTRY(sigsetjmp)
        brz,pt  %o1,_C_LABEL(_setjmp)
-        st     %o1,[%o0+0x38]          ! jmpbuf[JBLEN]
+        st     %o1,[%o0+0x48]          ! jmpbuf[JBLEN]
        ba,a,pt %icc,_C_LABEL(setjmp)
         nop                            ! spitfire bug
        unimp 0
 
 ENTRY(siglongjmp)
-       ld      [%o0 + 0x38], %g1
+       ld      [%o0 + 0x48], %g1
        brz,pt  %g1, _C_LABEL(_longjmp)
         nop
        ba,a,pt %icc, _C_LABEL(longjmp)