[PATCH] Hopefully last strncpy fix on IA-64

[PATCH] Hopefully last strncpy fix on IA-64

[Jakub Jelinek]

Hi!

test-strncpy segfaults without the strncpy.S patch and works with it.

2002-12-07  Kenneth W. Chen <kenneth.w.chen@intel.com>.

	* sysdeps/ia64/strncpy.S (strncpy): Clear ar.ec.  Fix .recovery4.

2002-12-07  Jakub Jelinek  <jakub@redhat.com>

	* string/test-strncpy.c (do_random_tests): Improve test coverage.

--- libc/string/test-strncpy.c.jj	2002-11-09 13:09:59.000000000 +0100
+++ libc/string/test-strncpy.c	2002-12-07 01:52:04.000000000 +0100
@@ -144,32 +144,57 @@ do_test (size_t align1, size_t align2, s
 static void
 do_random_tests (void)
 {
-  size_t i, j, n, align1, align2, len, size;
+  size_t i, j, n, align1, align2, len, size, mode;
   unsigned char *p1 = buf1 + page_size - 512;
   unsigned char *p2 = buf2 + page_size - 512;
   unsigned char *res;
 
   for (n = 0; n < ITERATIONS; n++)
     {
-      align1 = random () & 31;
-      if (random () & 1)
-	align2 = random () & 31;
-      else
-	align2 = align1 + (random () & 24);
-      len = random () & 511;
-      j = align1;
-      if (align2 > j)
-	j = align2;
-      if (random () & 1)
+      mode = random ();
+      if (mode & 1)
 	{
-	  size = random () & 511;
-	  if (size + align2 > 512)
-	    size = 512 - align2 - (random() & 31);
+	  size = random () & 255;
+	  align1 = 512 - size - (random () & 15);
+	  if (mode & 2)
+	    align2 = align1 - (random () & 24);
+	  else
+	    align2 = align1 - (random () & 31);
+	  if (mode & 4)
+	    {
+	      j = align1;
+	      align1 = align2;
+	      align2 = j;
+	    }
+	  if (mode & 8)
+	    len = size - (random () & 31);
+	  else
+	    len = 512;
+	  if (len >= 512)
+	    len = random () & 511;
 	}
       else
-	size = 512 - align2;
-      if (len + j >= 511)
-	len = 510 - j - (random () & 7);
+	{
+	  align1 = random () & 31;
+	  if (mode & 2)
+	    align2 = random () & 31;
+	  else
+	    align2 = align1 + (random () & 24);
+	  len = random () & 511;
+	  j = align1;
+	  if (align2 > j)
+	    j = align2;
+	  if (mode & 4)
+	    {
+	      size = random () & 511;
+	      if (size + j > 512)
+		size = 512 - j - (random() & 31);
+	    }
+	  else
+	    size = 512 - j;
+	  if ((mode & 8) && len + j >= 512)
+	    len = 512 - j - (random () & 7);
+	}
       j = len + align1 + 64;
       if (j > 512)
 	j = 512;
--- libc/sysdeps/ia64/strncpy.S.jj	2002-11-05 23:10:31.000000000 +0100
+++ libc/sysdeps/ia64/strncpy.S	2002-12-07 03:46:41.000000000 +0100
@@ -63,6 +63,8 @@ ENTRY(strncpy)
 	mov	saved_pr = pr           // save the predicate registers
 	.save ar.lc, saved_lc
 	mov 	saved_lc = ar.lc	// save the loop counter
+	mov	ar.ec = 0		// ec is not guaranteed to
+					// be zero upon function entry
 	.body
 	cmp.geu p6, p5 = 24, in2
 (p6)	br.cond.spnt .short_len
@@ -221,7 +223,9 @@ ENTRY(strncpy)
 	ld8	r[MEMLAT] = [tmp]
 	br.cond.sptk .back3
 .recovery4:
+	cmp.eq	p5, p6 = len, r0
 	add	tmp = -MEMLAT * 8, src ;;
-	ld8	r[MEMLAT - 1] = [tmp]
+(p6)	ld8	r[MEMLAT - 1] = [tmp]
+(p5)	mov	r[MEMLAT - 1] = r0
 	br.cond.sptk .back4
 END(strncpy)

	Jakub

Re: [PATCH] Hopefully last strncpy fix on IA-64

[Ulrich Drepper]

Jakub Jelinek wrote:
> Hi!
> 
> test-strncpy segfaults without the strncpy.S patch and works with it.

I've checked them in.  Thanks,

-- 
--------------.                        ,-.            444 Castro Street
Ulrich Drepper \    ,-----------------'   \ Mountain View, CA 94041 USA
Red Hat         `--' drepper at redhat.com `---------------------------