diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2000-03-31 20:44:49 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2000-03-31 20:44:49 +0000 |
| commit | c1db8b0ddfc46134b903ff3803e9aea1cf9e55d9 (patch) | |
| tree | 50b3b9edf1a415620103612f06d75c07a46eeb5c /iconv/skeleton.c | |
| parent | c0c2af07991283edd947c5a11df162ccb486e74a (diff) | |
| download | glibc-c1db8b0ddfc46134b903ff3803e9aea1cf9e55d9.tar.gz | |
Update.
* iconv/skeleton.c: Define access macros with u suffix. Adjust
#if expression for use of unaligned function to the one used in
the definition of these functions.
* iconv/gconv_simple.c (internal_ucs4_loop_unaligned): New function.
(internal_ucs4le_loop_unaligned): New function.
Ralf Baechle <ralf@uni-koblenz.de>
Diffstat (limited to 'iconv/skeleton.c')
| -rw-r--r-- | iconv/skeleton.c | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/iconv/skeleton.c b/iconv/skeleton.c index 9554aac2f5..a7709eaca0 100644 --- a/iconv/skeleton.c +++ b/iconv/skeleton.c @@ -122,30 +122,30 @@ static int to_object; loops we have other definitions which allow optimized access. */ #ifdef _STRING_ARCH_unaligned /* We can handle unaligned memory access. */ -# define get16(addr) *((uint16_t *) (addr)) -# define get32(addr) *((uint32_t *) (addr)) +# define get16u(addr) *((uint16_t *) (addr)) +# define get32u(addr) *((uint32_t *) (addr)) /* We need no special support for writing values either. */ -# define put16(addr, val) *((uint16_t *) (addr)) = (val) -# define put32(addr, val) *((uint32_t *) (addr)) = (val) +# define put16u(addr, val) *((uint16_t *) (addr)) = (val) +# define put32u(addr, val) *((uint32_t *) (addr)) = (val) #else /* Distinguish between big endian and little endian. */ # if __BYTE_ORDER == __LITTLE_ENDIAN -# define get16(addr) \ +# define get16u(addr) \ (((__const unsigned char *) (addr))[1] << 8 \ | ((__const unsigned char *) (addr))[0]) -# define get32(addr) \ +# define get32u(addr) \ (((((__const unsigned char *) (addr))[3] << 8 \ | ((__const unsigned char *) (addr))[2]) << 8 \ | ((__const unsigned char *) (addr))[1]) << 8 \ | ((__const unsigned char *) (addr))[0]) -# define put16(addr, val) \ +# define put16u(addr, val) \ ({ uint16_t __val = (val); \ ((unsigned char *) (addr))[0] = __val; \ ((unsigned char *) (addr))[1] = __val >> 8; \ (void) 0; }) -# define put32(addr, val) \ +# define put32u(addr, val) \ ({ uint32_t __val = (val); \ ((unsigned char *) (addr))[0] = __val; \ __val >>= 8; \ @@ -156,21 +156,21 @@ static int to_object; ((unsigned char *) (addr))[3] = __val; \ (void) 0; }) # else -# define get16(addr) \ +# define get16u(addr) \ (((__const unsigned char *) (addr))[0] << 8 \ | ((__const unsigned char *) (addr))[1]) -# define get32(addr) \ +# define get32u(addr) \ (((((__const unsigned char *) (addr))[0] << 8 \ | ((__const unsigned char *) (addr))[1]) << 8 \ | ((__const unsigned char *) (addr))[2]) << 8 \ | ((__const unsigned char *) (addr))[3]) -# define put16(addr, val) \ +# define put16u(addr, val) \ ({ uint16_t __val = (val); \ ((unsigned char *) (addr))[1] = __val; \ ((unsigned char *) (addr))[2] = __val >> 8; \ (void) 0; }) -# define put32(addr, val) \ +# define put32u(addr, val) \ ({ uint32_t __val = (val); \ ((unsigned char *) (addr))[3] = __val; \ __val >>= 8; \ @@ -351,7 +351,9 @@ FUNCTION_NAME (struct __gconv_step *step, struct __gconv_step_data *data, data->__statep, step->__data, &converted EXTRA_LOOP_ARGS); } -#ifndef _STRING_ARCH_unaligned +#if !defined _STRING_ARCH_unaligned \ + && MIN_NEEDED_FROM != 1 && MAX_NEEDED_FROM % MIN_NEEDED_FROM == 0 \ + && MIN_NEEDED_TO != 1 && MAX_NEEDED_TO % MIN_NEEDED_TO == 0 else { if (FROM_DIRECTION) |