Libc-763.13.tar.gz

[apple/libc.git] / ppc / sys / longjmp.s

diff --git a/ppc/sys/longjmp.s b/ppc/sys/longjmp.s
index 34f554e7369dbc5597eef52e555a70a8e239bebf..44ef49591bc63f20f0617475bf985531fc7a749c 100644 (file)
--- a/ppc/sys/longjmp.s
+++ b/ppc/sys/longjmp.s
@@ -3,8 +3,6 @@
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
- * 
  * This file contains Original Code and/or Modifications of Original Code
  * as defined in and that are subject to the Apple Public Source License
  * Version 2.0 (the 'License'). You may not use this file except in
@@ -43,7 +41,6 @@
  */
 #include <architecture/ppc/mode_independent_asm.h>
 
-#include "SYS.h"
 #include "_setjmp.h"
 
 /*
@@ -55,6 +52,8 @@
 MI_ENTRY_POINT(_siglongjmp)
        lg      r0, JMP_SIGFLAG(r3)     ; load sigflag saved by siglongjmp()
        cmpgi   cr1,r0,0                        ; this changes cr1 which is volatile
+       mr      r30, r3             ; preserve args across _sigsetmask
+       mr      r31, r4
        beq--   cr1, L__exit        ; if r0 == 0 do _longjmp()
        ; else *** fall through *** to longjmp()
 
@@ -62,14 +61,23 @@ MI_ENTRY_POINT(_siglongjmp)
 
 MI_ENTRY_POINT(_longjmp)
        mr      r30, r3             ; preserve args across _sigsetmask
-       mr      r31, r4
-    
+       mr      r31, r4
+
     /* NB: this code assumes the signal mask is an int.  Change the "lwz" below
      * if not. The JMP_sig field is already 8 bytes in the jmpbuf.
      */
        lwz     r3, JMP_sig(r3)         ; restore the signal mask
        MI_CALL_EXTERNAL(_sigsetmask)   // make a (deprecated!) syscall to set the mask
-       mr      r4, r31
+L__exit:       
+       lwz             r3,JMP_ss_flags(r30)
+       MI_CALL_EXTERNAL(__sigunaltstack)
+L__exit2:
        mr      r3, r30
-L__exit:
+       mr      r4, r31
        MI_BRANCH_EXTERNAL(__longjmp)
+
+
+
+
+
+