Changeset 829

Timestamp:

Oct 11, 2003, 7:46:06 PM (22 years ago)

Author:

bird

Message:

Corrected sigsetjmp and siglongjmp.

Location:

trunk/src/emx

Files:

• include/386/setjmp.h (added)
• include/machine/setjmp.h (added)
• include/setjmp.h (modified) (1 diff, 1 prop)
• src/lib/libc.def (modified) (1 diff, 1 prop)
• src/lib/misc/386/sigsetjm.s (modified) (4 diffs, 1 prop)

trunk/src/emx/include/setjmp.h

@@ -1 @@
-/* setjmp.h (emx+gcc) */
+/*-
+ * Copyright (c) 1990, 1993
+ *      The Regents of the University of California.  All rights reserved.
+ * (c) UNIX System Laboratories, Inc.
+ * All or some portions of this file are derived from material licensed
+ * to the University of California by American Telephone and Telegraph
+ * Co. or Unix System Laboratories, Inc. and are reproduced herein with
+ * the permission of UNIX System Laboratories, 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.
+ *
+ *      @(#)setjmp.h    8.2 (Berkeley) 1/21/94
+ * $FreeBSD: src/include/setjmp.h,v 1.8 2002/10/05 05:48:50 mike Exp $
+ */
 
-#ifndef _SETJMP_H
-#define _SETJMP_H
+/** @file
+ * FreeBSD 5.1
+ * @changed bird: @todo'ed the functions LIBC doesn't implement.
+ */
 
-#if defined (__cplusplus)
-extern "C" {
+#ifndef _SETJMP_H_
+#define _SETJMP_H_
+
+#include <sys/cdefs.h>
+
+/* The size of the jmp_buf is machine dependent: */
+#include <machine/setjmp.h>
+
+__BEGIN_DECLS
+#if __BSD_VISIBLE || __POSIX_VISIBLE >= 200112 || __XSI_VISIBLE
+void    _longjmp(jmp_buf, int) __dead2;
+int     _setjmp(jmp_buf);
 #endif
+void    longjmp(jmp_buf, int) __dead2;
+#if __BSD_VISIBLE
+/** @todo void  longjmperror(void); */
+#endif
+int     setjmp(jmp_buf);
+#if __BSD_VISIBLE || __POSIX_VISIBLE || __XSI_VISIBLE
+void    siglongjmp(sigjmp_buf, int) __dead2;
+int     sigsetjmp(sigjmp_buf, int);
+#endif
+__END_DECLS
 
-/* ANSI X3.159-1989 */
-
-typedef int jmp_buf[12];
-
-int setjmp (jmp_buf);
-void longjmp (jmp_buf, int) __attribute__ ((__noreturn__));
-
-
-#if !defined (__STRICT_ANSI__)
-
-/* POSIX.1 */
-
-typedef int sigjmp_buf[14];
-
-int sigsetjmp (sigjmp_buf, int);
-void siglongjmp (sigjmp_buf, int) __attribute__ ((__noreturn__));
-
-#endif
-
-
-#if defined (__cplusplus)
-}
-#endif
-
-#endif /* not _SETJMP_H */
+#endif /* !_SETJMP_H_ */

trunk/src/emx/src/lib/libc.def

@@ -642 +642 @@
     "__sfnlwr" @662
     "_sig_info" @663
-    "__siglongjmp" @664
+    "__std_siglongjmp" @664
     "___signbit" @665
     "___signbitf" @666
     "___signbitl" @667
-    "__sigsetjmp" @668
+    "__std_sigsetjmp" @668
     "__sleep2" @669
     "___small_atod" @670

trunk/src/emx/src/lib/misc/386/sigsetjm.s

@@ -3 +3 @@
 #include <emx/asm386.h>
 
-        .globl __sigsetjmp, __siglongjmp
+        .globl _STD(sigsetjmp), _STD(siglongjmp)
 
         .text
@@ -20 +20 @@
 / Words at offsets 28..44 are reserved
 
-/ int _sigsetjmp (sigjmp_buf here, int savemask)
+/ int sigsetjmp (sigjmp_buf here, int savemask)
 
-__sigsetjmp:
+_STD(sigsetjmp):
         PROFILE_NOFRAME
         movl    1*4(%esp), %edx         /* here */
@@ -46 +46 @@
         addl    $12, %esp
 1:      xorl    %eax, %eax
-        EPILOGUE(_sigsetjmp)
+        EPILOGUE(_STD(sigsetjmp))
 
         ALIGN
 
-/ void _siglongjmp (sigjmp_buf there, int n)
+/ void siglongjmp (sigjmp_buf there, int n)
 
-__siglongjmp:
+_STD(siglongjmp):
         PROFILE_NOFRAME
         movl    1*4(%esp), %eax         /* there */
@@ -79 +79 @@
         movl    J_EIP(%edx), %edx
         movl    %edx, 0*4(%esp)         /* return address */
-        EPILOGUE(_siglongjmp)           /* well, ... */
+        EPILOGUE(_STD(siglongjmp))      /* well, ... */