JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

2009-03-25 Richard Earnshaw <rearnsha@arm.com>

Browse Source 
* libc/machine/arm/strcmp.c (strcmp_unaligned): Correctly
        detect the nul-byte in a big-endian string.
This commit is contained in:
Jeff Johnston 2009-03-25 18:56:15 +00:00
parent 0b211e340f
commit baea11cd6a
2 changed files with 33 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
newlib/ChangeLog
View File

@ -1,3 +1,8 @@
2009-03-25 Richard Earnshaw <rearnsha@arm.com>
* libc/machine/arm/strcmp.c (strcmp_unaligned): Correctly
detect the nul-byte in a big-endian string.
2009-03-25 Jeff Johnston <jjohnstn@redhat.com> 2009-03-25 Jeff Johnston <jjohnstn@redhat.com>
* libc/string/wcsdup.c: Fix documentation error. * libc/string/wcsdup.c: Fix documentation error.

34
newlib/libc/machine/arm/strcmp.c
View File

@ -192,6 +192,7 @@ strcmp_unaligned(const char* s1, const char* s2)
} \ } \
if (__builtin_expect(((w1 - b1) & ~w1) & (b1 << 7), 0)) \ if (__builtin_expect(((w1 - b1) & ~w1) & (b1 << 7), 0)) \
{ \ { \
/* See comment in assembler below re syndrome on big-endian */\
if ((((w1 - b1) & ~w1) & (b1 << 7)) & mask) \ if ((((w1 - b1) & ~w1) & (b1 << 7)) & mask) \
w2 RSHIFT= shift; \ w2 RSHIFT= shift; \
else \ else \
@ -319,12 +320,22 @@ strcmp_unaligned(const char* s1, const char* s2)
"b 8f\n" "b 8f\n"
"5:\n\t" "5:\n\t"
"bics r3, r3, #"MSB"\n\t" #ifdef __ARMEB__
/* The syndrome value may contain false ones if the string ends
with the bytes 0x01 0x00 */
"tst w1, #0xff000000\n\t"
"itt ne\n\t"
"tstne w1, #0x00ff0000\n\t"
"tstne w1, #0x0000ff00\n\t"
"beq 7f\n\t"
#else
"bics r3, r3, #0xff000000\n\t"
"bne 7f\n\t" "bne 7f\n\t"
#endif
"ldrb w2, [wp2]\n\t" "ldrb w2, [wp2]\n\t"
SHFT2LSB" t1, w1, #24\n\t" SHFT2LSB" t1, w1, #24\n\t"
#ifdef __ARMEB__ #ifdef __ARMEB__
SHFT2LSB" w2, w2, #24\n\t" "lsl w2, w2, #24\n\t"
#endif #endif
"b 8f\n" "b 8f\n"
@ -353,12 +364,21 @@ strcmp_unaligned(const char* s1, const char* s2)
"b 2b\n" "b 2b\n"
"5:\n\t" "5:\n\t"
SHFT2MSB"s r3, r3, #16\n\t" #ifdef __ARMEB__
/* The syndrome value may contain false ones if the string ends
with the bytes 0x01 0x00 */
"tst w1, #0xff000000\n\t"
"it ne\n\t"
"tstne w1, #0x00ff0000\n\t"
"beq 7f\n\t"
#else
"lsls r3, r3, #16\n\t"
"bne 7f\n\t" "bne 7f\n\t"
#endif
"ldrh w2, [wp2]\n\t" "ldrh w2, [wp2]\n\t"
SHFT2LSB" t1, w1, #16\n\t" SHFT2LSB" t1, w1, #16\n\t"
#ifdef __ARMEB__ #ifdef __ARMEB__
SHFT2LSB" w2, w2, #16\n\t" "lsl w2, w2, #16\n\t"
#endif #endif
"b 8f\n" "b 8f\n"
@ -390,8 +410,10 @@ strcmp_unaligned(const char* s1, const char* s2)
SHFT2LSB" w2, w2, #24\n\t" SHFT2LSB" w2, w2, #24\n\t"
"b 8f\n" "b 8f\n"
"5:\n\t" "5:\n\t"
"tst r3, #128\n\t" /* The syndrome value may contain false ones if the string ends
"bne 7f\n\t" with the bytes 0x01 0x00 */
"tst w1, #"LSB"\n\t"
"beq 7f\n\t"
"ldr w2, [wp2], #4\n" "ldr w2, [wp2], #4\n"
"6:\n\t" "6:\n\t"
SHFT2LSB" t1, w1, #8\n\t" SHFT2LSB" t1, w1, #8\n\t"