aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2005-11-18 00:12:44 +0000
committerUlrich Drepper <drepper@redhat.com>2005-11-18 00:12:44 +0000
commit8f84d9310882598c62d529104f40757ce2e3ef83 (patch)
tree4faee5738e99d5d6da10b7ea44c070943d762899
parentc59b95ecd93c19ee66dbc3aa7d5ee7d60eae319b (diff)
downloadglibc-8f84d9310882598c62d529104f40757ce2e3ef83.tar
glibc-8f84d9310882598c62d529104f40757ce2e3ef83.tar.gz
glibc-8f84d9310882598c62d529104f40757ce2e3ef83.tar.bz2
glibc-8f84d9310882598c62d529104f40757ce2e3ef83.zip
[BZ #1877]
2005-11-17 Steven Munroe <sjmunroe@us.ibm.com> [BZ #1877] * string/test-strncmp.c (do_test_limit): Handle zero length and non-zero align values. (test_main): Correct do_test_limit tests for 64-bit. 2005-11-15 Steven Munroe <sjmunroe@us.ibm.com> * sysdeps/powerpc/sysdep.h (PPC_FEATURE_HAS_SPE, PPC_FEATURE_HAS_EFP_SINGLE, PPC_FEATURE_HAS_EFP_DOUBLE, PPC_FEATURE_NO_TB, PPC_FEATURE_POWER4, PPC_FEATURE_POWER5, PPC_FEATURE_POWER5_PLUS, PPC_FEATURE_CELL, PPC_FEATURE_970): Define to match 2.6.15 kernel. * sysdeps/powerpc/fpu/e_sqrt.c: Remove dl-procinfo.h include. * sysdeps/powerpc/fpu/e_sqrtf.c: Likewise. * sysdeps/powerpc/fpu/w_sqrtf.c: Likewise.
-rw-r--r--ChangeLog19
-rw-r--r--string/test-strncmp.c41
-rw-r--r--sysdeps/powerpc/sysdep.h9
3 files changed, 61 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index c066364496..5f2bab7102 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+2005-11-17 Steven Munroe <sjmunroe@us.ibm.com>
+
+ [BZ #1877]
+ * string/test-strncmp.c (do_test_limit): Handle zero length and
+ non-zero align values.
+ (test_main): Correct do_test_limit tests for 64-bit.
+
+2005-11-15 Steven Munroe <sjmunroe@us.ibm.com>
+
+ * sysdeps/powerpc/sysdep.h (PPC_FEATURE_HAS_SPE,
+ PPC_FEATURE_HAS_EFP_SINGLE, PPC_FEATURE_HAS_EFP_DOUBLE,
+ PPC_FEATURE_NO_TB, PPC_FEATURE_POWER4, PPC_FEATURE_POWER5,
+ PPC_FEATURE_POWER5_PLUS, PPC_FEATURE_CELL, PPC_FEATURE_970):
+ Define to match 2.6.15 kernel.
+
+ * sysdeps/powerpc/fpu/e_sqrt.c: Remove dl-procinfo.h include.
+ * sysdeps/powerpc/fpu/e_sqrtf.c: Likewise.
+ * sysdeps/powerpc/fpu/w_sqrtf.c: Likewise.
+
2005-11-17 Roland McGrath <roland@redhat.com>
* elf/elf.h (R_PPC64_ADDR30): Renamed to R_PPC64_REL30.
diff --git a/string/test-strncmp.c b/string/test-strncmp.c
index 4726f8744a..5adf0eb311 100644
--- a/string/test-strncmp.c
+++ b/string/test-strncmp.c
@@ -89,19 +89,38 @@ static void
do_test_limit (size_t align1, size_t align2, size_t len, size_t n, int max_char,
int exp_result)
{
- size_t i;
+ size_t i, align_n;
char *s1, *s2;
if (n == 0)
- return;
-
- align1 &= 7;
+ {
+ s1 = (char*)(buf1 + page_size);
+ s2 = (char*)(buf2 + page_size);
+ if (HP_TIMING_AVAIL)
+ printf ("Length %4zd/%4zd:", len, n);
+
+ FOR_EACH_IMPL (impl, 0)
+ do_one_test (impl, s1, s2, n, 0);
+
+ if (HP_TIMING_AVAIL)
+ putchar ('\n');
+
+ return;
+ }
- align2 &= 7;
+ align1 &= 15;
+ align2 &= 15;
+ align_n = (page_size - n) & 15;
s1 = (char*)(buf1 + page_size - n);
s2 = (char*)(buf2 + page_size - n);
-
+
+ if (align1 < align_n)
+ s1 -= (align_n - align1);
+
+ if (align2 < align_n)
+ s2 -= (align_n - align2);
+
for (i = 0; i < n; i++)
s1[i] = s2[i] = 1 + 23 * i % max_char;
@@ -311,8 +330,14 @@ test_main (void)
do_test (2 * i, i, 8 << i, 16 << i, 255, 0);
do_test (2 * i, i, 8 << i, 16 << i, 255, 1);
}
-
- for (i = 1; i < 8; ++i)
+
+ do_test_limit (0, 0, 0, 0, 127, 0);
+ do_test_limit (4, 0, 21, 20, 127, 0);
+ do_test_limit (0, 4, 21, 20, 127, 0);
+ do_test_limit (8, 0, 25, 24, 127, 0);
+ do_test_limit (0, 8, 25, 24, 127, 0);
+
+ for (i = 0; i < 8; ++i)
{
do_test_limit (0, 0, 17 - i, 16 - i, 127, 0);
do_test_limit (0, 0, 17 - i, 16 - i, 255, 0);
diff --git a/sysdeps/powerpc/sysdep.h b/sysdeps/powerpc/sysdep.h
index fb668ad51f..296231f655 100644
--- a/sysdeps/powerpc/sysdep.h
+++ b/sysdeps/powerpc/sysdep.h
@@ -29,6 +29,15 @@
#define PPC_FEATURE_HAS_MMU 0x04000000 /* Memory Management Unit. */
#define PPC_FEATURE_HAS_4xxMAC 0x02000000 /* 4xx Multiply Accumulator. */
#define PPC_FEATURE_UNIFIED_CACHE 0x01000000 /* Unified I/D cache. */
+#define PPC_FEATURE_HAS_SPE 0x00800000
+#define PPC_FEATURE_HAS_EFP_SINGLE 0x00400000
+#define PPC_FEATURE_HAS_EFP_DOUBLE 0x00200000
+#define PPC_FEATURE_NO_TB 0x00100000 /* 601/403gx have no timebase */
+#define PPC_FEATURE_POWER4 0x00080000 /* POWER4 microarch level */
+#define PPC_FEATURE_POWER5 0x00040000 /* POWER5 microarch level */
+#define PPC_FEATURE_POWER5_PLUS 0x00020000 /* POWER5+ microarch level */
+#define PPC_FEATURE_CELL 0x00010000 /* CELL PU microarch level */
+#define PPC_FEATURE_970 (PPC_FEATURE_POWER4 + PPC_FEATURE_HAS_ALTIVEC)
#ifdef __ASSEMBLER__