This is the mail archive of the libc-hacker@sourceware.org mailing list for the glibc project.

Note that libc-hacker is a closed list. You may look at the archives of this list, but subscription and posting are not open.

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[PATCH] SH: Fix a few bugs

Hi,

The appended patch fixes a few embarrassing bug in SH port.
sysdeps/sh/bsd-*setjmp.S uses wrong register for 2nd argument
for __sigsetjmp call.  sysdeps/unix/sysv/linux/sh/clone.S did
a wrong sanity check when the first argument is zero.

BTW, sysdeps/unix/sysv/linux/tst-clone.c tests only that
clone fails with the null stack pointer argument.  Should we
add a check for the null child function pointer argument?

Regards,
	kaz
--
2007-07-06  Kaz Kojima  <kkojima@rr.iij4u.or.jp>

	* sysdeps/sh/bsd-setjmp.S (setjmp): Use correct argument registers.
	* sysdeps/sh/bsd-_setjmp.S (_setjmp): Likewise.
	* sysdeps/unix/sysv/linux/sh/clone.S (__clone): Do correct sanity
	check for the first argument.

diff -uprN ORIG/libc/sysdeps/sh/bsd-setjmp.S LOCAL/libc/sysdeps/sh/bsd-setjmp.S
--- ORIG/libc/sysdeps/sh/bsd-setjmp.S	2001-07-06 13:56:03.000000000 +0900
+++ LOCAL/libc/sysdeps/sh/bsd-setjmp.S	2007-07-06 08:48:14.000000000 +0900
@@ -1,5 +1,5 @@
 /* BSD `setjmp' entry point to `sigsetjmp (..., 1)'.  SH version.
-   Copyright (C) 1999, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000, 2007 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
@@ -36,14 +36,14 @@ ENTRY (setjmp)
 	mov.l	3f, r1
 	mov.l	@(r0,r1), r1
 	jmp	@r1
-	 mov	#1, r0
+	 mov	#1, r5
 	.align	2
 3:
 	.long	C_SYMBOL_NAME(__sigsetjmp@GOT)
 #else
 	mov.l	1f, r1
 	jmp	@r1
-	 mov	#1, r0
+	 mov	#1, r5
 	.align	2
 1:
 	.long	C_SYMBOL_NAME(__sigsetjmp)
diff -uprN ORIG/libc/sysdeps/sh/bsd-_setjmp.S LOCAL/libc/sysdeps/sh/bsd-_setjmp.S
--- ORIG/libc/sysdeps/sh/bsd-_setjmp.S	2003-01-01 05:37:25.000000000 +0900
+++ LOCAL/libc/sysdeps/sh/bsd-_setjmp.S	2007-07-06 08:48:13.000000000 +0900
@@ -1,5 +1,5 @@
 /* BSD `_setjmp' entry point to `sigsetjmp (..., 0)'.  SH version.
-   Copyright (C) 1999, 2000, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000, 2002, 2007 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
@@ -36,14 +36,14 @@ ENTRY (_setjmp)
 	mov.l	3f, r1
 	mov.l	@(r0,r1), r1
 	jmp	@r1
-	 mov	#0, r0
+	 mov	#0, r5
 	.align	2
 3:
 	.long	C_SYMBOL_NAME(__sigsetjmp@GOT)
 #else
 	mov.l	1f, r1
 	jmp	@r1
-	 mov	#0, r0
+	 mov	#0, r5
 	.align	2
 1:
 	.long	C_SYMBOL_NAME(__sigsetjmp)

diff -uprN ORIG/libc/sysdeps/unix/sysv/linux/sh/clone.S LOCAL/libc/sysdeps/unix/sysv/linux/sh/clone.S
--- ORIG/libc/sysdeps/unix/sysv/linux/sh/clone.S	2004-12-08 04:37:51.000000000 +0900
+++ LOCAL/libc/sysdeps/unix/sysv/linux/sh/clone.S	2007-07-06 08:59:15.000000000 +0900
@@ -1,4 +1,4 @@
-/* Copyright (C) 1999, 2000, 2003, 2004 Free Software Foundation, Inc.
+/* Copyright (C) 1999, 2000, 2003, 2004, 2007 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
@@ -32,12 +32,12 @@
 ENTRY(__clone)
 	/* sanity check arguments.  */
 	tst	r4, r4
-	bf/s	1f
+	bt/s	0f
 	 tst	r5, r5
-	bf/s	1f
-	 mov	#-EINVAL,r0
+	bf	1f
+0:
 	bra	.Lsyscall_error
-	 nop
+	 mov	#-EINVAL,r0
 1:
 	/* insert the args onto the new stack */
 	mov.l	r7, @-r5
Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]