Fixed incorrect use of mvcle introduced by 2001-07-12 change.

[kopensolaris-gnu/glibc.git] / sysdeps / i386 / __longjmp.S

diff --git a/sysdeps/i386/__longjmp.S b/sysdeps/i386/__longjmp.S
index f6331d4..d3237da 100644 (file)
--- a/sysdeps/i386/__longjmp.S
+++ b/sysdeps/i386/__longjmp.S
@@ -1,29 +1,43 @@
 /* longjmp for i386.
-   Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1996, 1997, 1998, 2000 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    The GNU C Library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
+   Lesser General Public License for more details.
 
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
 
 #include <sysdep.h>
 #define _ASM
-#include <jmp_buf.h>
+#define _SETJMP_H
+#include <bits/setjmp.h>
+#include <asm-syntax.h>
+#include <bp-sym.h>
+#include <bp-asm.h>
 
-ENTRY (__longjmp)
-       movl 4(%esp), %ecx      /* User's jmp_buf in %ecx.  */
-       movl 8(%esp), %eax      /* Second argument is return value.  */
+#define PARMS  LINKAGE         /* no space for saved regs */
+#define JBUF   PARMS
+#define VAL    JBUF+PTR_SIZE
+
+ENTRY (BP_SYM (__longjmp))
+       ENTER
+
+       movl JBUF(%esp), %ecx   /* User's jmp_buf in %ecx.  */
+       CHECK_BOUNDS_BOTH_WIDE (%ecx, JBUF(%esp), $JB_SIZE)
+
+       movl VAL(%esp), %eax    /* Second argument is return value.  */
+       /* Save the return address now.  */
+       movl (JB_PC*4)(%ecx), %edx
        /* Restore registers.  */
        movl (JB_BX*4)(%ecx), %ebx
        movl (JB_SI*4)(%ecx), %esi
@@ -31,6 +45,5 @@ ENTRY (__longjmp)
        movl (JB_BP*4)(%ecx), %ebp
        movl (JB_SP*4)(%ecx), %esp
        /* Jump to saved PC.  */
-       movl (JB_PC*4)(%ecx), %ecx
-       jmp *%ecx
-END (__longjmp)
+       jmp *%edx
+END (BP_SYM (__longjmp))