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

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

* libc/machine/arm/strcmp.c (strcmp): Treat char as unsigned.
This commit is contained in:
Jeff Johnston 2009-03-23 18:25:10 +00:00
parent 0e0f5748e0
commit 4d5112e2b1
2 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
newlib/ChangeLog
View File

@ -1,3 +1,7 @@
2009-03-23 Richard Earnshaw <rearnsha@arm.com>
* libc/machine/arm/strcmp.c (strcmp): Treat char as unsigned.
2009-03-23 Corinna Vinschen <corinna@vinschen.de> 2009-03-23 Corinna Vinschen <corinna@vinschen.de>
* libc/locale/locale.c (loadlocale): Fix typo in language and * libc/locale/locale.c (loadlocale): Fix typo in language and

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

@ -112,7 +112,26 @@ __attribute__((naked)) strcmp (const char* s1, const char* s2)
"it eq\n\t" "it eq\n\t"
SHFT2LSB"eq r3, r3, #8\n\t" SHFT2LSB"eq r3, r3, #8\n\t"
"beq 2b\n\t" "beq 2b\n\t"
"sub r0, r0, r3, "SHFT2MSB" #24\n\t" /* On a big-endian machine, r0 contains the desired byte in bits
0-7; on a little-endian machine they are in bits 24-31. In
both cases the other bits in r0 are all zero. For r3 the
interesting byte is at the other end of the word, but the
other bits are not necessarily zero. We need a signed result
representing the differnece in the unsigned bytes, so for the
little-endian case we can't just shift the interesting bits
up. */
#ifdef __ARMEB__
"sub r0, r0, r3, lsr #24\n\t"
#else
"and r3, r3, #255\n\t"
#ifdef __thumb2__
/* No RSB instruction in Thumb2 */
"lsr r0, r0, #24\n\t"
"sub r0, r0, r3\n\t"
#else
"rsb r0, r3, r0, lsr #24\n\t"
#endif
#endif
#ifndef __thumb2__ #ifndef __thumb2__
"ldr r4, [sp], #4\n\t" "ldr r4, [sp], #4\n\t"
#endif #endif