[uClibc-cvs] svn commit: trunk/uClibc/libc/sysdeps/linux/i386

vapier at uclibc.org vapier at uclibc.org
Thu Aug 11 22:36:11 UTC 2005


Author: vapier
Date: 2005-08-11 16:36:11 -0600 (Thu, 11 Aug 2005)
New Revision: 11114

Log:
jump straight to __syscall_error

Modified:
   trunk/uClibc/libc/sysdeps/linux/i386/clone.S
   trunk/uClibc/libc/sysdeps/linux/i386/mmap64.S
   trunk/uClibc/libc/sysdeps/linux/i386/syscall.S
   trunk/uClibc/libc/sysdeps/linux/i386/vfork.S


Changeset:
Modified: trunk/uClibc/libc/sysdeps/linux/i386/clone.S
===================================================================
--- trunk/uClibc/libc/sysdeps/linux/i386/clone.S	2005-08-11 22:05:06 UTC (rev 11113)
+++ trunk/uClibc/libc/sysdeps/linux/i386/clone.S	2005-08-11 22:36:11 UTC (rev 11114)
@@ -51,19 +51,19 @@
 	/* no NULL function pointers */
 	movl	FUNC(%esp),%ecx
 #ifdef __PIC__
-	jecxz	__error
+	jecxz	__syscall_error
 #else
 	testl	%ecx,%ecx
-	jz	__error
+	jz	__syscall_error
 #endif
 
 	/* no NULL stack pointers */
 	movl	STACK(%esp),%ecx
 #ifdef __PIC__
-	jecxz	__error
+	jecxz	__syscall_error
 #else
 	testl	%ecx,%ecx
-	jz	__error
+	jz	__syscall_error
 #endif
 
 	/* Insert the argument onto the new stack.  Make sure the new
@@ -96,7 +96,7 @@
 	popl	%ebx
 
 	test	%eax,%eax
-	jl	__error
+	jl	__syscall_error
 	jz	.Lthread_start
 	ret
 
@@ -114,9 +114,6 @@
 	movl	$__NR_exit, %eax
 	int	$0x80
 
-__error:
-	jmp	__syscall_error
-
 .size __clone,.-__clone
 
 .weak clone

Modified: trunk/uClibc/libc/sysdeps/linux/i386/mmap64.S
===================================================================
--- trunk/uClibc/libc/sysdeps/linux/i386/mmap64.S	2005-08-11 22:05:06 UTC (rev 11113)
+++ trunk/uClibc/libc/sysdeps/linux/i386/mmap64.S	2005-08-11 22:36:11 UTC (rev 11114)
@@ -76,7 +76,7 @@
 
 	/* If 0 > %eax > -4096 there was an error.  */
 	cmpl $-4095,%eax
-	ja __error
+	ja __syscall_error
 	/* Successful; return the syscall's value.  */
 	ret
 
@@ -89,9 +89,6 @@
 	movl $-EINVAL, %eax
 	jmp __error
 
-__error:
-	jmp	__syscall_error
-
 .size mmap64,.-mmap64
 
 #endif

Modified: trunk/uClibc/libc/sysdeps/linux/i386/syscall.S
===================================================================
--- trunk/uClibc/libc/sysdeps/linux/i386/syscall.S	2005-08-11 22:05:06 UTC (rev 11113)
+++ trunk/uClibc/libc/sysdeps/linux/i386/syscall.S	2005-08-11 22:36:11 UTC (rev 11114)
@@ -45,10 +45,7 @@
 	popl %ebp
 
 	cmpl $-4095,%eax
-	jae  __error
+	jae  __syscall_error
 	ret			/* Return to caller.  */
 
-__error:
-	jmp	__syscall_error
-
 .size syscall,.-syscall

Modified: trunk/uClibc/libc/sysdeps/linux/i386/vfork.S
===================================================================
--- trunk/uClibc/libc/sysdeps/linux/i386/vfork.S	2005-08-11 22:05:06 UTC (rev 11113)
+++ trunk/uClibc/libc/sysdeps/linux/i386/vfork.S	2005-08-11 22:36:11 UTC (rev 11114)
@@ -23,12 +23,9 @@
 	int $0x80
 	pushl %ecx
 	cmpl $-4095,%eax
-	jae __error
+	jae __syscall_error
 	ret
 
-__error:
-	jmp	__syscall_error
-
 .size __vfork,.-__vfork
 
 




More information about the uClibc-cvs mailing list