BSD 4_4 release

[unix-history] / usr / src / lib / libc / tahoe / gen / setjmp.s

diff --git a/usr/src/lib/libc/tahoe/gen/setjmp.s b/usr/src/lib/libc/tahoe/gen/setjmp.s
index c0b8814..dbae492 100644 (file)
--- a/usr/src/lib/libc/tahoe/gen/setjmp.s
+++ b/usr/src/lib/libc/tahoe/gen/setjmp.s
@@ -1,6 +1,42 @@
-#ifdef LIBC_SCCS
-       .asciz  "@(#)setjmp.s   1.1 (Berkeley/CCI) %G%"
-#endif LIBC_SCCS
+/*
+ * Copyright (c) 1988, 1993
+ *     The Regents of the University of California.  All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Computer Consoles Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+       .asciz "@(#)setjmp.s    8.1 (Berkeley) 6/4/93"
+#endif /* LIBC_SCCS and not lint */

 
 /*
  * C library -- setjmp, longjmp
 
 /*
  * C library -- setjmp, longjmp


@@ -11,31 +47,34 @@
  *     setjmp(a)
  * by restoring registers from the stack,
  * previous signal mask, and doing a return.
  *     setjmp(a)
  * by restoring registers from the stack,
  * previous signal mask, and doing a return.

- *
- * BUG: always restores onsigstack state to 0

  */
 
 #include "DEFS.h"
 
  */
 
 #include "DEFS.h"
 

-ENTRY(setjmp, 0)
+ENTRY(setjmp, R6)
+       movl    4(fp),r6                # construct sigcontext
+       movab   -8(sp),sp               # space for current struct sigstack
+       pushal  (sp)                    # get current values
+       pushl   $0                      # no new values
+       callf   $16,_sigstack           # pop args plus signal stack value
+       movl    (sp)+,(r6)              # save onsigstack status of caller

        pushl   $0
        callf   $8,_sigblock            # get signal mask
        pushl   $0
        callf   $8,_sigblock            # get signal mask

-       movl    r0,r1
-       movl    4(fp),r0
-       movl    (fp),(r0)               # save frame pointer of caller
-       movl    -8(fp),4(r0)            # save pc of caller
-       movl    r1,8(r0)                # save signal mask
-       clrl    12(r0)                  # XXX (should be onsigstack) XXX
+       movl    r0,4(r6)                # save signal mask of caller
+       addl3   $8,fp,8(r6)             # save stack pointer of caller
+       movl    (fp),12(r6)             # save frame pointer of caller
+       movl    -8(fp),20(r6)           # save pc of caller
+       movpsl  24(r6)                  # save psl of caller

        clrl    r0
        ret
 
 ENTRY(longjmp, 0)
        movl    8(fp),r0                # return(v)
        movl    4(fp),r1                # fetch buffer
        clrl    r0
        ret
 
 ENTRY(longjmp, 0)
        movl    8(fp),r0                # return(v)
        movl    4(fp),r1                # fetch buffer

-       tstl    (r1)
+       tstl    12(r1)

        beql    botch
 loop:
        beql    botch
 loop:

-       cmpl    (r1),(fp)
+       cmpl    12(r1),(fp)

        beql    done
        blssu   botch
        movl    $loop,-8(fp)
        beql    done
        blssu   botch
        movl    $loop,-8(fp)


@@ -53,12 +92,9 @@ done:
 3:
        addl2   $8,sp                   # compensate for PSL-PC push
 4:
 3:
        addl2   $8,sp                   # compensate for PSL-PC push
 4:

-       pushal  (sp)                    # old stack pointer
-       pushl   8(r1)                   # old signal mask
-       pushl   12(r1)                  # old onsigstack
-       pushal  (sp)                    # pointer to sigcontext
-       kcall   $139                    # restore previous signal context
-       jmp     *4(r1)                  # done, return....
+       pushl   r1                      # pointer to sigcontext
+       callf   $4,_sigreturn           # restore previous context
+                                       # we should never return

 
 botch:
        callf   $4,_longjmperror
 
 botch:
        callf   $4,_longjmperror