+2000-03-28 Ulrich Drepper <drepper@redhat.com>
+
+ * iconvdata/TESTS: Use UCS-2BE instead of UCS2.
+
+ * iconv/loop.c: Define get16, get32, put16, and put32 macros to
+ allow as well reading from/writing to unaligned addresses on machines
+ which don't support this in hardware. Use FCTNAME macro to define
+ function name. Include the file a second time for platforms which
+ need special unaligned handling.
+ * iconv/skeleton.c: Define get16u, get32u, put16u, and put32u macros
+ to access potentially unaligned addresses. These macros are intended
+ to be used only outside the loops.
+ (unaligned): New definition. In case the machine can handle unaligned
+ access define as zero. Otherwise as a variable which is initialized
+ as nonzero in case the buffer passed in at runtime is unaligned with
+ respect to the character set encoding involved.
+ Call aligned or unaligned looop functions according to unaligned
+ variable.
+ * iconvdata/8bit-gap.c: Use get16, get32, put16, and put32 instead
+ of direct casting pointer to potentially handle unaligned memory
+ accesses.
+ * iconvdata/8bit-generic.c: Likewise.
+ * iconvdata/ansi_x3.110.c: Likewise.
+ * iconvdata/big5.c: Likewise.
+ * iconvdata/euc-cn.c: Likewise.
+ * iconvdata/euc-jp.c: Likewise.
+ * iconvdata/euc-kr.c: Likewise.
+ * iconvdata/euc-tw.c: Likewise.
+ * iconvdata/gbk.c: Likewise.
+ * iconvdata/iso-2022-cn.c: Likewise.
+ * iconvdata/iso-2022-jp.c: Likewise.
+ * iconvdata/iso-2022-kr.c: Likewise.
+ * iconvdata/iso646.c: Likewise.
+ * iconvdata/iso_6937-2.c: Likewise.
+ * iconvdata/iso_6937.c: Likewise.
+ * iconvdata/johab.c: Likewise.
+ * iconvdata/sjis.c: Likewise.
+ * iconvdata/t.61.c: Likewise.
+ * iconvdata/uhc.c: Likewise.
+ * iconvdata/unicode.c: Likewise.
+ * iconvdata/utf-16.c: Likewise.
+
+ * locale/programs/simple-hash.c: Little optimizations. Remove K&R
+ prototypes.
+
+ * malloc/Versions [libc] (GLIBC_2.2): Add mcheck_check_all.
+ * malloc/mcheck.c (mcheck_check_all): Renamed from check_all and made
+ public.
+ * malloc/mcheck.h (mcheck_check_all): Declare.
+
+ * stdio-common/Makefile (tests): Add tst-obprintf.
+
2000-03-28 Roland McGrath <roland@baalperazim.frob.com>
* sysdeps/generic/bits/sigthread.h: Clean up conditionals.
#endif
+/* Define macros which can access unaligned buffers. These macros are
+ supposed to be used only in code outside the inner loops. For the inner
+ 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))
+
+/* 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)
+#else
+/* Distinguish between big endian and little endian. */
+# if __BYTE_ORDER == __LITTLE_ENDIAN
+# define get16(addr) \
+ (((__const unsigned char *) (addr))[1] << 8 \
+ | ((__const unsigned char *) (addr))[0])
+# define get32(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) \
+ ({ uint16_t __val = (val); \
+ ((__const unsigned char *) (addr))[0] = __val; \
+ ((__const unsigned char *) (addr))[1] = __val >> 8; \
+ (void) 0; })
+# define put32(addr, val) \
+ ({ uint16_t __val = (val); \
+ ((__const unsigned char *) (addr))[0] = __val; \
+ __val >>= 8; \
+ ((__const unsigned char *) (addr))[1] = __val; \
+ __val >>= 8; \
+ ((__const unsigned char *) (addr))[2] = __val; \
+ __val >>= 8; \
+ ((__const unsigned char *) (addr))[3] = __val; \
+ (void) 0; })
+# else
+# define get16(addr) \
+ (((__const unsigned char *) (addr))[0] << 8 \
+ | ((__const unsigned char *) (addr))[1])
+# define get32(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) \
+ ({ uint16_t __val = (val); \
+ ((__const unsigned char *) (addr))[1] = __val; \
+ ((__const unsigned char *) (addr))[2] = __val >> 8; \
+ (void) 0; })
+# define put32(addr, val) \
+ ({ uint16_t __val = (val); \
+ ((__const unsigned char *) (addr))[3] = __val; \
+ __val >>= 8; \
+ ((__const unsigned char *) (addr))[2] = __val; \
+ __val >>= 8; \
+ ((__const unsigned char *) (addr))[1] = __val; \
+ __val >>= 8; \
+ ((__const unsigned char *) (addr))[0] = __val; \
+ (void) 0; })
+# endif
+#endif
+
+
/* For conversions from a fixed width character sets to another fixed width
character set we we can define RESET_INPUT_BUFFER is necessary. */
#if !defined RESET_INPUT_BUFFER && !defined SAVE_RESET_STATE
unsigned char *outbuf = data->__outbuf;
unsigned char *outend = data->__outbufend;
unsigned char *outstart;
+#ifdef _STRING_ARCH_unaligned
+# define unaligned 0
+#else
+ /* The following assumes that encodings, which have a variable length
+ 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
+ of the maximum length or have a minimum length of 1. This is true
+ for all known and supported encodings. */
+ int unaligned;
+
+ unaligned = ((FROM_DIRECTION
+ && ((MIN_NEEDED_FROM > 1
+ && MAX_NEEDED_FROM % MIN_NEEDED_FROM == 0
+ && (uintptr_t) inptr % MIN_NEEDED_FROM != 0)
+ || (MIN_NEEDED_TO > 1
+ && MAX_NEEDED_TO % MIN_NEEDED_TO == 0
+ && (uintptr_t) outbuf % MIN_NEEDED_TO != 0)))
+ || (!FROM_DIRECTION
+ && ((MIN_NEEDED_FROM > 1
+ && MAX_NEEDED_FROM % MIN_NEEDED_FROM == 0
+ && (uintptr_t) outbuf % MIN_NEEDED_FROM != 0)
+ || (MIN_NEEDED_TO > 1
+ && MAX_NEEDED_TO % 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. */
SAVE_RESET_STATE (1);
#endif
- if (FROM_DIRECTION)
- /* Run the conversion loop. */
- status = FROM_LOOP (inbuf, inbufend, &outbuf, outend,
- data->__statep, step->__data, &converted
- EXTRA_LOOP_ARGS);
+ if (!unaligned)
+ {
+ if (FROM_DIRECTION)
+ /* Run the conversion loop. */
+ status = FROM_LOOP (inbuf, inbufend, &outbuf, outend,
+ data->__statep, step->__data, &converted
+ EXTRA_LOOP_ARGS);
+ else
+ /* Run the conversion loop. */
+ status = TO_LOOP (inbuf, inbufend, &outbuf, outend,
+ data->__statep, step->__data, &converted
+ EXTRA_LOOP_ARGS);
+ }
+#ifndef _STRING_ARCH_unaligned
else
- /* Run the conversion loop. */
- status = TO_LOOP (inbuf, inbufend, &outbuf, outend,
- data->__statep, step->__data, &converted
- EXTRA_LOOP_ARGS);
+ {
+ if (FROM_DIRECTION)
+ /* Run the conversion loop. */
+ status = GEN_unaligned (FROM_LOOP) (inbuf, inbufend, &outbuf,
+ outend, data->__statep,
+ step->__data, &converted
+ EXTRA_LOOP_ARGS);
+ else
+ /* Run the conversion loop. */
+ status = GEN_unaligned (TO_LOOP) (inbuf, inbufend, &outbuf,
+ outend, data->__statep,
+ step->__data, &converted
+ EXTRA_LOOP_ARGS);
+ }
+#endif
/* We finished one use of the loops. */
++data->__invocation_counter;
/* Generic conversion to and from 8bit charsets,
converting from UCS using gaps.
- Copyright (C) 1997, 1998, 1999 Free Software Foundation, Inc.
+ Copyright (C) 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
break; \
} \
\
- *((uint32_t *) outptr)++ = ch; \
+ put32 (outptr, ch); \
+ outptr += 4; \
++inptr; \
}
#include <iconv/loop.c>
#define BODY \
{ \
const struct gap *rp = from_idx; \
- uint32_t ch = *((uint32_t *) inptr); \
+ uint32_t ch = get32 (inptr); \
unsigned char res; \
\
if (ch >= 0xffff) \
/* Generic conversion to and from 8bit charsets.
- Copyright (C) 1997, 1998, 1999 Free Software Foundation, Inc.
+ Copyright (C) 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
break; \
} \
\
- *((uint32_t *) outptr)++ = ch; \
+ put32 (outptr, ch); \
+ outptr += 4; \
++inptr; \
}
#include <iconv/loop.c>
#define LOOPFCT TO_LOOP
#define BODY \
{ \
- uint32_t ch = *((uint32_t *) inptr); \
+ uint32_t ch = get32 (inptr); \
\
if (ch >= sizeof (from_ucs4) / sizeof (from_ucs4[0]) \
|| (ch != 0 && from_ucs4[ch] == '\0')) \
# Available tests for iconv(1) (and therefore iconv(3)) in GNU libc.
-# Copyright (C) 1998, 1999 Free Software Foundation, Inc.
+# Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
# This file is part of the GNU C Library.
# Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
#
ISO-8859-7 ISO-8859-7 Y UTF8
ISO-8859-8 ISO-8859-8 Y UTF8
ISO-8859-9 ISO-8859-9 Y UTF8
-ISO-8859-10 ISO-8859-10 Y UCS2 UTF8
+ISO-8859-10 ISO-8859-10 Y UCS-2BE UTF8
ISO-8859-14 ISO-8859-14 Y UTF8
ISO-8859-15 ISO-8859-15 Y UTF8
ANSI_X3.4-1968 ANSI_X3.4-1968 Y UTF8
BS_4730 BS_4730 Y UTF8
-CSA_Z243.4-1985-1 CSA_Z243.4-1985-1 Y UCS2
+CSA_Z243.4-1985-1 CSA_Z243.4-1985-1 Y UCS-2BE
CSA_Z243.4-1985-2 CSA_Z243.4-1985-2 Y UCS4
DIN_66003 DIN_66003 Y UTF8
DS_2089 DS_2089 Y UTF8
/* Generic conversion to and from ANSI_X3.110-1983.
- Copyright (C) 1998, 1999 Free Software Foundation, Inc.
+ Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
} \
\
inptr += incr; \
- *((uint32_t *) outptr)++ = ch; \
+ put32 (outptr, ch); \
+ outptr += 4; \
}
#include <iconv/loop.c>
#define BODY \
{ \
char tmp[2]; \
- uint32_t ch = *((uint32_t *) inptr); \
+ uint32_t ch = get32 (inptr); \
const char *cp; \
\
if (ch >= sizeof (from_ucs4) / sizeof (from_ucs4[0])) \
/* Mapping tables for Big5 handling.
- Copyright (C) 1997, 1998, 1999 Free Software Foundation, Inc.
+ Copyright (C) 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
else \
++inptr; \
\
- *((uint32_t *) outptr)++ = ch; \
+ putr32 (outptr, ch); \
+ outptr += 4; \
}
#include <iconv/loop.c>
#define LOOPFCT TO_LOOP
#define BODY \
{ \
- uint32_t ch = *((uint32_t *) inptr); \
+ uint32_t ch = get32 (inptr); \
char buf[2]; \
const char *cp; \
\
/* Mapping tables for EUC-CN handling.
- Copyright (C) 1998, 1999 Free Software Foundation, Inc.
+ Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
inptr += 2; \
} \
\
- *((uint32_t *) outptr)++ = ch; \
+ put32 (outptr, ch); \
+ outptr += 4; \
}
#include <iconv/loop.c>
#define LOOPFCT TO_LOOP
#define BODY \
{ \
- uint32_t ch = *((uint32_t *) inptr); \
+ uint32_t ch = get32 (inptr); \
\
if (ch <= L'\x7f') \
/* It's plain ASCII. */ \
/* Mapping tables for EUC-JP handling.
- Copyright (C) 1998, 1999 Free Software Foundation, Inc.
+ Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
} \
} \
\
- *((uint32_t *) outptr)++ = ch; \
+ put32 (outptr, ch); \
+ outptr += 4; \
}
#include <iconv/loop.c>
#define LOOPFCT TO_LOOP
#define BODY \
{ \
- uint32_t ch = *((uint32_t *) inptr); \
+ uint32_t ch = get32 (inptr); \
\
if (ch <= 0x7f) \
/* It's plain ASCII. */ \
/* Mapping tables for EUC-KR handling.
- Copyright (C) 1998, 1999 Free Software Foundation, Inc.
+ Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Jungshik Shin <jshin@pantheon.yale.edu>
and Ulrich Drepper <drepper@cygnus.com>, 1998.
} \
} \
\
- *((uint32_t *) outptr)++ = ch; \
+ put32 (outptr, ch); \
+ outptr += 4; \
}
#include <iconv/loop.c>
#define LOOPFCT TO_LOOP
#define BODY \
{ \
- uint32_t ch = *((uint32_t *) inptr); \
+ uint32_t ch = get32 (inptr); \
unsigned char cp[2]; \
\
/* Decomposing Hangul syllables not available in KS C 5601 into \
/* Mapping tables for EUC-TW handling.
- Copyright (C) 1998, 1999 Free Software Foundation, Inc.
+ Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
} \
} \
\
- *((uint32_t *) outptr)++ = ch; \
+ put32 (outptr, ch); \
+ outptr += 4; \
}
#include <iconv/loop.c>
#define LOOPFCT TO_LOOP
#define BODY \
{ \
- uint32_t ch = *((uint32_t *) inptr); \
+ uint32_t ch = get32 (inptr); \
\
if (ch <= 0x7f) \
/* It's plain ASCII. */ \
/* Mapping tables for GBK handling.
- Copyright (C) 1999 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2000 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Sean Chen <sean.chen@turbolinux.com>, 1999.
inptr += 2; \
} \
\
- *((uint32_t *) outptr)++ = ch; \
+ put32 (outptr, ch); \
+ outptr += 4; \
}
#include <iconv/loop.c>
#define LOOPFCT TO_LOOP
#define BODY \
{ \
- uint32_t ch = *((uint32_t *) inptr); \
+ uint32_t ch = get32 (inptr); \
unsigned char buf[2]; \
const unsigned char *cp = buf; \
\
/* Conversion module for ISO-2022-CN.
- Copyright (C) 1999 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2000 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1999.
} \
} \
\
- *((uint32_t *) outptr)++ = ch; \
+ put32 (outptr, ch); \
+ outptr += 4; \
}
#define EXTRA_LOOP_DECLS , int *setp
#define INIT_PARAMS int set = *setp & CURRENT_MASK; \
uint32_t ch; \
size_t written = 0; \
\
- ch = *((uint32_t *) inptr); \
+ ch = get32 (inptr); \
\
/* First see whether we can write the character using the currently \
selected character set. */ \
/* Conversion module for ISO-2022-JP.
- Copyright (C) 1998, 1999 Free Software Foundation, Inc.
+ Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
} \
} \
\
- *((uint32_t *) outptr)++ = ch; \
+ put32 (outptr, ch); \
+ outptr += 4; \
}
#define EXTRA_LOOP_DECLS , enum variant var, int *setp
#define INIT_PARAMS int set = *setp % 0x100, set2 = *setp / 0x100
uint32_t ch; \
size_t written = 0; \
\
- ch = *((uint32_t *) inptr); \
+ ch = get32 (inptr); \
\
/* First see whether we can write the character using the currently \
selected character set. */ \
/* Conversion module for ISO-2022-KR.
- Copyright (C) 1998, 1999 Free Software Foundation, Inc.
+ Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
} \
} \
\
- *((uint32_t *) outptr)++ = ch; \
+ put32 (outptr, ch); \
+ outptr += 4; \
}
#define EXTRA_LOOP_DECLS , int *setp
#define INIT_PARAMS int set = *setp
uint32_t ch; \
size_t written = 0; \
\
- ch = *((uint32_t *) inptr); \
+ ch = get32 (inptr); \
\
/* First see whether we can write the character using the currently \
selected character set. */ \
/* Conversion to and from the various ISO 646 CCS.
- Copyright (C) 1998, 1999 Free Software Foundation, Inc.
+ Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
result = failure; \
break; \
} \
- *((uint32_t *) outptr)++ = ch; \
+ put32 (outptr, ch); \
+ outptr += 4; \
++inptr; \
}
#define EXTRA_LOOP_DECLS , enum variant var
unsigned char ch; \
int failure = __GCONV_OK; \
\
- ch = *((uint32_t *) inptr); \
+ ch = get32 (inptr); \
switch (*((uint32_t *) inptr)) \
{ \
case 0x23: \
/* Generic conversion to and from ISO 6937-2.
- Copyright (C) 1998, 1999 Free Software Foundation, Inc.
+ Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
++inptr; \
} \
\
- *((uint32_t *) outptr)++ = ch; \
+ put32 (outptr, ch); \
+ outptr += 4; \
}
#include <iconv/loop.c>
#define BODY \
{ \
char tmp[2]; \
- uint32_t ch = *((uint32_t *) inptr); \
+ uint32_t ch = get32 (inptr); \
const char *cp; \
\
if (ch >= sizeof (from_ucs4) / sizeof (from_ucs4[0])) \
/* Generic conversion to and from ISO 6937.
- Copyright (C) 1997, 1998, 1999 Free Software Foundation, Inc.
+ Copyright (C) 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
++inptr; \
} \
\
- *((uint32_t *) outptr)++ = ch; \
+ put32 (outptr, ch); \
+ outptr += 4; \
}
#include <iconv/loop.c>
#define BODY \
{ \
char tmp[2]; \
- uint32_t ch = *((uint32_t *) inptr); \
+ uint32_t ch = get32 (inptr); \
const char *cp; \
\
if (ch >= sizeof (from_ucs4) / sizeof (from_ucs4[0])) \
/* Mapping tables for JOHAB handling.
- Copyright (C) 1998, 1999 Free Software Foundation, Inc.
+ Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Jungshik Shin <jshin@pantheon.yale.edu>
and Ulrich Drepper <drepper@cygnus.com>, 1998.
inptr += 2; \
} \
\
- *((uint32_t *) outptr)++ = ch; \
+ put32 (outptr, ch); \
+ outptr += 4; \
}
#include <iconv/loop.c>
#define LOOPFCT TO_LOOP
#define BODY \
{ \
- uint32_t ch = *((uint32_t *) inptr); \
+ uint32_t ch = get32 (inptr); \
/* \
if (ch >= (sizeof (from_ucs4_lat1) / sizeof (from_ucs4_lat1[0]))) \
{ \
/* Mapping tables for SJIS handling.
- Copyright (C) 1997, 1998, 1999 Free Software Foundation, Inc.
+ Copyright (C) 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
} \
} \
\
- *((uint32_t *) outptr)++ = ch; \
+ put32 (outptr, ch); \
+ outptr += 4; \
}
#include <iconv/loop.c>
#define LOOPFCT TO_LOOP
#define BODY \
{ \
- uint32_t ch = *((uint32_t *) inptr); \
+ uint32_t ch = get32 (inptr); \
const char *cp; \
\
if (ch >= (sizeof (from_ucs4_lat1) / sizeof (from_ucs4_lat1[0]))) \
/* Generic conversion to and from T.61.
- Copyright (C) 1997, 1998, 1999 Free Software Foundation, Inc.
+ Copyright (C) 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
break; \
} \
\
- *((uint32_t *) outptr)++ = ch; \
+ put32 (outptr, ch); \
+ outptr += 4; \
}
#include <iconv/loop.c>
#define BODY \
{ \
char tmp[2]; \
- uint32_t ch = *((uint32_t *) inptr); \
+ uint32_t ch = get32 (inptr); \
const char *cp; \
\
if (ch >= sizeof (from_ucs4) / sizeof (from_ucs4[0])) \
/* Mapping tables for UHC handling.
- Copyright (C) 1998, 1999 Free Software Foundation, Inc.
+ Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Jungshik Shin <jshin@pantheon.yale.edu>, 1998.
} \
} \
\
- *((uint32_t *) outptr)++ = ch; \
+ put32 (outptr, ch); \
+ outptr += 4; \
}
#include <iconv/loop.c>
#define LOOPFCT TO_LOOP
#define BODY \
{ \
- uint32_t ch = *((uint32_t *) inptr); \
+ uint32_t ch = get32 (inptr); \
\
if (ch < 0x7f) \
/* XXX Think about 0x5c ; '\'. */ \
if (inptr + 2 > inbufend) \
return __GCONV_EMPTY_INPUT; \
\
- if (*(uint16_t *) inptr == BOM) \
+ if (get16u (inptr) == BOM) \
/* Simply ignore the BOM character. */ \
inptr += 2; \
- else if (*(uint16_t *) inptr == BOM_OE) \
+ else if (get16u (inptr) == BOM_OE) \
{ \
((struct unicode_data *) step->__data)->swap = 1; \
inptr += 2; \
if (outbuf + 2 > outend) \
return __GCONV_FULL_OUTPUT; \
\
- *(uint16_t *) outbuf = BOM; \
+ put16u (outbuf, BOM); \
outbuf += 2; \
} \
swap = ((struct unicode_data *) step->__data)->swap;
#define LOOPFCT TO_LOOP
#define BODY \
{ \
- uint32_t c = *((uint32_t *) inptr); \
+ uint32_t c = get32 (inptr); \
\
if (c >= 0x10000) \
{ \
break; \
} \
\
- *((uint16_t *) outptr) = c; \
+ put16 (outptr, c); \
\
outptr += 2; \
inptr += 4; \
#define LOOPFCT FROM_LOOP
#define BODY \
{ \
- uint16_t u1 = *(uint16_t *) inptr; \
+ uint16_t u1 = get16 (inptr); \
\
if (swap) \
u1 = bswap_16 (u1); \
\
- *((uint32_t *) outptr) = u1; \
+ put32 (outptr, u1); \
\
inptr += 2; \
outptr += 4; \
if (inptr + 2 > inbufend) \
return __GCONV_EMPTY_INPUT; \
\
- if (*(uint16_t *) inptr == BOM) \
+ if (get16u (inptr) == BOM) \
/* Simply ignore the BOM character. */ \
inptr += 2; \
- else if (*(uint16_t *) inptr == BOM_OE) \
+ else if (get16u (inptr) == BOM_OE) \
{ \
((struct utf16_data *) step->__data)->swap = 1; \
inptr += 2; \
if (outbuf + 2 > outend) \
return __GCONV_FULL_OUTPUT; \
\
- *(uint16_t *) outbuf = BOM; \
+ put16u (outbuf, BOM); \
outbuf += 2; \
}
#define EXTRA_LOOP_ARGS , var, data, swap
#define LOOPFCT TO_LOOP
#define BODY \
{ \
- uint32_t c = *((uint32_t *) inptr); \
+ uint32_t c = get32 (inptr); \
\
if (swap) \
{ \
break; \
} \
\
- *((uint16_t *) outptr) = bswap_16 (0xd7c0 + (c >> 10)); \
+ put16 (outptr, bswap_16 (0xd7c0 + (c >> 10))); \
outptr += 2; \
- *((uint16_t *) outptr) = bswap_16 (0xdc00 + (c & 0x3ff)); \
+ put16 (outptr, bswap_16 (0xdc00 + (c & 0x3ff))); \
} \
else \
- *((uint16_t *) outptr) = bswap_16 (c); \
+ put16 (outptr, bswap_16 (c)); \
} \
else \
{ \
break; \
} \
\
- *((uint16_t *) outptr) = 0xd7c0 + (c >> 10); \
+ put16 (outptr, 0xd7c0 + (c >> 10)); \
outptr += 2; \
- *((uint16_t *) outptr) = 0xdc00 + (c & 0x3ff); \
+ put16 (outptr, 0xdc00 + (c & 0x3ff)); \
} \
else \
- *((uint16_t *) outptr) = c; \
+ put16 (outptr, c); \
} \
outptr += 2; \
inptr += 4; \
#define LOOPFCT FROM_LOOP
#define BODY \
{ \
- uint16_t u1 = *(uint16_t *) inptr; \
+ uint16_t u1 = get16 (inptr); \
\
if (swap) \
{ \
if (u1 < 0xd800 || u1 > 0xdfff) \
{ \
/* No surrogate. */ \
- *((uint32_t *) outptr) = u1; \
+ put32 (outptr, u1); \
inptr += 2; \
} \
else \
break; \
} \
\
- u2 = bswap_16 (((uint16_t *) inptr)[1]); \
+ inptr += 2; \
+ u2 = bswap_16 (get16 (inptr)); \
if (u2 < 0xdc00 || u2 >= 0xdfff) \
{ \
/* This is no valid second word for a surrogate. */ \
result = __GCONV_ILLEGAL_INPUT; \
+ inptr -= 2; \
break; \
} \
\
- *((uint32_t *) outptr) = ((u1 - 0xd7c0) << 10) + (u2 - 0xdc00); \
- inptr += 4; \
+ put32 (outptr, ((u1 - 0xd7c0) << 10) + (u2 - 0xdc00)); \
+ inptr += 2; \
} \
} \
else \
if (u1 < 0xd800 || u1 > 0xdfff) \
{ \
/* No surrogate. */ \
- *((uint32_t *) outptr) = u1; \
+ put32 (outptr, u1); \
inptr += 2; \
} \
else \
break; \
} \
\
- u2 = ((uint16_t *) inptr)[1]; \
+ inptr += 2; \
+ u2 = get16 (inptr); \
if (u2 < 0xdc00 || u2 >= 0xdfff) \
{ \
/* This is no valid second word for a surrogate. */ \
result = __GCONV_ILLEGAL_INPUT; \
+ inptr -= 2; \
break; \
} \
\
- *((uint32_t *) outptr) = ((u1 - 0xd7c0) << 10) + (u2 - 0xdc00); \
- inptr += 4; \
+ put32 (outptr, ((u1 - 0xd7c0) << 10) + (u2 - 0xdc00)); \
+ inptr += 2; \
} \
} \
outptr += 4; \
/* Implement simple hashing table with string based keys.
- Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
+ Copyright (C) 1994, 1995, 1996, 1997, 2000 Free Software Foundation, Inc.
Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, October 1994.
The GNU C Library is free software; you can redistribute it and/or
# define bcopy(s, d, n) memcpy ((d), (s), (n))
#endif
-void *xmalloc __P ((size_t __n));
+extern void *xmalloc (size_t __n);
+extern void *xcalloc (size_t __n, size_t __m);
typedef struct hash_entry
{
hash_entry;
/* Prototypes for local functions. */
-static void insert_entry_2 __P ((hash_table *htab, const void *key,
- size_t keylen, unsigned long hval,
- size_t idx, void *data));
-static size_t lookup __P ((hash_table *htab, const void *key, size_t keylen,
- unsigned long int hval));
-static size_t lookup_2 __P ((hash_table *htab, const void *key,
- size_t keylen, unsigned long int hval));
-static unsigned long compute_hashval __P ((const void *key, size_t keylen));
-static int is_prime __P ((unsigned long int candidate));
+static void insert_entry_2 (hash_table *htab, const void *key, size_t keylen,
+ unsigned long hval, size_t idx, void *data);
+static size_t lookup (hash_table *htab, const void *key, size_t keylen,
+ unsigned long int hval);
+static size_t lookup_2 (hash_table *htab, const void *key, size_t keylen,
+ unsigned long int hval);
+static unsigned long compute_hashval (const void *key, size_t keylen);
+static int is_prime (unsigned long int candidate);
int
htab->size = init_size;
htab->filled = 0;
htab->first = NULL;
- htab->table = (void *) xmalloc ((init_size + 1) * sizeof (hash_entry));
+ htab->table = (void *) xcalloc (init_size + 1, sizeof (hash_entry));
if (htab->table == NULL)
return -1;
- memset (htab->table, '\0', (init_size + 1) * sizeof (hash_entry));
obstack_init (&htab->mem_pool);
return 0;
htab->size = next_prime (htab->size * 2);
htab->filled = 0;
htab->first = NULL;
- htab->table = (void *) xmalloc ((1 + htab->size)
- * sizeof (hash_entry));
- memset (htab->table, '\0', (1 + htab->size) * sizeof (hash_entry));
+ htab->table = (void *) xcalloc (1 + htab->size, sizeof (hash_entry));
for (idx = 1; idx <= old_size; ++idx)
if (table[idx].used)
}
GLIBC_2.2 {
# m*
- mcheck_pedantic;
+ mcheck_check_all; mcheck_pedantic;
}
}
return status;
}
-static void check_all __P ((void));
-static void
-check_all ()
+void
+mcheck_check_all ()
{
/* Walk through all the active blocks and test whether they were tempered
with. */
const __ptr_t caller;
{
if (pedantic)
- check_all ();
+ mcheck_check_all ();
if (ptr)
{
struct hdr *hdr = ((struct hdr *) ptr) - 1;
struct hdr *hdr;
if (pedantic)
- check_all ();
+ mcheck_check_all ();
__malloc_hook = old_malloc_hook;
if (old_malloc_hook != NULL)
__malloc_size_t osize;
if (pedantic)
- check_all ();
+ mcheck_check_all ();
if (ptr)
{
mcheck_pedantic (func)
void (*func) __P ((enum mcheck_status));
{
- pedantic = 1;
- return mcheck (func);
+ int res = mcheck (func);
+ if (res == 0)
+ pedantic = 1;
+ return res;
}
enum mcheck_status
the memory handling functions is called. This can be very slow. */
extern int mcheck_pedantic (void (*__abortfunc) (enum mcheck_status)) __THROW;
+/* Force check of all blocks now. */
+extern void mcheck_check_all (void);
+
/* Check for aberrations in a particular malloc'd block. You must have
called `mcheck' already. These are the same checks that `mcheck' does
when you free or reallocate a block. */
bug1 bug2 bug3 bug4 bug5 bug6 bug7 bug8 bug9 bug10 bug11 bug12 bug13 \
tfformat tiformat tllformat tstdiomisc tst-printfsz tst-wc-printf \
scanf1 scanf2 scanf3 scanf4 scanf5 scanf7 scanf8 scanf9 scanf10 \
- scanf12 tst-tmpnam tst-cookie
+ scanf12 tst-tmpnam tst-cookie tst-obprintf
include ../Rules
projects / platform / upstream / glibc.git / commitdiff