Changeset 85f2064 in mainline for uspace/lib/c

Timestamp:

2012-04-12T14:21:46Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

bb8f69d

Parents:

751cabc (diff), d11a181 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

Location:

uspace/lib/c

Files:

• arch/arm32/Makefile.common (modified) (1 diff)
• arch/arm32/src/eabi.S (modified) (2 diffs)
• generic/str.c (modified) (5 diffs)

uspace/lib/c/arch/arm32/Makefile.common

@@ -28 +28 @@
 #
 
-GCC_CFLAGS += -ffixed-r9 -mtp=soft -mapcs-frame -fno-omit-frame-pointer
+GCC_CFLAGS += -ffixed-r9 -mtp=soft -fno-omit-frame-pointer -march=armv4
 
 ENDIANESS = LE

uspace/lib/c/arch/arm32/src/eabi.S

@@ -1 +1 @@
 #
-# Copyright (c) 2007 Pavel Jancik
+# Copyright (c) 2012 Martin Decky
 # All rights reserved.
 #
@@ -31 +31 @@
 .global __aeabi_read_tp
 
+.global __aeabi_idiv
+.global __aeabi_uidiv
+
+.global __aeabi_idivmod
+.global __aeabi_uidivmod
+
+.global __aeabi_ldivmod
+.global __aeabi_uldivmod
+
 __aeabi_read_tp:
         mov r0, r9
         mov pc, lr
+
+__aeabi_idiv:
+        push {lr}
+        bl __divsi3
+        pop {lr}
+        mov pc, lr
+
+__aeabi_uidiv:
+        push {lr}
+        bl __udivsi3
+        pop {lr}
+        mov pc, lr
+
+__aeabi_idivmod:
+        push {lr}
+        sub sp, sp, #12
+        add r2, sp, #4
+        bl __udivmodsi3
+        ldr r1, [sp, #4]
+        add sp, sp, #12
+        pop {lr}
+        mov pc, lr
+
+__aeabi_uidivmod:
+        push {lr}
+        sub sp, sp, #12
+        add r2, sp, #4
+        bl __udivmodsi3
+        ldr r1, [sp, #4]
+        add sp, sp, #12
+        pop {lr}
+        mov pc, lr
+
+__aeabi_ldivmod:
+        push {lr}
+        sub sp, sp, #24
+        push {sp}
+        bl __divmoddi3
+        add sp, sp, #4
+        pop {r2, r3}
+        add sp, sp, #16
+        pop {lr}
+        mov pc, lr
+
+__aeabi_uldivmod:
+        push {lr}
+        sub sp, sp, #24
+        push {sp}
+        bl __udivmoddi3
+        add sp, sp, #4
+        pop {r2, r3}
+        add sp, sp, #16
+        pop {lr}
+        mov pc, lr

uspace/lib/c/generic/str.c

@@ -46 +46 @@
 #include <mem.h>
 #include <str.h>
+
+/** Check the condition if wchar_t is signed */
+#ifdef WCHAR_IS_UNSIGNED
+        #define WCHAR_SIGNED_CHECK(cond)  (true)
+#else
+        #define WCHAR_SIGNED_CHECK(cond)  (cond)
+#endif
 
 /** Byte mask consisting of lowest @n bits (out of 8) */
@@ -399 +406 @@
 bool ascii_check(wchar_t ch)
 {
-        if ((ch >= 0) && (ch <= 127))
+        if (WCHAR_SIGNED_CHECK(ch >= 0) && (ch <= 127))
                 return true;
         
@@ -412 +419 @@
 bool chr_check(wchar_t ch)
 {
-        if ((ch >= 0) && (ch <= 1114111))
+        if (WCHAR_SIGNED_CHECK(ch >= 0) && (ch <= 1114111))
                 return true;
         
@@ -513 +520 @@
  * @param count Size of the destination buffer (must be > 0).
  * @param src   Source string.
+ *
  */
 void str_cpy(char *dest, size_t size, const char *src)
@@ -545 +553 @@
  * @param src   Source string.
  * @param n     Maximum number of bytes to read from @a src.
+ *
  */
 void str_ncpy(char *dest, size_t size, const char *src, size_t n)