Changeset 90924df in mainline for uspace/lib/c


Ignore:
Timestamp:
2012-04-08T12:08:49Z (13 years ago)
Author:
Vojtech Horky <vojtechhorky@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
f2b3d3e
Parents:
d9f53877 (diff), f3378ba (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:
2 edited

Legend:

Unmodified
Added
Removed

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

    rd9f53877 r90924df  
    11#
    2 # Copyright (c) 2007 Pavel Jancik
     2# Copyright (c) 2012 Martin Decky
    33# All rights reserved.
    44#
    … …  
    3131.global __aeabi_read_tp
    3232
     33.global __aeabi_idiv
     34.global __aeabi_uidiv
     35
     36.global __aeabi_idivmod
     37.global __aeabi_uidivmod
     38
     39.global __aeabi_ldivmod
     40.global __aeabi_uldivmod
     41
    3342__aeabi_read_tp:
    3443        mov r0, r9
    3544        mov pc, lr
     45
     46__aeabi_idiv:
     47        push {sp, lr}
     48        bl __divsi3
     49        ldr lr, [sp, #4]
     50        add sp, sp, #8
     51        bx lr
     52
     53__aeabi_uidiv:
     54        push {sp, lr}
     55        bl __udivsi3
     56        ldr lr, [sp, #4]
     57        add sp, sp, #8
     58        bx lr
     59
     60__aeabi_idivmod:
     61        sub sp, sp, #8
     62        push {sp, lr}
     63        bl __divmodsi3
     64        ldr lr, [sp, #4]
     65        add sp, sp, #8
     66        pop {r1, r2}
     67        bx lr
     68
     69__aeabi_uidivmod:
     70        sub sp, sp, #8
     71        push {sp, lr}
     72        bl __udivmodsi3
     73        ldr lr, [sp, #4]
     74        add sp, sp, #8
     75        pop {r1, r2}
     76        bx lr
     77
     78__aeabi_ldivmod:
     79        sub sp, sp, #8
     80        push {sp, lr}
     81        bl __divmoddi3
     82        ldr lr, [sp, #4]
     83        add sp, sp, #8
     84        pop {r2, r3}
     85        bx lr
     86
     87__aeabi_uldivmod:
     88        sub sp, sp, #8
     89        push {sp, lr}
     90        bl __udivmoddi3
     91        ldr lr, [sp, #4]
     92        add sp, sp, #8
     93        pop {r2, r3}
     94        bx lr

  • uspace/lib/c/generic/str.c

    rd9f53877 r90924df  
    4646#include <mem.h>
    4747#include <str.h>
     48
     49/** Check the condition if wchar_t is signed */
     50#ifdef WCHAR_IS_UNSIGNED
     51        #define WCHAR_SIGNED_CHECK(cond)  (true)
     52#else
     53        #define WCHAR_SIGNED_CHECK(cond)  (cond)
     54#endif
    4855
    4956/** Byte mask consisting of lowest @n bits (out of 8) */
    … …  
    399406bool ascii_check(wchar_t ch)
    400407{
    401         if ((ch >= 0) && (ch <= 127))
     408        if (WCHAR_SIGNED_CHECK(ch >= 0) && (ch <= 127))
    402409                return true;
    403410       
    … …  
    412419bool chr_check(wchar_t ch)
    413420{
    414         if ((ch >= 0) && (ch <= 1114111))
     421        if (WCHAR_SIGNED_CHECK(ch >= 0) && (ch <= 1114111))
    415422                return true;
    416423       
    … …  
    513520 * @param count Size of the destination buffer (must be > 0).
    514521 * @param src   Source string.
     522 *
    515523 */
    516524void str_cpy(char *dest, size_t size, const char *src)
    … …  
    545553 * @param src   Source string.
    546554 * @param n     Maximum number of bytes to read from @a src.
     555 *
    547556 */
    548557void str_ncpy(char *dest, size_t size, const char *src, size_t n)
Note: See TracChangeset for help on using the changeset viewer.