qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update. 

2000-04-04  Ulrich Drepper  <drepper@redhat.com>

	* iconv/skeleton.c (FUNCTION_NAME): Reorder initialization of
	unaligned so that it compiles for system which need unaligned
	access handling.
This commit is contained in:
Ulrich Drepper 2000-04-04 21:16:13 +00:00
parent 0b7219cc9d
commit 3aaad0b638
2 changed files with 29 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2000-04-04 Ulrich Drepper <drepper@redhat.com>
* iconv/skeleton.c (FUNCTION_NAME): Reorder initialization of
unaligned so that it compiles for system which need unaligned
access handling.
2000-04-04 Andreas Schwab <schwab@suse.de> 2000-04-04 Andreas Schwab <schwab@suse.de>
* elf/cache.c (print_entry): Only look at the type field when * elf/cache.c (print_entry): Only look at the type field when

27
iconv/skeleton.c
View File

@ -297,17 +297,32 @@ FUNCTION_NAME (struct __gconv_step *step, struct __gconv_step_data *data,
unsigned char *outbuf = data->__outbuf; unsigned char *outbuf = data->__outbuf;
unsigned char *outend = data->__outbufend; unsigned char *outend = data->__outbufend;
unsigned char *outstart; unsigned char *outstart;
/* This variable is used to count the number of characters we
actually converted. */
size_t converted = 0;
#if defined _STRING_ARCH_unaligned \ #if defined _STRING_ARCH_unaligned \
|| MIN_NEEDED_FROM == 1 || MAX_NEEDED_FROM % MIN_NEEDED_FROM != 0 \ || MIN_NEEDED_FROM == 1 || MAX_NEEDED_FROM % MIN_NEEDED_FROM != 0 \
|| MIN_NEEDED_TO == 1 || MAX_NEEDED_TO % MIN_NEEDED_TO != 0 || MIN_NEEDED_TO == 1 || MAX_NEEDED_TO % MIN_NEEDED_TO != 0
# define unaligned 0 # define unaligned 0
#else #else
int unaligned;
# define GEN_unaligned(name) GEN_unaligned2 (name)
# define GEN_unaligned2(name) name##_unaligned
#endif
#ifdef PREPARE_LOOP
PREPARE_LOOP
#endif
#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
/* The following assumes that encodings, which have a variable length /* The following assumes that encodings, which have a variable length
what might unalign a buffer even though it is a aligned in the what might unalign a buffer even though it is a aligned in the
beginning, either don't have the minimal number of bytes as a divisor beginning, either don't have the minimal number of bytes as a divisor
of the maximum length or have a minimum length of 1. This is true of the maximum length or have a minimum length of 1. This is true
for all known and supported encodings. */ for all known and supported encodings. */
int unaligned = ((FROM_DIRECTION unaligned = ((FROM_DIRECTION
&& ((uintptr_t) inptr % MIN_NEEDED_FROM != 0 && ((uintptr_t) inptr % MIN_NEEDED_FROM != 0
|| (data->__is_last || (data->__is_last
&& (uintptr_t) outbuf % MIN_NEEDED_TO != 0))) && (uintptr_t) outbuf % MIN_NEEDED_TO != 0)))
@ -315,16 +330,6 @@ FUNCTION_NAME (struct __gconv_step *step, struct __gconv_step_data *data,
&& ((data->__is_last && ((data->__is_last
&& (uintptr_t) outbuf % MIN_NEEDED_FROM != 0) && (uintptr_t) outbuf % MIN_NEEDED_FROM != 0)
|| (uintptr_t) inptr % MIN_NEEDED_TO != 0))); || (uintptr_t) inptr % MIN_NEEDED_TO != 0)));
# define GEN_unaligned(name) GEN_unaligned2 (name)
# define GEN_unaligned2(name) name##_unaligned
#endif
/* This variable is used to count the number of characters we
actually converted. */
size_t converted = 0;
#ifdef PREPARE_LOOP
PREPARE_LOOP
#endif #endif
do do