This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
[PATCH] __builtin_expect cleanup for iconvdata/*.c
- From: Florian Weimer <fweimer at redhat dot com>
- To: GNU C Library <libc-alpha at sourceware dot org>
- Date: Mon, 08 Sep 2014 21:42:40 +0200
- Subject: [PATCH] __builtin_expect cleanup for iconvdata/*.c
- Authentication-results: sourceware.org; auth=none
As promised, this patch cleans up the __builtin_expect use in iconvdata/*.c.
I have compiled glibc with these patches and without, with a definition
#define __builtin_expect(a, b) (a)
in place. There were no object code differences (as shown by objdump -d
--reloc) in these builds.
When __builtin_expect is active, there are differences because the GCC
optimizers sometimes treat semantically equivalent __builtin_expect
annotations differently.
I tested these patches on Fedora 20, x86_64 (without the
__builtin_expect kludge), with no regression.
Writing meaningful ChangeLog entries is a bit of a challenge because
most of the changes are in a macro called BODY, and usually, there are
two such macros in each file. I would suggest to create ChangeLog
entries for each real function change (mostly gconv_init), and otherwise
list just the files with "Replace __builtin_expect.".
--
Florian Weimer / Red Hat Product Security
>From 98ee48500f419b5592cc36537a7e6db0bbc320e9 Mon Sep 17 00:00:00 2001
From: Florian Weimer <fweimer@redhat.com>
Date: Mon, 8 Sep 2014 16:21:57 +0200
Subject: [PATCH 1/2] Manual part of iconvdata/* __builtin_expect cleanup
---
ChangeLog | 8 ++++++++
iconv/loop.c | 2 +-
iconv/skeleton.c | 4 ++--
iconvdata/8bit-generic.c | 2 +-
iconvdata/ansi_x3.110.c | 5 ++---
iconvdata/big5.c | 4 ++--
iconvdata/euc-kr.c | 4 ++--
iconvdata/gb18030.c | 2 +-
iconvdata/gbk.c | 2 +-
iconvdata/iso-2022-jp.c | 7 +++----
iconvdata/iso646.c | 6 +++---
iconvdata/iso_6937-2.c | 3 +--
iconvdata/iso_6937.c | 3 +--
iconvdata/johab.c | 2 +-
iconvdata/t.61.c | 3 +--
iconvdata/utf-16.c | 2 +-
iconvdata/utf-32.c | 2 +-
iconvdata/utf-7.c | 2 +-
18 files changed, 33 insertions(+), 30 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 5262ede..c086664 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
2014-09-08 Florian Weimer <fweimer@redhat.com>
+ * iconv/loop.c (SINGLE(LOOPFCT)): Replace __builtin_expect with
+ __glibc_unlikely.
+ * iconv/skeleton.c (gconv_init): Replace __builtin_expect with
+ __glibc_likely.
+ (FUNCTION_NAME): Replace __builtin_expect with __glibc_unlikely.
+
+2014-09-08 Florian Weimer <fweimer@redhat.com>
+
* Makeconfig (.NOEXPORT): Remove, no longer supported by GNU Make.
(CHARSET, GCONV_PATH, I18NPATH, LANG, LANGUAGE, LANGUAGES,
LC_ADDRESS, LC_ALL, LC_COLLATE, LC_CTYPE, LC_IDENTIFICATION,
diff --git a/iconv/loop.c b/iconv/loop.c
index a480c0c..38f00ce 100644
--- a/iconv/loop.c
+++ b/iconv/loop.c
@@ -394,7 +394,7 @@ SINGLE(LOOPFCT) (struct __gconv_step *step,
/* Are there enough bytes in the input buffer? */
if (MIN_NEEDED_INPUT > 1
- && __builtin_expect (inptr + (MIN_NEEDED_INPUT - inlen) > inend, 0))
+ && __glibc_unlikely (inptr + (MIN_NEEDED_INPUT - inlen) > inend))
{
*inptrp = inend;
# ifdef STORE_REST
diff --git a/iconv/skeleton.c b/iconv/skeleton.c
index 73dc186..437da17 100644
--- a/iconv/skeleton.c
+++ b/iconv/skeleton.c
@@ -333,7 +333,7 @@ gconv_init (struct __gconv_step *step)
step->__btowc_fct = FROM_ONEBYTE;
#endif
}
- else if (__builtin_expect (strcmp (step->__to_name, CHARSET_NAME), 0) == 0)
+ else if (__glibc_likely (strcmp (step->__to_name, CHARSET_NAME) == 0))
{
step->__data = TO_DIRECTION_VAL;
@@ -573,7 +573,7 @@ FUNCTION_NAME (struct __gconv_step *step, struct __gconv_step_data *data,
# endif
# endif
- if (__builtin_expect (status, __GCONV_OK) != __GCONV_OK)
+ if (__glibc_unlikely (status != __GCONV_OK))
return status;
}
#endif
diff --git a/iconvdata/8bit-generic.c b/iconvdata/8bit-generic.c
index efc0fd5..f61a424 100644
--- a/iconvdata/8bit-generic.c
+++ b/iconvdata/8bit-generic.c
@@ -68,7 +68,7 @@
{ \
uint32_t ch = get32 (inptr); \
\
- if (__builtin_expect (ch >= sizeof (from_ucs4) / sizeof (from_ucs4[0]), 0)\
+ if (__glibc_unlikely (ch >= sizeof (from_ucs4) / sizeof (from_ucs4[0])) \
|| (__builtin_expect (from_ucs4[ch], '\1') == '\0' && ch != 0)) \
{ \
UNICODE_TAG_HANDLER (ch, 4); \
diff --git a/iconvdata/ansi_x3.110.c b/iconvdata/ansi_x3.110.c
index d602dfa..d0f3f3f 100644
--- a/iconvdata/ansi_x3.110.c
+++ b/iconvdata/ansi_x3.110.c
@@ -472,8 +472,7 @@ static const char from_ucs4[][2] =
uint32_t ch = get32 (inptr); \
const char *cp; \
\
- if (__builtin_expect (ch >= sizeof (from_ucs4) / sizeof (from_ucs4[0]), \
- 0)) \
+ if (__glibc_unlikely (ch >= sizeof (from_ucs4) / sizeof (from_ucs4[0]))) \
{ \
if (ch == 0x2c7) \
cp = "\xcf\x20"; \
@@ -543,7 +542,7 @@ static const char from_ucs4[][2] =
tmp[1] = '\0'; \
cp = tmp; \
} \
- else if (__builtin_expect (ch, 0x266a) == 0x266a) \
+ else if (__glibc_likely (ch == 0x266a)) \
cp = "\xd5"; \
else \
{ \
diff --git a/iconvdata/big5.c b/iconvdata/big5.c
index ee3dede..a4b56a7 100644
--- a/iconvdata/big5.c
+++ b/iconvdata/big5.c
@@ -8467,8 +8467,8 @@ static const char from_ucs4_tab15[][2] =
uint32_t ch = get32 (inptr); \
const char *cp; \
\
- if (__builtin_expect (ch >= (sizeof (from_ucs4_tab1) \
- / sizeof (from_ucs4_tab1[0])), 0)) \
+ if (__glibc_unlikely \
+ (ch >= (sizeof (from_ucs4_tab1) / sizeof (from_ucs4_tab1[0])))) \
switch (ch) \
{ \
case 0x2c7 ... 0x2d9: \
diff --git a/iconvdata/euc-kr.c b/iconvdata/euc-kr.c
index 3b13c2e..3025f6a 100644
--- a/iconvdata/euc-kr.c
+++ b/iconvdata/euc-kr.c
@@ -38,8 +38,8 @@ euckr_from_ucs4 (uint32_t ch, unsigned char *cp)
cp[0] = '\xa3';
cp[1] = '\xdc';
}
- else if (__builtin_expect (ucs4_to_ksc5601 (ch, cp, 2), 0)
- != __UNKNOWN_10646_CHAR)
+ else if (__glibc_likely (ucs4_to_ksc5601 (ch, cp, 2)
+ != __UNKNOWN_10646_CHAR))
{
cp[0] |= 0x80;
cp[1] |= 0x80;
diff --git a/iconvdata/gb18030.c b/iconvdata/gb18030.c
index f12c451..d6fc76e 100644
--- a/iconvdata/gb18030.c
+++ b/iconvdata/gb18030.c
@@ -24350,7 +24350,7 @@ static const unsigned char __ucs_to_gb18030_tab2[][2] =
else \
len = 0; \
\
- if (__builtin_expect (len, 2) == 0 \
+ if (__glibc_unlikely (len == 0) \
|| (len == 2 && __builtin_expect (cp[0], '\1') == '\0')) \
{ \
/* Illegal character. */ \
diff --git a/iconvdata/gbk.c b/iconvdata/gbk.c
index b1a7719..e27312e 100644
--- a/iconvdata/gbk.c
+++ b/iconvdata/gbk.c
@@ -13171,7 +13171,7 @@ static const char __gbk_from_ucs4_tab12[][2] =
/* All second bytes of a multibyte character must be >= 0x40, and \
the __gbk_to_ucs table only covers the range up to 0xfe 0xa0. */ \
if (__builtin_expect (ch2 < 0x40, 0) \
- || (__builtin_expect (ch, 0x81) == 0xfe && ch2 > 0xa0)) \
+ || (__glibc_unlikely (ch == 0xfe && ch2 > 0xa0))) \
{ \
/* This is an illegal character. */ \
STANDARD_FROM_LOOP_ERR_HANDLER (1); \
diff --git a/iconvdata/iso-2022-jp.c b/iconvdata/iso-2022-jp.c
index 8381c30..88ca5bb 100644
--- a/iconvdata/iso-2022-jp.c
+++ b/iconvdata/iso-2022-jp.c
@@ -164,7 +164,7 @@ gconv_init (struct __gconv_step *step)
}
result = __GCONV_NOCONV;
- if (__builtin_expect (dir, from_iso2022jp) != illegal_dir)
+ if (__glibc_likely (dir != illegal_dir))
{
new_data
= (struct iso2022jp_data *) malloc (sizeof (struct iso2022jp_data));
@@ -379,7 +379,7 @@ gconv_end (struct __gconv_step *data)
ch = inptr[2] | 0x80; \
inptr += 3; \
} \
- else if (__builtin_expect (set2, ISO88597_set) == ISO88597_set) \
+ else if (__glibc_likely (set2 == ISO88597_set)) \
{ \
/* We use the table from the ISO 8859-7 module. */ \
if (inptr[2] < 0x20 || inptr[2] >= 0x80) \
@@ -770,8 +770,7 @@ static const cvlist_t conversion_lists[4] =
{ \
if (set2 != ISO88597_set) \
{ \
- if (__builtin_expect (outptr + 3 > outend, \
- 0)) \
+ if (__glibc_unlikely (outptr + 3 > outend)) \
{ \
res = __GCONV_FULL_OUTPUT; \
break; \
diff --git a/iconvdata/iso646.c b/iconvdata/iso646.c
index 5a0402e..b540e7f 100644
--- a/iconvdata/iso646.c
+++ b/iconvdata/iso646.c
@@ -146,7 +146,7 @@ gconv_init (struct __gconv_step *step)
}
result = __GCONV_NOCONV;
- if (__builtin_expect (dir, from_iso646) != illegal_dir)
+ if (__glibc_likely (dir != illegal_dir))
{
new_data = (struct iso646_data *) malloc (sizeof (struct iso646_data));
@@ -406,7 +406,7 @@ gconv_end (struct __gconv_step *data)
\
/* Hopefully gcc can recognize that the following `if' is only true \
when we reach the default case in the `switch' statement. */ \
- if (__builtin_expect (failure, __GCONV_OK) == __GCONV_ILLEGAL_INPUT) \
+ if (__glibc_unlikely (failure == __GCONV_ILLEGAL_INPUT)) \
{ \
STANDARD_FROM_LOOP_ERR_HANDLER (1); \
} \
@@ -880,7 +880,7 @@ gconv_end (struct __gconv_step *data)
break; \
} \
\
- if (__builtin_expect (failure, __GCONV_OK) == __GCONV_ILLEGAL_INPUT) \
+ if (__glibc_unlikely (failure == __GCONV_ILLEGAL_INPUT)) \
{ \
STANDARD_TO_LOOP_ERR_HANDLER (4); \
} \
diff --git a/iconvdata/iso_6937-2.c b/iconvdata/iso_6937-2.c
index 8aba77d..9090e6f 100644
--- a/iconvdata/iso_6937-2.c
+++ b/iconvdata/iso_6937-2.c
@@ -462,8 +462,7 @@ static const char from_ucs4[][2] =
uint32_t ch = get32 (inptr); \
const char *cp; \
\
- if (__builtin_expect (ch >= sizeof (from_ucs4) / sizeof (from_ucs4[0]), \
- 0)) \
+ if (__glibc_unlikely (ch >= sizeof (from_ucs4) / sizeof (from_ucs4[0]))) \
{ \
switch (ch) \
{ \
diff --git a/iconvdata/iso_6937.c b/iconvdata/iso_6937.c
index f7bbcf0..04841bd 100644
--- a/iconvdata/iso_6937.c
+++ b/iconvdata/iso_6937.c
@@ -462,8 +462,7 @@ static const char from_ucs4[][2] =
uint32_t ch = get32 (inptr); \
const char *cp; \
\
- if (__builtin_expect (ch >= sizeof (from_ucs4) / sizeof (from_ucs4[0]), \
- 0)) \
+ if (__glibc_unlikely (ch >= sizeof (from_ucs4) / sizeof (from_ucs4[0]))) \
{ \
int fail = 0; \
switch (ch) \
diff --git a/iconvdata/johab.c b/iconvdata/johab.c
index 5b5f042..01375e3 100644
--- a/iconvdata/johab.c
+++ b/iconvdata/johab.c
@@ -225,7 +225,7 @@ johab_sym_hanja_to_ucs (uint_fast32_t idx, uint_fast32_t c1, uint_fast32_t c2)
ch = init_to_ucs[i - 1]; \
else if (i == 0 && m > 0 && f == 0) \
ch = 0x314e + m; /* 0x314f + m - 1 */ \
- else if (__builtin_expect ((i | m) == 0, 1) \
+ else if (__glibc_likely ((i | m) == 0) \
&& __builtin_expect (f > 0, 1)) \
ch = final_to_ucs[f - 1]; /* round trip?? */ \
else \
diff --git a/iconvdata/t.61.c b/iconvdata/t.61.c
index e082b50..13f1f28 100644
--- a/iconvdata/t.61.c
+++ b/iconvdata/t.61.c
@@ -448,8 +448,7 @@ static const char from_ucs4[][2] =
uint32_t ch = get32 (inptr); \
const char *cp; \
\
- if (__builtin_expect (ch >= sizeof (from_ucs4) / sizeof (from_ucs4[0]), \
- 0)) \
+ if (__glibc_unlikely (ch >= sizeof (from_ucs4) / sizeof (from_ucs4[0]))) \
{ \
if (__builtin_expect (ch, 0) == 0x2126) \
cp = "\xe0"; \
diff --git a/iconvdata/utf-16.c b/iconvdata/utf-16.c
index 31c2d6e..342de08 100644
--- a/iconvdata/utf-16.c
+++ b/iconvdata/utf-16.c
@@ -148,7 +148,7 @@ gconv_init (struct __gconv_step *step)
}
result = __GCONV_NOCONV;
- if (__builtin_expect (dir, to_utf16) != illegal_dir)
+ if (__glibc_likely (dir != illegal_dir))
{
new_data = (struct utf16_data *) malloc (sizeof (struct utf16_data));
diff --git a/iconvdata/utf-32.c b/iconvdata/utf-32.c
index e3e4243..3e196ac 100644
--- a/iconvdata/utf-32.c
+++ b/iconvdata/utf-32.c
@@ -145,7 +145,7 @@ gconv_init (struct __gconv_step *step)
}
result = __GCONV_NOCONV;
- if (__builtin_expect (dir, to_utf32) != illegal_dir)
+ if (__glibc_likely (dir != illegal_dir))
{
new_data = (struct utf32_data *) malloc (sizeof (struct utf32_data));
diff --git a/iconvdata/utf-7.c b/iconvdata/utf-7.c
index 637d85c..74a8e5b 100644
--- a/iconvdata/utf-7.c
+++ b/iconvdata/utf-7.c
@@ -219,7 +219,7 @@ base64 (unsigned int i)
/* If accumulated data is nonzero, the input is invalid. */ \
/* Also, partial UTF-16 characters are invalid. */ \
if (__builtin_expect (statep->__value.__wch != 0, 0) \
- || __builtin_expect ((statep->__count >> 3) <= 26, 0)) \
+ || __glibc_unlikely ((statep->__count >> 3) <= 26)) \
{ \
STANDARD_FROM_LOOP_ERR_HANDLER ((statep->__count = 0, 1)); \
} \
--
1.9.3
>From df3f31515da3130933736214a1a788e1de7232b4 Mon Sep 17 00:00:00 2001
From: Florian Weimer <fweimer@redhat.com>
Date: Mon, 8 Sep 2014 20:58:16 +0200
Subject: [PATCH 2/2] Automated part of the iconvdata/* __builtin_expect
cleanup
This commit was generated with the following Perl script.
#!/usr/bin/perl
use strict;
use warnings;
use Text::Tabs;
sub process ($) {
my ($path) = @_;
open my $in, '<', $path or die "cannot open $path: $!";
open my $out, '>', "$path.tmp" or die "cannot open $path.tpm: $!";
while (<$in>) {
my $length;
if (/\\\s*$/) {
$length = length(expand($_)) - 2;
}
my $old = $_;
s/__builtin_expect ?\(([^()]+), 0\)/__glibc_unlikely ($1)/g;
s/__builtin_expect ?\(([^()]+), 1\)/__glibc_likely ($1)/g;
s/__builtin_expect ?\(([^()]+), '\\1'\) == '\\0'/__glibc_unlikely ($1 == '\\0')/g;
s/__builtin_expect ?\(([^()]+), '\\1'\) != '\\0'/__glibc_likely ($1 != '\\0')/g;
s/__builtin_expect ?\(([^()]+), '\\1'\) == 0/__glibc_unlikely ($1 == 0)/g;
s/__builtin_expect ?\(([^()]+), 1\) == 0/__glibc_unlikely ($1 == 0)/g;
s/__builtin_expect ?\(([^()]+), L'\\1'\) ?== ?L'\\0'/__glibc_unlikely ($1 == L'\\0')/g;
# For changed lines, fix the position of the line continuation
# if any.
if ($_ ne $old && $length) {
$_ = expand($_);
s/\s*\\\s*$//;
while (length($_) < $length) {
$_ .= ' ';
}
$_ = unexpand("$_\\\n");
}
print $out $_ or die;
}
rename "$path.tmp", $path or die;
}
for my $path (<iconvdata/*.c>, qw(iconv/skeleton.c iconv/loop.c)) {
process $path;
}
---
iconv/loop.c | 6 +++---
iconv/skeleton.c | 4 ++--
iconvdata/8bit-gap.c | 10 +++++-----
iconvdata/8bit-generic.c | 6 +++---
iconvdata/ansi_x3.110.c | 12 ++++++------
iconvdata/big5.c | 10 +++++-----
iconvdata/big5hkscs.c | 4 ++--
iconvdata/cp1255.c | 2 +-
iconvdata/cp1258.c | 2 +-
iconvdata/cp932.c | 34 +++++++++++++++++-----------------
iconvdata/euc-cn.c | 8 ++++----
iconvdata/euc-jp-ms.c | 24 ++++++++++++------------
iconvdata/euc-jp.c | 8 ++++----
iconvdata/euc-kr.c | 10 +++++-----
iconvdata/euc-tw.c | 8 ++++----
iconvdata/gb18030.c | 4 ++--
iconvdata/gbbig5.c | 12 ++++++------
iconvdata/gbgbk.c | 18 +++++++++---------
iconvdata/gbk.c | 12 ++++++------
iconvdata/ibm1364.c | 20 ++++++++++----------
iconvdata/ibm930.c | 20 ++++++++++----------
iconvdata/ibm932.c | 22 +++++++++++-----------
iconvdata/ibm933.c | 20 ++++++++++----------
iconvdata/ibm935.c | 20 ++++++++++----------
iconvdata/ibm937.c | 20 ++++++++++----------
iconvdata/ibm939.c | 20 ++++++++++----------
iconvdata/ibm943.c | 24 ++++++++++++------------
iconvdata/iso-2022-cn.c | 26 +++++++++++++-------------
iconvdata/iso-2022-jp-3.c | 6 +++---
iconvdata/iso-2022-jp.c | 36 ++++++++++++++++++------------------
iconvdata/iso-2022-kr.c | 14 +++++++-------
iconvdata/iso_6937-2.c | 10 +++++-----
iconvdata/iso_6937.c | 10 +++++-----
iconvdata/johab.c | 34 +++++++++++++++++-----------------
iconvdata/sjis.c | 24 ++++++++++++------------
iconvdata/t.61.c | 20 ++++++++++----------
iconvdata/tcvn5712-1.c | 2 +-
iconvdata/tscii.c | 2 +-
iconvdata/uhc.c | 26 +++++++++++++-------------
iconvdata/utf-16.c | 12 ++++++------
iconvdata/utf-32.c | 2 +-
iconvdata/utf-7.c | 4 ++--
42 files changed, 294 insertions(+), 294 deletions(-)
diff --git a/iconv/loop.c b/iconv/loop.c
index 38f00ce..3d831c9 100644
--- a/iconv/loop.c
+++ b/iconv/loop.c
@@ -307,7 +307,7 @@ FCTNAME (LOOPFCT) (struct __gconv_step *step,
compiler generating better code. They will be optimized away
since MIN_NEEDED_OUTPUT is always a constant. */
if (MIN_NEEDED_INPUT > 1
- && __builtin_expect (inptr + MIN_NEEDED_INPUT > inend, 0))
+ && __glibc_unlikely (inptr + MIN_NEEDED_INPUT > inend))
{
/* We don't have enough input for another complete input
character. */
@@ -315,9 +315,9 @@ FCTNAME (LOOPFCT) (struct __gconv_step *step,
break;
}
if ((MIN_NEEDED_OUTPUT != 1
- && __builtin_expect (outptr + MIN_NEEDED_OUTPUT > outend, 0))
+ && __glibc_unlikely (outptr + MIN_NEEDED_OUTPUT > outend))
|| (MIN_NEEDED_OUTPUT == 1
- && __builtin_expect (outptr >= outend, 0)))
+ && __glibc_unlikely (outptr >= outend)))
{
/* Overflow in the output buffer. */
result = __GCONV_FULL_OUTPUT;
diff --git a/iconv/skeleton.c b/iconv/skeleton.c
index 437da17..b1c5f01 100644
--- a/iconv/skeleton.c
+++ b/iconv/skeleton.c
@@ -503,7 +503,7 @@ FUNCTION_NAME (struct __gconv_step *step, struct __gconv_step_data *data,
{
/* We preserve the initial values of the pointer variables. */
const unsigned char *inptr = *inptrp;
- unsigned char *outbuf = (__builtin_expect (outbufstart == NULL, 1)
+ unsigned char *outbuf = (__glibc_likely (outbufstart == NULL)
? data->__outbuf : *outbufstart);
unsigned char *outend = data->__outbufend;
unsigned char *outstart;
@@ -772,7 +772,7 @@ FUNCTION_NAME (struct __gconv_step *step, struct __gconv_step_data *data,
if (((FROM_LOOP_MAX_NEEDED_FROM > 1 && TO_LOOP_MAX_NEEDED_FROM > 1)
|| (FROM_LOOP_MAX_NEEDED_FROM > 1 && FROM_DIRECTION)
|| (TO_LOOP_MAX_NEEDED_FROM > 1 && !FROM_DIRECTION))
- && __builtin_expect (consume_incomplete, 0)
+ && __glibc_unlikely (consume_incomplete)
&& status == __GCONV_INCOMPLETE_INPUT)
{
# ifdef STORE_REST
diff --git a/iconvdata/8bit-gap.c b/iconvdata/8bit-gap.c
index 3bd7149..5311522 100644
--- a/iconvdata/8bit-gap.c
+++ b/iconvdata/8bit-gap.c
@@ -53,7 +53,7 @@ struct gap
{ \
uint32_t ch = to_ucs4[*inptr]; \
\
- if (HAS_HOLES && __builtin_expect (ch == L'\0', 0) && NONNUL (*inptr)) \
+ if (HAS_HOLES && __glibc_unlikely (ch == L'\0') && NONNUL (*inptr)) \
{ \
/* This is an illegal character. */ \
STANDARD_FROM_LOOP_ERR_HANDLER (1); \
@@ -71,7 +71,7 @@ struct gap
{ \
uint32_t ch = to_ucs4[c]; \
\
- if (HAS_HOLES && __builtin_expect (ch == L'\0', 0) && NONNUL (c)) \
+ if (HAS_HOLES && __glibc_unlikely (ch == L'\0') && NONNUL (c)) \
return WEOF; \
else \
return ch; \
@@ -97,10 +97,10 @@ struct gap
else \
while (ch > rp->end) \
++rp; \
- if (__builtin_expect (rp == NULL, 0) \
- || __builtin_expect (ch < rp->start, 0) \
+ if (__glibc_unlikely (rp == NULL) \
+ || __glibc_unlikely (ch < rp->start) \
|| (res = from_ucs4[ch + rp->idx], \
- __builtin_expect (res, '\1') == '\0' && ch != 0)) \
+ __glibc_unlikely (res == '\0') && ch != 0)) \
{ \
/* This is an illegal character. */ \
STANDARD_TO_LOOP_ERR_HANDLER (4); \
diff --git a/iconvdata/8bit-generic.c b/iconvdata/8bit-generic.c
index f61a424..3d6a7c5 100644
--- a/iconvdata/8bit-generic.c
+++ b/iconvdata/8bit-generic.c
@@ -37,7 +37,7 @@
{ \
uint32_t ch = to_ucs4[*inptr]; \
\
- if (HAS_HOLES && __builtin_expect (ch == L'\0', 0) && *inptr != '\0') \
+ if (HAS_HOLES && __glibc_unlikely (ch == L'\0') && *inptr != '\0') \
{ \
/* This is an illegal character. */ \
STANDARD_FROM_LOOP_ERR_HANDLER (1); \
@@ -52,7 +52,7 @@
{ \
uint32_t ch = to_ucs4[c]; \
\
- if (HAS_HOLES && __builtin_expect (ch == L'\0', 0) && c != '\0') \
+ if (HAS_HOLES && __glibc_unlikely (ch == L'\0') && c != '\0') \
return WEOF; \
else \
return ch; \
@@ -69,7 +69,7 @@
uint32_t ch = get32 (inptr); \
\
if (__glibc_unlikely (ch >= sizeof (from_ucs4) / sizeof (from_ucs4[0])) \
- || (__builtin_expect (from_ucs4[ch], '\1') == '\0' && ch != 0)) \
+ || (__glibc_unlikely (from_ucs4[ch] == '\0') && ch != 0)) \
{ \
UNICODE_TAG_HANDLER (ch, 4); \
\
diff --git a/iconvdata/ansi_x3.110.c b/iconvdata/ansi_x3.110.c
index d0f3f3f..ecfabc3 100644
--- a/iconvdata/ansi_x3.110.c
+++ b/iconvdata/ansi_x3.110.c
@@ -402,7 +402,7 @@ static const char from_ucs4[][2] =
uint32_t ch = *inptr; \
int incr; \
\
- if (__builtin_expect (ch >= 0xc1, 0) && ch <= 0xcf) \
+ if (__glibc_unlikely (ch >= 0xc1) && ch <= 0xcf) \
{ \
/* Composed character. First test whether the next byte \
is also available. */ \
@@ -417,8 +417,8 @@ static const char from_ucs4[][2] =
\
ch2 = inptr[1]; \
\
- if (__builtin_expect (ch2 < 0x20, 0) \
- || __builtin_expect (ch2 >= 0x80, 0)) \
+ if (__glibc_unlikely (ch2 < 0x20) \
+ || __glibc_unlikely (ch2 >= 0x80)) \
{ \
/* This is illegal. */ \
STANDARD_FROM_LOOP_ERR_HANDLER (1); \
@@ -435,7 +435,7 @@ static const char from_ucs4[][2] =
incr = 1; \
} \
\
- if (__builtin_expect (ch == 0, 0) && *inptr != '\0') \
+ if (__glibc_unlikely (ch == 0) && *inptr != '\0') \
{ \
/* This is an illegal character. */ \
STANDARD_FROM_LOOP_ERR_HANDLER (incr); \
@@ -453,7 +453,7 @@ static const char from_ucs4[][2] =
{ \
uint32_t ch = to_ucs4[c]; \
\
- if (__builtin_expect (ch == 0, 0) && c != '\0') \
+ if (__glibc_unlikely (ch == 0) && c != '\0') \
return WEOF; \
else \
return ch; \
@@ -556,7 +556,7 @@ static const char from_ucs4[][2] =
{ \
cp = from_ucs4[ch]; \
\
- if (__builtin_expect (cp[0], '\1') == '\0' && ch != 0) \
+ if (__glibc_unlikely (cp[0] == '\0') && ch != 0) \
{ \
/* Illegal characters. */ \
STANDARD_TO_LOOP_ERR_HANDLER (4); \
diff --git a/iconvdata/big5.c b/iconvdata/big5.c
index a4b56a7..e64b6ca 100644
--- a/iconvdata/big5.c
+++ b/iconvdata/big5.c
@@ -8414,8 +8414,8 @@ static const char from_ucs4_tab15[][2] =
/* See whether the second byte is in the correct range. */ \
if (ch2 >= 0x40 && ch2 <= 0x7e) \
idx += ch2 - 0x40; \
- else if (__builtin_expect (ch2 >= 0xa1, 1) \
- && __builtin_expect (ch2 <= 0xfe, 1)) \
+ else if (__glibc_likely (ch2 >= 0xa1) \
+ && __glibc_likely (ch2 <= 0xfe)) \
idx += 0x3f + (ch2 - 0xa1); \
else \
{ \
@@ -8555,7 +8555,7 @@ static const char from_ucs4_tab15[][2] =
else \
cp = from_ucs4_tab1[ch]; \
\
- if (__builtin_expect (cp[0], '\1') == '\0' && ch != 0) \
+ if (__glibc_unlikely (cp[0] == '\0') && ch != 0) \
{ \
/* Illegal character. */ \
STANDARD_TO_LOOP_ERR_HANDLER (4); \
@@ -8563,8 +8563,8 @@ static const char from_ucs4_tab15[][2] =
else \
{ \
/* See whether there is enough room for the second byte we write. */ \
- if (__builtin_expect (cp[1], '\1') != '\0' \
- && __builtin_expect (outptr + 1 >= outend, 0)) \
+ if (__glibc_likely (cp[1] != '\0') \
+ && __glibc_unlikely (outptr + 1 >= outend)) \
{ \
/* We have not enough room. */ \
result = __GCONV_FULL_OUTPUT; \
diff --git a/iconvdata/big5hkscs.c b/iconvdata/big5hkscs.c
index 5dce195..64cc161 100644
--- a/iconvdata/big5hkscs.c
+++ b/iconvdata/big5hkscs.c
@@ -18001,8 +18001,8 @@ static struct
} \
\
/* See whether there is enough room to write the second byte. */ \
- if (__builtin_expect (cp[1] != '\0', 1) \
- && __builtin_expect (outptr + 1 >= outend, 0)) \
+ if (__glibc_likely (cp[1] != '\0') \
+ && __glibc_unlikely (outptr + 1 >= outend)) \
{ \
/* We have not enough room. */ \
result = __GCONV_FULL_OUTPUT; \
diff --git a/iconvdata/cp1255.c b/iconvdata/cp1255.c
index 1fab525..c4a3bec 100644
--- a/iconvdata/cp1255.c
+++ b/iconvdata/cp1255.c
@@ -307,7 +307,7 @@ static const struct { unsigned int idx; unsigned int len; } comp_table[8] = {
\
/* If we don't have enough room to output ch as well, then deal \
with it in another round. */ \
- if (!must_buffer_ch && __builtin_expect (outptr + 4 > outend, 0)) \
+ if (!must_buffer_ch && __glibc_unlikely (outptr + 4 > outend)) \
continue; \
} \
\
diff --git a/iconvdata/cp1258.c b/iconvdata/cp1258.c
index 5153eea..c93886f 100644
--- a/iconvdata/cp1258.c
+++ b/iconvdata/cp1258.c
@@ -465,7 +465,7 @@ static const struct
\
/* If we don't have enough room to output ch as well, then deal \
with it in another round. */ \
- if (!must_buffer_ch && __builtin_expect (outptr + 4 > outend, 0)) \
+ if (!must_buffer_ch && __glibc_unlikely (outptr + 4 > outend)) \
continue; \
} \
\
diff --git a/iconvdata/cp932.c b/iconvdata/cp932.c
index a358eda..33477e4 100644
--- a/iconvdata/cp932.c
+++ b/iconvdata/cp932.c
@@ -4552,9 +4552,9 @@ static const char from_ucs4_extra[229][2] =
ch += 0xfec0; \
++inptr; \
} \
- else if (__builtin_expect (ch, 0) == 0xa0 \
- || __builtin_expect (ch <= 0x80, 0) \
- || __builtin_expect (ch > 0xfc, 0)) \
+ else if (__glibc_unlikely (ch) == 0xa0 \
+ || __glibc_unlikely (ch <= 0x80) \
+ || __glibc_unlikely (ch > 0xfc)) \
{ \
/* These are illegal. */ \
if (! ignore_errors_p ()) \
@@ -4585,16 +4585,16 @@ static const char from_ucs4_extra[229][2] =
\
ch2 = inptr[1]; \
idx = ch * 256 + ch2; \
- if (__builtin_expect (ch2 < 0x40, 0) \
- || __builtin_expect (ch2 > 0xfc, 0) \
- || __builtin_expect (ch2 == 0x7f, 0) \
- || (__builtin_expect (idx > 0x84be, 0) && idx < 0x8740) \
- || (__builtin_expect (idx > 0x879c, 0) && idx < 0x889f) \
- || (__builtin_expect (idx > 0x88fc, 0) && idx < 0x8940) \
- || (__builtin_expect (idx > 0x9ffc, 0) && idx < 0xe040) \
- || (__builtin_expect (idx > 0xeaa4, 0) && idx < 0xed40) \
- || (__builtin_expect (idx > 0xeefc, 0) && idx < 0xf040) \
- || __builtin_expect (idx > 0xfc4b, 0)) \
+ if (__glibc_unlikely (ch2 < 0x40) \
+ || __glibc_unlikely (ch2 > 0xfc) \
+ || __glibc_unlikely (ch2 == 0x7f) \
+ || (__glibc_unlikely (idx > 0x84be) && idx < 0x8740) \
+ || (__glibc_unlikely (idx > 0x879c) && idx < 0x889f) \
+ || (__glibc_unlikely (idx > 0x88fc) && idx < 0x8940) \
+ || (__glibc_unlikely (idx > 0x9ffc) && idx < 0xe040) \
+ || (__glibc_unlikely (idx > 0xeaa4) && idx < 0xed40) \
+ || (__glibc_unlikely (idx > 0xeefc) && idx < 0xf040) \
+ || __glibc_unlikely (idx > 0xfc4b)) \
{ \
/* This is illegal. */ \
if (! ignore_errors_p ()) \
@@ -4629,7 +4629,7 @@ static const char from_ucs4_extra[229][2] =
else \
ch = cjk_block7[(ch - 0xfa) * 192 + ch2 - 0x40]; \
\
- if (__builtin_expect (ch, 1) == 0) \
+ if (__glibc_likely (ch) == 0) \
{ \
/* This is an illegal character. */ \
if (! ignore_errors_p ()) \
@@ -4681,8 +4681,8 @@ static const char from_ucs4_extra[229][2] =
} \
else if (ch >= 0xf929 && ch <= 0xfa2d) \
cp = from_ucs4_cjkcpt[ch - 0xf929]; \
- else if (__builtin_expect (ch >= 0xff01, 1) \
- && __builtin_expect (ch <= 0xffe5, 1)) \
+ else if (__glibc_likely (ch >= 0xff01) \
+ && __glibc_likely (ch <= 0xffe5)) \
cp = from_ucs4_extra[ch - 0xff01]; \
else \
{ \
@@ -4694,7 +4694,7 @@ static const char from_ucs4_extra[229][2] =
else \
cp = from_ucs4_lat1[ch]; \
\
- if (__builtin_expect (cp[0], '\1') == '\0' && ch != 0) \
+ if (__glibc_unlikely (cp[0] == '\0') && ch != 0) \
{ \
/* Illegal character. */ \
STANDARD_TO_LOOP_ERR_HANDLER (4); \
diff --git a/iconvdata/euc-cn.c b/iconvdata/euc-cn.c
index 0d625b4..e1781bc 100644
--- a/iconvdata/euc-cn.c
+++ b/iconvdata/euc-cn.c
@@ -45,8 +45,8 @@
if (ch <= 0x7f) \
++inptr; \
else \
- if ((__builtin_expect (ch <= 0xa0, 0) && ch != 0x8e && ch != 0x8f) \
- || __builtin_expect (ch > 0xfe, 0)) \
+ if ((__glibc_unlikely (ch <= 0xa0) && ch != 0x8e && ch != 0x8f) \
+ || __glibc_unlikely (ch > 0xfe)) \
{ \
/* This is illegal. */ \
STANDARD_FROM_LOOP_ERR_HANDLER (1); \
@@ -115,9 +115,9 @@
size_t found; \
\
found = ucs4_to_gb2312 (ch, outptr, outend - outptr); \
- if (__builtin_expect (found, 1) != 0) \
+ if (__glibc_likely (found) != 0) \
{ \
- if (__builtin_expect (found, 0) == __UNKNOWN_10646_CHAR) \
+ if (__glibc_unlikely (found) == __UNKNOWN_10646_CHAR) \
{ \
UNICODE_TAG_HANDLER (ch, 4); \
\
diff --git a/iconvdata/euc-jp-ms.c b/iconvdata/euc-jp-ms.c
index 8aed520..158e41e 100644
--- a/iconvdata/euc-jp-ms.c
+++ b/iconvdata/euc-jp-ms.c
@@ -4699,11 +4699,11 @@ static const unsigned char from_ucs4_extra[229][2] =
continue; \
} \
\
- if (__builtin_expect(ch == 0x8e, 0)) \
+ if (__glibc_unlikely (ch == 0x8e)) \
{ \
/* This is code set 2: half-width katakana. */ \
ch = jisx0201_to_ucs4 (ch2); \
- /*if (__builtin_expect (ch, 0) == __UNKNOWN_10646_CHAR)*/ \
+ /*if (__glibc_unlikely (ch) == __UNKNOWN_10646_CHAR)*/ \
if (__glibc_unlikely (ch == __UNKNOWN_10646_CHAR)) \
{ \
/* Illegal character. */ \
@@ -4722,7 +4722,7 @@ static const unsigned char from_ucs4_extra[229][2] =
const unsigned char *endp = inptr; \
int mblen = 1; \
\
- if (__builtin_expect(ch == 0x8f, 0)) \
+ if (__glibc_unlikely (ch == 0x8f)) \
{ \
if (inend - inptr < 3) \
ch = 0; \
@@ -4731,8 +4731,8 @@ static const unsigned char from_ucs4_extra[229][2] =
unsigned char ch3 = (unsigned char)inptr[2]; \
mblen = 3; \
\
- if (__builtin_expect(ch3 == 0xff, 0) \
- || __builtin_expect(ch3 < 0xa1, 0)) \
+ if (__glibc_unlikely (ch3 == 0xff) \
+ || __glibc_unlikely (ch3 < 0xa1)) \
ch = __UNKNOWN_10646_CHAR; \
else if (ch2 <= 0xf2) \
{ \
@@ -4769,13 +4769,13 @@ static const unsigned char from_ucs4_extra[229][2] =
ch = __UNKNOWN_10646_CHAR; \
} \
} \
- else if (__builtin_expect(0xa1 <= ch, 1)) \
+ else if (__glibc_likely (0xa1 <= ch)) \
{ \
mblen = 2; \
\
if (inend - inptr < 2) \
ch = 0; \
- else if (__builtin_expect(ch2 == 0xff, 0)) \
+ else if (__glibc_unlikely (ch2 == 0xff)) \
ch = __UNKNOWN_10646_CHAR; \
else if (ch <= 0xa8) \
{ \
@@ -4809,13 +4809,13 @@ static const unsigned char from_ucs4_extra[229][2] =
else \
ch = __UNKNOWN_10646_CHAR; \
\
- if (__builtin_expect (ch, 1) == 0) \
+ if (__glibc_likely (ch) == 0) \
{ \
/* Not enough input available. */ \
result = __GCONV_INCOMPLETE_INPUT; \
break; \
} \
- if (__builtin_expect (ch, 0) == __UNKNOWN_10646_CHAR) \
+ if (__glibc_unlikely (ch) == __UNKNOWN_10646_CHAR) \
{ \
/* Illegal character. */ \
if (! ignore_errors_p ()) \
@@ -4873,8 +4873,8 @@ static const unsigned char from_ucs4_extra[229][2] =
} \
else if (ch >= 0xf929 && ch <= 0xfa2d) \
cp = from_ucs4_cjkcpt[ch - 0xf929]; \
- else if (__builtin_expect (ch >= 0xff01, 1) \
- && __builtin_expect (ch <= 0xffe5, 1)) \
+ else if (__glibc_likely (ch >= 0xff01) \
+ && __glibc_likely (ch <= 0xffe5)) \
cp = from_ucs4_extra[ch - 0xff01]; \
else \
{ \
@@ -4886,7 +4886,7 @@ static const unsigned char from_ucs4_extra[229][2] =
else \
cp = from_ucs4_lat1[ch]; \
\
- if (__builtin_expect (cp[0], '\1') == '\0' && ch != 0) \
+ if (__glibc_unlikely (cp[0] == '\0') && ch != 0) \
{ \
/* Illegal character. */ \
STANDARD_TO_LOOP_ERR_HANDLER (4); \
diff --git a/iconvdata/euc-jp.c b/iconvdata/euc-jp.c
index 7689250..b8bf9b5 100644
--- a/iconvdata/euc-jp.c
+++ b/iconvdata/euc-jp.c
@@ -76,7 +76,7 @@
{ \
/* This is code set 2: half-width katakana. */ \
ch = jisx0201_to_ucs4 (ch2); \
- if (__builtin_expect (ch, 0) == __UNKNOWN_10646_CHAR) \
+ if (__glibc_unlikely (ch) == __UNKNOWN_10646_CHAR) \
STANDARD_FROM_LOOP_ERR_HANDLER (1); \
\
inptr += 2; \
@@ -100,7 +100,7 @@
ch = jisx0208_to_ucs4 (&endp, inend - inptr, 0x80); \
} \
\
- if (__builtin_expect (ch, 1) == 0) \
+ if (__glibc_likely (ch) == 0) \
{ \
/* Not enough input available. */ \
result = __GCONV_INCOMPLETE_INPUT; \
@@ -182,13 +182,13 @@
found = ucs4_to_jisx0212 (ch, outptr + 1, \
outend - outptr - 1); \
\
- if (__builtin_expect (found, 1) == 0) \
+ if (__glibc_likely (found) == 0) \
{ \
/* We ran out of space. */ \
result = __GCONV_FULL_OUTPUT; \
break; \
} \
- else if (__builtin_expect (found, 0) != __UNKNOWN_10646_CHAR) \
+ else if (__glibc_unlikely (found) != __UNKNOWN_10646_CHAR) \
{ \
/* It's a JIS 0212 character, adjust it for EUC-JP. */ \
*outptr++ = 0x8f; \
diff --git a/iconvdata/euc-kr.c b/iconvdata/euc-kr.c
index 3025f6a..7b8f0af 100644
--- a/iconvdata/euc-kr.c
+++ b/iconvdata/euc-kr.c
@@ -29,7 +29,7 @@ euckr_from_ucs4 (uint32_t ch, unsigned char *cp)
{
if (ch > 0x9f)
{
- if (__builtin_expect (ch, 0) == 0x20a9)
+ if (__glibc_unlikely (ch) == 0x20a9)
{
/* Half-width Korean Currency WON sign. There is no
equivalent in EUC-KR. Some mappings use \x5c because
@@ -82,9 +82,9 @@ euckr_from_ucs4 (uint32_t ch, unsigned char *cp)
++inptr; \
/* 0xfe(->0x7e : row 94) and 0xc9(->0x59 : row 41) are \
user-defined areas. */ \
- else if (__builtin_expect (ch == 0xa0, 0) \
- || __builtin_expect (ch > 0xfe, 0) \
- || __builtin_expect (ch == 0xc9, 0)) \
+ else if (__glibc_unlikely (ch == 0xa0) \
+ || __glibc_unlikely (ch > 0xfe) \
+ || __glibc_unlikely (ch == 0xc9)) \
{ \
/* This is illegal. */ \
STANDARD_FROM_LOOP_ERR_HANDLER (1); \
@@ -133,7 +133,7 @@ euckr_from_ucs4 (uint32_t ch, unsigned char *cp)
Jamos should be considered either here or in euckr_from_ucs4() */ \
euckr_from_ucs4 (ch, cp); \
\
- if (__builtin_expect (cp[0], '\1') == '\0' && ch != 0) \
+ if (__glibc_unlikely (cp[0] == '\0') && ch != 0) \
{ \
UNICODE_TAG_HANDLER (ch, 4); \
\
diff --git a/iconvdata/euc-tw.c b/iconvdata/euc-tw.c
index 153e3a0..49a1109 100644
--- a/iconvdata/euc-tw.c
+++ b/iconvdata/euc-tw.c
@@ -140,13 +140,13 @@
size_t found; \
\
found = ucs4_to_cns11643l1 (ch, outptr, outend - outptr); \
- if (__builtin_expect (found, 1) == 0) \
+ if (__glibc_likely (found) == 0) \
{ \
/* We ran out of space. */ \
result = __GCONV_FULL_OUTPUT; \
break; \
} \
- if (__builtin_expect (found, 1) != __UNKNOWN_10646_CHAR) \
+ if (__glibc_likely (found) != __UNKNOWN_10646_CHAR) \
{ \
/* It's a CNS 11643, plane 1 character, adjust it for EUC-TW. */ \
*outptr++ += 0x80; \
@@ -157,13 +157,13 @@
/* No CNS 11643, plane 1 character. */ \
\
found = ucs4_to_cns11643 (ch, outptr + 1, outend - outptr - 1); \
- if (__builtin_expect (found, 1) == 0) \
+ if (__glibc_likely (found) == 0) \
{ \
/* We ran out of space. */ \
result = __GCONV_FULL_OUTPUT; \
break; \
} \
- if (__builtin_expect (found, 0) == __UNKNOWN_10646_CHAR) \
+ if (__glibc_unlikely (found) == __UNKNOWN_10646_CHAR) \
{ \
UNICODE_TAG_HANDLER (ch, 4); \
\
diff --git a/iconvdata/gb18030.c b/iconvdata/gb18030.c
index d6fc76e..cb466f3 100644
--- a/iconvdata/gb18030.c
+++ b/iconvdata/gb18030.c
@@ -24351,7 +24351,7 @@ static const unsigned char __ucs_to_gb18030_tab2[][2] =
len = 0; \
\
if (__glibc_unlikely (len == 0) \
- || (len == 2 && __builtin_expect (cp[0], '\1') == '\0')) \
+ || (len == 2 && __glibc_unlikely (cp[0] == '\0'))) \
{ \
/* Illegal character. */ \
STANDARD_TO_LOOP_ERR_HANDLER (4); \
@@ -24361,7 +24361,7 @@ static const unsigned char __ucs_to_gb18030_tab2[][2] =
{ \
/* See whether there is enough room for the second byte we \
write. */ \
- if (cp[1] != '\0' && __builtin_expect (outptr + 1 >= outend, 0)) \
+ if (cp[1] != '\0' && __glibc_unlikely (outptr + 1 >= outend)) \
{ \
/* We have not enough room. */ \
result = __GCONV_FULL_OUTPUT; \
diff --git a/iconvdata/gbbig5.c b/iconvdata/gbbig5.c
index ddaa468..cf4bc4b 100644
--- a/iconvdata/gbbig5.c
+++ b/iconvdata/gbbig5.c
@@ -4852,8 +4852,8 @@ const char __from_big5_to_gb2312 [13973][2] =
else \
{ \
/* See whether there is enough room to write the second byte. */ \
- if (__builtin_expect (cp[1], '\1') != '\0' \
- && __builtin_expect (outptr + 1 >= outend, 0)) \
+ if (__glibc_likely (cp[1] != '\0') \
+ && __glibc_unlikely (outptr + 1 >= outend)) \
{ \
/* We do not have enough room. */ \
result = __GCONV_FULL_OUTPUT; \
@@ -4908,8 +4908,8 @@ const char __from_big5_to_gb2312 [13973][2] =
/* See if the second byte is in the correct range. */ \
if (ch >= 0x40 && ch <= 0x7e) \
idx += ch - 0x40; \
- else if (__builtin_expect (ch >= 0xa1, 1) \
- && __builtin_expect (ch <= 0xfe, 1)) \
+ else if (__glibc_likely (ch >= 0xa1) \
+ && __glibc_likely (ch <= 0xfe)) \
idx += 0x3f + (ch - 0xa1); \
else \
{ \
@@ -4943,8 +4943,8 @@ const char __from_big5_to_gb2312 [13973][2] =
else \
{ \
/* see if there is enough room to write the second byte. */ \
- if (__builtin_expect (cp[1], '\1') != '\0' \
- && __builtin_expect (outptr + 1 >= outend, 0)) \
+ if (__glibc_likely (cp[1] != '\0') \
+ && __glibc_unlikely (outptr + 1 >= outend)) \
{ \
/* We do not have enough room. */ \
result = __GCONV_FULL_OUTPUT; \
diff --git a/iconvdata/gbgbk.c b/iconvdata/gbgbk.c
index 620c39d..67c27ae 100644
--- a/iconvdata/gbgbk.c
+++ b/iconvdata/gbgbk.c
@@ -96,16 +96,16 @@
ch = 0xa1aa; \
\
/* Now determine whether the character is valid. */ \
- if (__builtin_expect (ch < 0xa1a1, 0) \
- || __builtin_expect (ch > 0xf7fe, 0) \
- || __builtin_expect (inptr[1] < 0xa1, 0) \
+ if (__glibc_unlikely (ch < 0xa1a1) \
+ || __glibc_unlikely (ch > 0xf7fe) \
+ || __glibc_unlikely (inptr[1] < 0xa1) \
/* Now test the exceptions. */ \
- || (__builtin_expect (ch >= 0xa2a1, 0) \
- && __builtin_expect (ch <= 0xa2aa, 0)) \
- || (__builtin_expect (ch >= 0xa6e0, 0) \
- && __builtin_expect (ch <= 0xa6f5, 0)) \
- || (__builtin_expect (ch >= 0xa8bb, 0) \
- && __builtin_expect (ch <= 0xa8c0, 0))) \
+ || (__glibc_unlikely (ch >= 0xa2a1) \
+ && __glibc_unlikely (ch <= 0xa2aa)) \
+ || (__glibc_unlikely (ch >= 0xa6e0) \
+ && __glibc_unlikely (ch <= 0xa6f5)) \
+ || (__glibc_unlikely (ch >= 0xa8bb) \
+ && __glibc_unlikely (ch <= 0xa8c0))) \
{ \
/* One of the characters we cannot map. */ \
STANDARD_TO_LOOP_ERR_HANDLER (2); \
diff --git a/iconvdata/gbk.c b/iconvdata/gbk.c
index e27312e..d1a8e0a 100644
--- a/iconvdata/gbk.c
+++ b/iconvdata/gbk.c
@@ -13145,8 +13145,8 @@ static const char __gbk_from_ucs4_tab12[][2] =
if (ch <= 0x7f) \
++inptr; \
else \
- if (__builtin_expect (ch <= 0x80, 0) \
- || __builtin_expect (ch > 0xfe, 0)) \
+ if (__glibc_unlikely (ch <= 0x80) \
+ || __glibc_unlikely (ch > 0xfe)) \
{ \
/* This is illegal. */ \
STANDARD_FROM_LOOP_ERR_HANDLER (1); \
@@ -13170,7 +13170,7 @@ static const char __gbk_from_ucs4_tab12[][2] =
\
/* All second bytes of a multibyte character must be >= 0x40, and \
the __gbk_to_ucs table only covers the range up to 0xfe 0xa0. */ \
- if (__builtin_expect (ch2 < 0x40, 0) \
+ if (__glibc_unlikely (ch2 < 0x40) \
|| (__glibc_unlikely (ch == 0xfe && ch2 > 0xa0))) \
{ \
/* This is an illegal character. */ \
@@ -13182,7 +13182,7 @@ static const char __gbk_from_ucs4_tab12[][2] =
\
ch = __gbk_to_ucs[idx]; \
\
- if (__builtin_expect (ch, 1) == 0 && *inptr != '\0') \
+ if (__glibc_likely (ch) == 0 && *inptr != '\0') \
{ \
/* This is an illegal character. */ \
STANDARD_FROM_LOOP_ERR_HANDLER (2); \
@@ -13456,13 +13456,13 @@ static const char __gbk_from_ucs4_tab12[][2] =
cp = ""; \
break; \
} \
- if (__builtin_expect (cp[0], '\1') == '\0' && ch != 0) \
+ if (__glibc_unlikely (cp[0] == '\0') && ch != 0) \
{ \
/* Illegal character. */ \
STANDARD_TO_LOOP_ERR_HANDLER (4); \
} \
/* See whether there is enough room for the second byte we write. */ \
- else if (cp[1] != '\0' && __builtin_expect (outptr + 1 >= outend, 0)) \
+ else if (cp[1] != '\0' && __glibc_unlikely (outptr + 1 >= outend)) \
{ \
/* We have not enough room. */ \
result = __GCONV_FULL_OUTPUT; \
diff --git a/iconvdata/ibm1364.c b/iconvdata/ibm1364.c
index cf80993..ca898c7 100644
--- a/iconvdata/ibm1364.c
+++ b/iconvdata/ibm1364.c
@@ -155,7 +155,7 @@ enum
{ \
uint32_t ch = *inptr; \
\
- if (__builtin_expect (ch, 0) == SO) \
+ if (__glibc_unlikely (ch) == SO) \
{ \
/* Shift OUT, change to DBCS converter. */ \
if (curcs == db) \
@@ -167,7 +167,7 @@ enum
++inptr; \
continue; \
} \
- if (__builtin_expect (ch, 0) == SI) \
+ if (__glibc_unlikely (ch) == SI) \
{ \
/* Shift IN, change to SBCS converter. */ \
if (curcs == sb) \
@@ -184,7 +184,7 @@ enum
{ \
/* Use the IBM13XX table for single byte. */ \
uint32_t res = SB_TO_UCS4[ch]; \
- if (__builtin_expect (res, L'\1') == L'\0' && ch != '\0') \
+ if (__glibc_unlikely (res == L'\0') && ch != '\0') \
{ \
/* This is an illegal character. */ \
if (! ignore_errors_p ()) \
@@ -221,10 +221,10 @@ enum
++rp2; \
\
uint32_t res; \
- if (__builtin_expect (rp2->start == 0xffff, 0) \
- || __builtin_expect (ch < rp2->start, 0) \
+ if (__glibc_unlikely (rp2->start == 0xffff) \
+ || __glibc_unlikely (ch < rp2->start) \
|| (res = DB_TO_UCS4[ch + rp2->idx], \
- __builtin_expect (res, L'\1') == L'\0' && ch != '\0')) \
+ __glibc_unlikely (res == L'\0') && ch != '\0')) \
{ \
/* This is an illegal character. */ \
if (! ignore_errors_p ()) \
@@ -325,18 +325,18 @@ enum
\
/* Use the UCS4 table for single byte. */ \
const char *cp; \
- if (__builtin_expect (ch < rp1->start, 0) \
+ if (__glibc_unlikely (ch < rp1->start) \
|| (cp = UCS4_TO_SB[ch + rp1->idx], \
- __builtin_expect (cp[0], L'\1') == L'\0' && ch != '\0')) \
+ __glibc_unlikely (cp[0] == L'\0') && ch != '\0')) \
{ \
/* Use the UCS4 table for double byte. */ \
const struct gap *rp2 = UCS4_TO_DB_IDX; \
while (ch > rp2->end) \
++rp2; \
\
- if (__builtin_expect (ch < rp2->start, 0) \
+ if (__glibc_unlikely (ch < rp2->start) \
|| (cp = UCS4_TO_DB[ch + rp2->idx], \
- __builtin_expect (cp[0], L'\1') == L'\0' && ch != '\0')) \
+ __glibc_unlikely (cp[0] == L'\0') && ch != '\0')) \
{ \
/* This is an illegal character. */ \
if (! ignore_errors_p ()) \
diff --git a/iconvdata/ibm930.c b/iconvdata/ibm930.c
index 768a444..328c3cd 100644
--- a/iconvdata/ibm930.c
+++ b/iconvdata/ibm930.c
@@ -103,7 +103,7 @@ enum
uint32_t ch = *inptr; \
uint32_t res; \
\
- if (__builtin_expect (ch, 0) == SO) \
+ if (__glibc_unlikely (ch) == SO) \
{ \
/* Shift OUT, change to DBCS converter. */ \
if (curcs == db) \
@@ -115,7 +115,7 @@ enum
++inptr; \
continue; \
} \
- else if (__builtin_expect (ch, 0) == SI) \
+ else if (__glibc_unlikely (ch) == SI) \
{ \
/* Shift IN, change to SBCS converter */ \
if (curcs == sb) \
@@ -132,7 +132,7 @@ enum
{ \
/* Use the IBM930 table for single byte. */ \
res = __ibm930sb_to_ucs4[ch]; \
- if (__builtin_expect (res, L'\1') == L'\0' && ch != '\0') \
+ if (__glibc_unlikely (res == L'\0') && ch != '\0') \
{ \
/* This is an illegal character. */ \
STANDARD_FROM_LOOP_ERR_HANDLER (1); \
@@ -163,10 +163,10 @@ enum
while (ch > rp2->end) \
++rp2; \
\
- if (__builtin_expect (rp2->start == 0xffff, 0) \
- || __builtin_expect (ch < rp2->start, 0) \
+ if (__glibc_unlikely (rp2->start == 0xffff) \
+ || __glibc_unlikely (ch < rp2->start) \
|| (res = __ibm930db_to_ucs4[ch + rp2->idx], \
- __builtin_expect (res, L'\1') == L'\0' && ch != '\0')) \
+ __glibc_unlikely (res == L'\0') && ch != '\0')) \
{ \
/* This is an illegal character. */ \
STANDARD_FROM_LOOP_ERR_HANDLER (2); \
@@ -209,17 +209,17 @@ enum
++rp1; \
\
/* Use the UCS4 table for single byte. */ \
- if (__builtin_expect (ch < rp1->start, 0) \
+ if (__glibc_unlikely (ch < rp1->start) \
|| (cp = __ucs4_to_ibm930sb[ch + rp1->idx], \
- __builtin_expect (cp[0], L'\1') == L'\0' && ch != '\0')) \
+ __glibc_unlikely (cp[0] == L'\0') && ch != '\0')) \
{ \
/* Use the UCS4 table for double byte. */ \
while (ch > rp2->end) \
++rp2; \
\
- if (__builtin_expect (ch < rp2->start, 0) \
+ if (__glibc_unlikely (ch < rp2->start) \
|| (cp = __ucs4_to_ibm930db[ch + rp2->idx], \
- __builtin_expect (cp[0], L'\1')== L'\0' && ch != '\0')) \
+ __glibc_unlikely (cp[0] == L'\0') && ch != '\0')) \
{ \
/* This is an illegal character. */ \
STANDARD_TO_LOOP_ERR_HANDLER (4); \
diff --git a/iconvdata/ibm932.c b/iconvdata/ibm932.c
index aa69d65..0788185 100644
--- a/iconvdata/ibm932.c
+++ b/iconvdata/ibm932.c
@@ -50,11 +50,11 @@
uint32_t ch = *inptr; \
uint32_t res; \
\
- if (__builtin_expect (ch == 0x80, 0) \
- || __builtin_expect (ch == 0xa0, 0) \
- || __builtin_expect (ch == 0xfd, 0) \
- || __builtin_expect (ch == 0xfe, 0) \
- || __builtin_expect (ch == 0xff, 0)) \
+ if (__glibc_unlikely (ch == 0x80) \
+ || __glibc_unlikely (ch == 0xa0) \
+ || __glibc_unlikely (ch == 0xfd) \
+ || __glibc_unlikely (ch == 0xfe) \
+ || __glibc_unlikely (ch == 0xff)) \
{ \
/* This is an illegal character. */ \
STANDARD_FROM_LOOP_ERR_HANDLER (1); \
@@ -62,7 +62,7 @@
\
/* Use the IBM932 table for single byte. */ \
res = __ibm932sb_to_ucs4[ch]; \
- if (__builtin_expect (res == 0, 0) && ch != 0) \
+ if (__glibc_unlikely (res == 0) && ch != 0) \
{ \
/* Use the IBM932 table for double byte. */ \
if (__glibc_unlikely (inptr + 1 >= inend)) \
@@ -79,9 +79,9 @@
while (ch > rp2->end) \
++rp2; \
\
- if (__builtin_expect (ch < rp2->start, 0) \
+ if (__glibc_unlikely (ch < rp2->start) \
|| (res = __ibm932db_to_ucs4[ch + rp2->idx], \
- __builtin_expect (res, '\1') == 0 && ch !=0)) \
+ __glibc_unlikely (res == 0) && ch !=0)) \
{ \
/* This is an illegal character. */ \
STANDARD_FROM_LOOP_ERR_HANDLER (2); \
@@ -146,10 +146,10 @@
++rp; \
\
/* Use the UCS4 table for single byte. */ \
- if (__builtin_expect (rp == NULL, 0) \
- || __builtin_expect (ch < rp->start, 0) \
+ if (__glibc_unlikely (rp == NULL) \
+ || __glibc_unlikely (ch < rp->start) \
|| (sc = __ucs4_to_ibm932sb[ch + rp->idx], \
- __builtin_expect (sc, '\1') == '\0' && ch != L'\0')) \
+ __glibc_unlikely (sc == '\0') && ch != L'\0')) \
{ \
\
/* Use the UCS4 table for double byte. */ \
diff --git a/iconvdata/ibm933.c b/iconvdata/ibm933.c
index 461fb5e..535fa9e 100644
--- a/iconvdata/ibm933.c
+++ b/iconvdata/ibm933.c
@@ -102,7 +102,7 @@ enum
uint32_t ch = *inptr; \
uint32_t res; \
\
- if (__builtin_expect (ch, 0) == SO) \
+ if (__glibc_unlikely (ch) == SO) \
{ \
/* Shift OUT, change to DBCS converter. */ \
if (curcs == db) \
@@ -114,7 +114,7 @@ enum
++inptr; \
continue; \
} \
- else if (__builtin_expect (ch, 0) == SI) \
+ else if (__glibc_unlikely (ch) == SI) \
{ \
/* Shift IN, change to SBCS converter. */ \
if (curcs == sb) \
@@ -131,7 +131,7 @@ enum
{ \
/* Use the IBM933 table for single byte. */ \
res = __ibm933sb_to_ucs4[ch]; \
- if (__builtin_expect (res, L'\1') == L'\0' && ch != '\0') \
+ if (__glibc_unlikely (res == L'\0') && ch != '\0') \
{ \
/* This is an illegal character. */ \
STANDARD_FROM_LOOP_ERR_HANDLER (1); \
@@ -162,10 +162,10 @@ enum
while (ch > rp2->end) \
++rp2; \
\
- if (__builtin_expect (rp2->start == 0xffff, 0) \
- || __builtin_expect (ch < rp2->start, 0) \
+ if (__glibc_unlikely (rp2->start == 0xffff) \
+ || __glibc_unlikely (ch < rp2->start) \
|| (res = __ibm933db_to_ucs4[ch + rp2->idx], \
- __builtin_expect (res, L'\1') == L'\0' && ch != '\0')) \
+ __glibc_unlikely (res == L'\0') && ch != '\0')) \
{ \
/* This is an illegal character. */ \
STANDARD_FROM_LOOP_ERR_HANDLER (2); \
@@ -208,17 +208,17 @@ enum
++rp1; \
\
/* Use the UCS4 table for single byte. */ \
- if (__builtin_expect (ch < rp1->start, 0) \
+ if (__glibc_unlikely (ch < rp1->start) \
|| (cp = __ucs4_to_ibm933sb[ch + rp1->idx], \
- __builtin_expect (cp[0], L'\1') == L'\0' && ch != '\0')) \
+ __glibc_unlikely (cp[0] == L'\0') && ch != '\0')) \
{ \
/* Use the UCS4 table for double byte. */ \
while (ch > rp2->end) \
++rp2; \
\
- if (__builtin_expect (ch < rp2->start, 0) \
+ if (__glibc_unlikely (ch < rp2->start) \
|| (cp = __ucs4_to_ibm933db[ch + rp2->idx], \
- __builtin_expect (cp[0], L'\1')==L'\0' && ch != '\0')) \
+ __glibc_unlikely (cp[0] == L'\0') && ch != '\0')) \
{ \
/* This is an illegal character. */ \
STANDARD_TO_LOOP_ERR_HANDLER (4); \
diff --git a/iconvdata/ibm935.c b/iconvdata/ibm935.c
index 132d816..9c3b0db 100644
--- a/iconvdata/ibm935.c
+++ b/iconvdata/ibm935.c
@@ -102,7 +102,7 @@ enum
uint32_t ch = *inptr; \
uint32_t res; \
\
- if (__builtin_expect(ch, 0) == SO) \
+ if (__glibc_unlikely (ch) == SO) \
{ \
/* Shift OUT, change to DBCS converter. */ \
if (curcs == db) \
@@ -114,7 +114,7 @@ enum
++inptr; \
continue; \
} \
- else if (__builtin_expect (ch, 0) == SI) \
+ else if (__glibc_unlikely (ch) == SI) \
{ \
/* Shift IN, change to SBCS converter. */ \
if (curcs == sb) \
@@ -131,7 +131,7 @@ enum
{ \
/* Use the IBM935 table for single byte. */ \
res = __ibm935sb_to_ucs4[ch]; \
- if (__builtin_expect (res, L'\1') == L'\0' && ch != '\0') \
+ if (__glibc_unlikely (res == L'\0') && ch != '\0') \
{ \
/* This is an illegal character. */ \
STANDARD_FROM_LOOP_ERR_HANDLER (1); \
@@ -162,10 +162,10 @@ enum
while (ch > rp2->end) \
++rp2; \
\
- if (__builtin_expect (rp2->start == 0xffff, 0) \
- || __builtin_expect (ch < rp2->start, 0) \
+ if (__glibc_unlikely (rp2->start == 0xffff) \
+ || __glibc_unlikely (ch < rp2->start) \
|| (res = __ibm935db_to_ucs4[ch + rp2->idx], \
- __builtin_expect (res, L'\1') == L'\0' && ch != '\0')) \
+ __glibc_unlikely (res == L'\0') && ch != '\0')) \
{ \
/* This is an illegal character. */ \
STANDARD_FROM_LOOP_ERR_HANDLER (2); \
@@ -208,17 +208,17 @@ enum
++rp1; \
\
/* Use the UCS4 table for single byte. */ \
- if (__builtin_expect (ch < rp1->start, 0) \
+ if (__glibc_unlikely (ch < rp1->start) \
|| (cp = __ucs4_to_ibm935sb[ch + rp1->idx], \
- __builtin_expect (cp[0], L'\1') == L'\0' && ch != '\0')) \
+ __glibc_unlikely (cp[0] == L'\0') && ch != '\0')) \
{ \
/* Use the UCS4 table for double byte. */ \
while (ch > rp2->end) \
++rp2; \
\
- if (__builtin_expect (ch < rp2->start, 0) \
+ if (__glibc_unlikely (ch < rp2->start) \
|| (cp = __ucs4_to_ibm935db[ch + rp2->idx], \
- __builtin_expect (cp[0], L'\1')==L'\0' && ch != '\0')) \
+ __glibc_unlikely (cp[0] == L'\0') && ch != '\0')) \
{ \
/* This is an illegal character. */ \
STANDARD_TO_LOOP_ERR_HANDLER (4); \
diff --git a/iconvdata/ibm937.c b/iconvdata/ibm937.c
index 69b154d..76bc0e0 100644
--- a/iconvdata/ibm937.c
+++ b/iconvdata/ibm937.c
@@ -102,7 +102,7 @@ enum
uint32_t ch = *inptr; \
uint32_t res; \
\
- if (__builtin_expect (ch, 0) == SO) \
+ if (__glibc_unlikely (ch) == SO) \
{ \
/* Shift OUT, change to DBCS converter. */ \
if (curcs == db) \
@@ -114,7 +114,7 @@ enum
++inptr; \
continue; \
} \
- else if (__builtin_expect (ch, 0) == SI) \
+ else if (__glibc_unlikely (ch) == SI) \
{ \
/* Shift IN, change to SBCS converter. */ \
if (curcs == sb) \
@@ -131,7 +131,7 @@ enum
{ \
/* Use the IBM937 table for single byte. */ \
res = __ibm937sb_to_ucs4[ch]; \
- if (__builtin_expect (res, L'\1') == L'\0' && ch != '\0') \
+ if (__glibc_unlikely (res == L'\0') && ch != '\0') \
{ \
/* This is an illegal character. */ \
STANDARD_FROM_LOOP_ERR_HANDLER (1); \
@@ -162,10 +162,10 @@ enum
while (ch > rp2->end) \
++rp2; \
\
- if (__builtin_expect (rp2->start == 0xffff, 0) \
- || __builtin_expect (ch < rp2->start, 0) \
+ if (__glibc_unlikely (rp2->start == 0xffff) \
+ || __glibc_unlikely (ch < rp2->start) \
|| (res = __ibm937db_to_ucs4[ch + rp2->idx], \
- __builtin_expect (res, L'\1') == L'\0' && ch != '\0')) \
+ __glibc_unlikely (res == L'\0') && ch != '\0')) \
{ \
/* This is an illegal character. */ \
STANDARD_FROM_LOOP_ERR_HANDLER (2); \
@@ -208,17 +208,17 @@ enum
++rp1; \
\
/* Use the UCS4 table for single byte. */ \
- if (__builtin_expect (ch < rp1->start, 0) \
+ if (__glibc_unlikely (ch < rp1->start) \
|| (cp = __ucs4_to_ibm937sb[ch + rp1->idx], \
- __builtin_expect (cp[0], L'\1') == L'\0' && ch != '\0')) \
+ __glibc_unlikely (cp[0] == L'\0') && ch != '\0')) \
{ \
/* Use the UCS4 table for double byte. */ \
while (ch > rp2->end) \
++rp2; \
\
- if (__builtin_expect (ch < rp2->start, 0) \
+ if (__glibc_unlikely (ch < rp2->start) \
|| (cp = __ucs4_to_ibm937db[ch + rp2->idx], \
- __builtin_expect (cp[0], L'\1')==L'\0' && ch != '\0')) \
+ __glibc_unlikely (cp[0] == L'\0') && ch != '\0')) \
{ \
/* This is an illegal character. */ \
STANDARD_TO_LOOP_ERR_HANDLER (4); \
diff --git a/iconvdata/ibm939.c b/iconvdata/ibm939.c
index 9936e2c..b4d60f6 100644
--- a/iconvdata/ibm939.c
+++ b/iconvdata/ibm939.c
@@ -102,7 +102,7 @@ enum
uint32_t ch = *inptr; \
uint32_t res; \
\
- if (__builtin_expect (ch, 0) == SO) \
+ if (__glibc_unlikely (ch) == SO) \
{ \
/* Shift OUT, change to DBCS converter. */ \
if (curcs == db) \
@@ -114,7 +114,7 @@ enum
++inptr; \
continue; \
} \
- else if (__builtin_expect (ch, 0) == SI) \
+ else if (__glibc_unlikely (ch) == SI) \
{ \
/* Shift IN, change to SBCS converter. */ \
if (curcs == sb) \
@@ -131,7 +131,7 @@ enum
{ \
/* Use the IBM939 table for single byte. */ \
res = __ibm939sb_to_ucs4[ch]; \
- if (__builtin_expect (res == L'\0', 0) && ch != '\0') \
+ if (__glibc_unlikely (res == L'\0') && ch != '\0') \
{ \
/* This is an illegal character. */ \
STANDARD_FROM_LOOP_ERR_HANDLER (1); \
@@ -162,10 +162,10 @@ enum
while (ch > rp2->end) \
++rp2; \
\
- if (__builtin_expect (rp2->start == 0xffff, 0) \
- || __builtin_expect (ch < rp2->start, 0) \
+ if (__glibc_unlikely (rp2->start == 0xffff) \
+ || __glibc_unlikely (ch < rp2->start) \
|| (res = __ibm939db_to_ucs4[ch + rp2->idx], \
- __builtin_expect (res, L'\1') == L'\0' && ch != '\0')) \
+ __glibc_unlikely (res == L'\0') && ch != '\0')) \
{ \
/* This is an illegal character. */ \
STANDARD_FROM_LOOP_ERR_HANDLER (2); \
@@ -207,17 +207,17 @@ enum
++rp1; \
\
/* Use the UCS4 table for single byte. */ \
- if (__builtin_expect (ch < rp1->start, 0) \
+ if (__glibc_unlikely (ch < rp1->start) \
|| (cp = __ucs4_to_ibm939sb[ch + rp1->idx], \
- __builtin_expect (cp[0], L'\1') == L'\0' && ch != '\0')) \
+ __glibc_unlikely (cp[0] == L'\0') && ch != '\0')) \
{ \
/* Use the UCS4 table for double byte. */ \
while (ch > rp2->end) \
++rp2; \
\
- if (__builtin_expect (ch < rp2->start, 0) \
+ if (__glibc_unlikely (ch < rp2->start) \
|| (cp = __ucs4_to_ibm939db[ch + rp2->idx], \
- __builtin_expect (cp[0], L'\1')==L'\0' && ch != '\0')) \
+ __glibc_unlikely (cp[0] == L'\0') && ch != '\0')) \
{ \
/* This is an illegal character. */ \
ibm939_invalid_char: \
diff --git a/iconvdata/ibm943.c b/iconvdata/ibm943.c
index c5d5742..fc12db7 100644
--- a/iconvdata/ibm943.c
+++ b/iconvdata/ibm943.c
@@ -50,20 +50,20 @@
uint32_t ch = *inptr; \
uint32_t res; \
\
- if (__builtin_expect (ch == 0x80, 0) \
- || __builtin_expect (ch == 0xa0, 0) \
- || __builtin_expect (ch == 0xfd, 0) \
- || __builtin_expect (ch == 0xfe, 0) \
- || __builtin_expect (ch == 0xff, 0)) \
+ if (__glibc_unlikely (ch == 0x80) \
+ || __glibc_unlikely (ch == 0xa0) \
+ || __glibc_unlikely (ch == 0xfd) \
+ || __glibc_unlikely (ch == 0xfe) \
+ || __glibc_unlikely (ch == 0xff)) \
{ \
/* This is an illegal character. */ \
STANDARD_FROM_LOOP_ERR_HANDLER (1); \
} \
\
/* Use the IBM943 table for single byte. */ \
- if (__builtin_expect (ch > 0xdf, 0) \
+ if (__glibc_unlikely (ch > 0xdf) \
|| (res = __ibm943sb_to_ucs4[ch], \
- __builtin_expect (res == 0, 0) && ch != 0)) \
+ __glibc_unlikely (res == 0) && ch != 0)) \
{ \
/* Use the IBM943 table for double byte. */ \
if (__glibc_unlikely (inptr + 1 >= inend)) \
@@ -80,9 +80,9 @@
while (ch > rp2->end) \
++rp2; \
\
- if (__builtin_expect (ch < rp2->start, 0) \
+ if (__glibc_unlikely (ch < rp2->start) \
|| (res = __ibm943db_to_ucs4[ch + rp2->idx], \
- __builtin_expect (res, '\1') == 0 && ch !=0)) \
+ __glibc_unlikely (res == 0) && ch !=0)) \
{ \
/* This is an illegal character. */ \
STANDARD_FROM_LOOP_ERR_HANDLER (2); \
@@ -147,10 +147,10 @@
++rp; \
\
/* Use the UCS4 table for single byte. */ \
- if (__builtin_expect (rp == NULL, 0) \
- || __builtin_expect (ch < rp->start, 0) \
+ if (__glibc_unlikely (rp == NULL) \
+ || __glibc_unlikely (ch < rp->start) \
|| (sc = __ucs4_to_ibm943sb[ch + rp->idx], \
- __builtin_expect (sc, '\1') == '\0' && ch != L'\0')) \
+ __glibc_unlikely (sc == '\0') && ch != L'\0')) \
{ \
\
/* Use the UCS4 table for double byte. */ \
diff --git a/iconvdata/iso-2022-cn.c b/iconvdata/iso-2022-cn.c
index 5434ef4..e9313cc 100644
--- a/iconvdata/iso-2022-cn.c
+++ b/iconvdata/iso-2022-cn.c
@@ -126,22 +126,22 @@ enum
STANDARD_FROM_LOOP_ERR_HANDLER (1); \
\
/* Recognize escape sequences. */ \
- if (__builtin_expect (ch, 0) == ESC) \
+ if (__glibc_unlikely (ch) == ESC) \
{ \
/* There are two kinds of escape sequences we have to handle: \
- those announcing the use of GB and CNS characters on the \
line; we can simply ignore them \
- the initial byte of the SS2 sequence. \
*/ \
- if (__builtin_expect (inptr + 2 > inend, 0) \
+ if (__glibc_unlikely (inptr + 2 > inend) \
|| (inptr[1] == '$' \
- && (__builtin_expect (inptr + 3 > inend, 0) \
+ && (__glibc_unlikely (inptr + 3 > inend) \
|| (inptr[2] == ')' \
- && __builtin_expect (inptr + 4 > inend, 0)) \
+ && __glibc_unlikely (inptr + 4 > inend)) \
|| (inptr[2] == '*' \
- && __builtin_expect (inptr + 4 > inend, 0)))) \
+ && __glibc_unlikely (inptr + 4 > inend)))) \
|| (inptr[1] == SS2_1 \
- && __builtin_expect (inptr + 4 > inend, 0))) \
+ && __glibc_unlikely (inptr + 4 > inend))) \
{ \
result = __GCONV_INCOMPLETE_INPUT; \
break; \
@@ -159,7 +159,7 @@ enum
continue; \
} \
} \
- else if (__builtin_expect (ch, 0) == SO) \
+ else if (__glibc_unlikely (ch) == SO) \
{ \
/* Switch to use GB2312 or CNS 11643 plane 1, depending on which \
S0 designation came last. The only problem is what to do with \
@@ -170,7 +170,7 @@ enum
set = ann == CNS11643_1_ann ? CNS11643_1_set : GB2312_set; \
continue; \
} \
- else if (__builtin_expect (ch, 0) == SI) \
+ else if (__glibc_unlikely (ch) == SI) \
{ \
/* Switch to use ASCII. */ \
++inptr; \
@@ -178,14 +178,14 @@ enum
continue; \
} \
\
- if (__builtin_expect (ch, 0) == ESC && inptr[1] == SS2_1) \
+ if (__glibc_unlikely (ch) == ESC && inptr[1] == SS2_1) \
{ \
/* This is a character from CNS 11643 plane 2. \
XXX We could test here whether the use of this character \
set was announced. */ \
inptr += 2; \
ch = cns11643l2_to_ucs4 (&inptr, 2, 0); \
- if (__builtin_expect (ch, 0) == __UNKNOWN_10646_CHAR) \
+ if (__glibc_unlikely (ch) == __UNKNOWN_10646_CHAR) \
{ \
inptr -= 2; \
STANDARD_FROM_LOOP_ERR_HANDLER (2); \
@@ -207,12 +207,12 @@ enum
ch = cns11643l1_to_ucs4 (&inptr, inend - inptr, 0); \
} \
\
- if (__builtin_expect (ch, 1) == 0) \
+ if (__glibc_likely (ch) == 0) \
{ \
result = __GCONV_INCOMPLETE_INPUT; \
break; \
} \
- else if (__builtin_expect (ch, 1) == __UNKNOWN_10646_CHAR) \
+ else if (__glibc_likely (ch) == __UNKNOWN_10646_CHAR) \
{ \
STANDARD_FROM_LOOP_ERR_HANDLER (1); \
} \
@@ -297,7 +297,7 @@ enum
else \
written = ucs4_to_gb2312 (ch, buf, 2); \
\
- if (__builtin_expect (written, 0) != __UNKNOWN_10646_CHAR) \
+ if (__glibc_unlikely (written) != __UNKNOWN_10646_CHAR) \
/* Oh well, then switch SO. */ \
used = GB2312_set + CNS11643_1_set - used; \
else \
diff --git a/iconvdata/iso-2022-jp-3.c b/iconvdata/iso-2022-jp-3.c
index 4b4ea01..7c13ad8 100644
--- a/iconvdata/iso-2022-jp-3.c
+++ b/iconvdata/iso-2022-jp-3.c
@@ -161,9 +161,9 @@ enum
ends we terminate with an error since we must not risk missing \
an escape sequence just because it is not entirely in the \
current input buffer. */ \
- if (__builtin_expect (inptr + 2 >= inend, 0) \
+ if (__glibc_unlikely (inptr + 2 >= inend) \
|| (inptr[1] == '$' && inptr[2] == '(' \
- && __builtin_expect (inptr + 3 >= inend, 0))) \
+ && __glibc_unlikely (inptr + 3 >= inend))) \
{ \
/* Not enough input available. */ \
result = __GCONV_INCOMPLETE_INPUT; \
@@ -722,7 +722,7 @@ static const struct
{ \
if (set != JISX0201_Kana_set) \
{ \
- if (__builtin_expect (outptr + 3 > outend, 0)) \
+ if (__glibc_unlikely (outptr + 3 > outend)) \
{ \
result = __GCONV_FULL_OUTPUT; \
break; \
diff --git a/iconvdata/iso-2022-jp.c b/iconvdata/iso-2022-jp.c
index 88ca5bb..65a0663 100644
--- a/iconvdata/iso-2022-jp.c
+++ b/iconvdata/iso-2022-jp.c
@@ -269,16 +269,16 @@ gconv_end (struct __gconv_step *data)
uint32_t ch = *inptr; \
\
/* Recognize escape sequences. */ \
- if (__builtin_expect (ch, 0) == ESC) \
+ if (__glibc_unlikely (ch) == ESC) \
{ \
/* We now must be prepared to read two to three more \
characters. If we have a match in the first character but \
then the input buffer ends we terminate with an error since \
we must not risk missing an escape sequence just because it \
is not entirely in the current input buffer. */ \
- if (__builtin_expect (inptr + 2 >= inend, 0) \
+ if (__glibc_unlikely (inptr + 2 >= inend) \
|| (var == iso2022jp2 && inptr[1] == '$' && inptr[2] == '(' \
- && __builtin_expect (inptr + 3 >= inend, 0))) \
+ && __glibc_unlikely (inptr + 3 >= inend))) \
{ \
/* Not enough input available. */ \
result = __GCONV_INCOMPLETE_INPUT; \
@@ -560,7 +560,7 @@ static const cvlist_t conversion_lists[4] =
have to be known whether the last line ended using ASCII or \
JIS X 0201. */ \
else if (set == JISX0201_Roman_set \
- && (__builtin_expect (tag == TAG_none, 1) \
+ && (__glibc_likely (tag == TAG_none) \
|| tag == TAG_language_ja)) \
{ \
unsigned char buf[1]; \
@@ -577,7 +577,7 @@ static const cvlist_t conversion_lists[4] =
} \
} \
else if (set == JISX0201_Kana_set \
- && (__builtin_expect (tag == TAG_none, 1) \
+ && (__glibc_likely (tag == TAG_none) \
|| tag == TAG_language_ja)) \
{ \
unsigned char buf[1]; \
@@ -596,19 +596,19 @@ static const cvlist_t conversion_lists[4] =
else \
{ \
if ((set == JISX0208_1978_set || set == JISX0208_1983_set) \
- && (__builtin_expect (tag == TAG_none, 1) \
+ && (__glibc_likely (tag == TAG_none) \
|| tag == TAG_language_ja)) \
written = ucs4_to_jisx0208 (ch, outptr, outend - outptr); \
else if (set == JISX0212_set \
- && (__builtin_expect (tag == TAG_none, 1) \
+ && (__glibc_likely (tag == TAG_none) \
|| tag == TAG_language_ja)) \
written = ucs4_to_jisx0212 (ch, outptr, outend - outptr); \
else if (set == GB2312_set \
- && (__builtin_expect (tag == TAG_none, 1) \
+ && (__glibc_likely (tag == TAG_none) \
|| tag == TAG_language_zh)) \
written = ucs4_to_gb2312 (ch, outptr, outend - outptr); \
else if (set == KSC5601_set \
- && (__builtin_expect (tag == TAG_none, 1) \
+ && (__glibc_likely (tag == TAG_none) \
|| tag == TAG_language_ko)) \
written = ucs4_to_ksc5601 (ch, outptr, outend - outptr); \
else \
@@ -624,7 +624,7 @@ static const cvlist_t conversion_lists[4] =
} \
\
if (written == __UNKNOWN_10646_CHAR \
- && __builtin_expect (tag == TAG_none, 1)) \
+ && __glibc_likely (tag == TAG_none)) \
{ \
if (set2 == ISO88591_set) \
{ \
@@ -732,7 +732,7 @@ static const cvlist_t conversion_lists[4] =
{ \
if (set2 != ISO88591_set) \
{ \
- if (__builtin_expect (outptr + 3 > outend, 0)) \
+ if (__glibc_unlikely (outptr + 3 > outend)) \
{ \
res = __GCONV_FULL_OUTPUT; \
break; \
@@ -781,7 +781,7 @@ static const cvlist_t conversion_lists[4] =
set2 = ISO88597_set; \
} \
\
- if (__builtin_expect (outptr + 3 > outend, 0)) \
+ if (__glibc_unlikely (outptr + 3 > outend)) \
{ \
res = __GCONV_FULL_OUTPUT; \
break; \
@@ -806,7 +806,7 @@ static const cvlist_t conversion_lists[4] =
{ \
if (set != JISX0201_Roman_set) \
{ \
- if (__builtin_expect (outptr + 3 > outend, 0)) \
+ if (__glibc_unlikely (outptr + 3 > outend)) \
{ \
res = __GCONV_FULL_OUTPUT; \
break; \
@@ -833,7 +833,7 @@ static const cvlist_t conversion_lists[4] =
{ \
if (set != JISX0208_1983_set) \
{ \
- if (__builtin_expect (outptr + 3 > outend, 0)) \
+ if (__glibc_unlikely (outptr + 3 > outend)) \
{ \
res = __GCONV_FULL_OUTPUT; \
break; \
@@ -865,7 +865,7 @@ static const cvlist_t conversion_lists[4] =
{ \
if (set != JISX0212_set) \
{ \
- if (__builtin_expect (outptr + 4 > outend, 0)) \
+ if (__glibc_unlikely (outptr + 4 > outend)) \
{ \
res = __GCONV_FULL_OUTPUT; \
break; \
@@ -899,7 +899,7 @@ static const cvlist_t conversion_lists[4] =
{ \
if (set != GB2312_set) \
{ \
- if (__builtin_expect (outptr + 3 > outend, 0)) \
+ if (__glibc_unlikely (outptr + 3 > outend)) \
{ \
res = __GCONV_FULL_OUTPUT; \
break; \
@@ -932,7 +932,7 @@ static const cvlist_t conversion_lists[4] =
{ \
if (set != KSC5601_set) \
{ \
- if (__builtin_expect (outptr + 4 > outend, 0)) \
+ if (__glibc_unlikely (outptr + 4 > outend)) \
{ \
res = __GCONV_FULL_OUTPUT; \
break; \
@@ -968,7 +968,7 @@ static const cvlist_t conversion_lists[4] =
{ \
if (set != JISX0201_Kana_set) \
{ \
- if (__builtin_expect (outptr + 3 > outend, 0)) \
+ if (__glibc_unlikely (outptr + 3 > outend)) \
{ \
res = __GCONV_FULL_OUTPUT; \
break; \
diff --git a/iconvdata/iso-2022-kr.c b/iconvdata/iso-2022-kr.c
index c1babc8..15a3e1b 100644
--- a/iconvdata/iso-2022-kr.c
+++ b/iconvdata/iso-2022-kr.c
@@ -123,17 +123,17 @@ enum
STANDARD_FROM_LOOP_ERR_HANDLER (1); \
\
/* Recognize escape sequences. */ \
- if (__builtin_expect (ch, 0) == ESC) \
+ if (__glibc_unlikely (ch) == ESC) \
{ \
/* We don't really have to handle escape sequences since all the \
switching is done using the SI and SO bytes. But we have to \
recognize `Esc $ ) C' since this is a kind of flag for this \
encoding. We simply ignore it. */ \
- if (__builtin_expect (inptr + 2 > inend, 0) \
+ if (__glibc_unlikely (inptr + 2 > inend) \
|| (inptr[1] == '$' \
- && (__builtin_expect (inptr + 3 > inend, 0) \
+ && (__glibc_unlikely (inptr + 3 > inend) \
|| (inptr[2] == ')' \
- && __builtin_expect (inptr + 4 > inend, 0))))) \
+ && __glibc_unlikely (inptr + 4 > inend))))) \
{ \
result = __GCONV_INCOMPLETE_INPUT; \
break; \
@@ -145,14 +145,14 @@ enum
continue; \
} \
} \
- else if (__builtin_expect (ch, 0) == SO) \
+ else if (__glibc_unlikely (ch) == SO) \
{ \
/* Switch to use KSC. */ \
++inptr; \
set = KSC5601_set; \
continue; \
} \
- else if (__builtin_expect (ch, 0) == SI) \
+ else if (__glibc_unlikely (ch) == SI) \
{ \
/* Switch to use ASCII. */ \
++inptr; \
@@ -226,7 +226,7 @@ enum
asm ("" : "=m" (buf)); \
\
size_t written = ucs4_to_ksc5601 (ch, buf, 2); \
- if (__builtin_expect (written, 0) == __UNKNOWN_10646_CHAR) \
+ if (__glibc_unlikely (written) == __UNKNOWN_10646_CHAR) \
{ \
UNICODE_TAG_HANDLER (ch, 4); \
\
diff --git a/iconvdata/iso_6937-2.c b/iconvdata/iso_6937-2.c
index 9090e6f..7488ca5 100644
--- a/iconvdata/iso_6937-2.c
+++ b/iconvdata/iso_6937-2.c
@@ -392,7 +392,7 @@ static const char from_ucs4[][2] =
{ \
uint32_t ch = *inptr; \
\
- if (__builtin_expect (ch >= 0xc1, 0) && ch <= 0xcf) \
+ if (__glibc_unlikely (ch >= 0xc1) && ch <= 0xcf) \
{ \
/* Composed character. First test whether the next byte \
is also available. */ \
@@ -408,8 +408,8 @@ static const char from_ucs4[][2] =
\
ch2 = inptr[1]; \
\
- if (__builtin_expect (ch2 < 0x20, 0) \
- || __builtin_expect (ch2 >= 0x80, 0)) \
+ if (__glibc_unlikely (ch2 < 0x20) \
+ || __glibc_unlikely (ch2 >= 0x80)) \
{ \
/* This is illegal. */ \
STANDARD_FROM_LOOP_ERR_HANDLER (1); \
@@ -429,7 +429,7 @@ static const char from_ucs4[][2] =
{ \
ch = to_ucs4[ch]; \
\
- if (__builtin_expect (ch == 0, 0) && *inptr != '\0') \
+ if (__glibc_unlikely (ch == 0) && *inptr != '\0') \
{ \
/* This is an illegal character. */ \
STANDARD_FROM_LOOP_ERR_HANDLER (1); \
@@ -524,7 +524,7 @@ static const char from_ucs4[][2] =
STANDARD_TO_LOOP_ERR_HANDLER (4); \
} \
} \
- else if (__builtin_expect (from_ucs4[ch][0] == '\0', 0) && ch != 0) \
+ else if (__glibc_unlikely (from_ucs4[ch][0] == '\0') && ch != 0) \
{ \
/* Illegal characters. */ \
STANDARD_TO_LOOP_ERR_HANDLER (4); \
diff --git a/iconvdata/iso_6937.c b/iconvdata/iso_6937.c
index 04841bd..d02744e 100644
--- a/iconvdata/iso_6937.c
+++ b/iconvdata/iso_6937.c
@@ -392,7 +392,7 @@ static const char from_ucs4[][2] =
{ \
uint32_t ch = *inptr; \
\
- if (__builtin_expect (ch >= 0xc1, 0) && ch <= 0xcf) \
+ if (__glibc_unlikely (ch >= 0xc1) && ch <= 0xcf) \
{ \
/* Composed character. First test whether the next byte \
is also available. */ \
@@ -408,8 +408,8 @@ static const char from_ucs4[][2] =
\
ch2 = inptr[1]; \
\
- if (__builtin_expect (ch2 < 0x20, 0) \
- || __builtin_expect (ch2 >= 0x80, 0)) \
+ if (__glibc_unlikely (ch2 < 0x20) \
+ || __glibc_unlikely (ch2 >= 0x80)) \
{ \
/* This is illegal. */ \
STANDARD_FROM_LOOP_ERR_HANDLER (1); \
@@ -429,7 +429,7 @@ static const char from_ucs4[][2] =
{ \
ch = to_ucs4[ch]; \
\
- if (__builtin_expect (ch == 0, 0) && *inptr != '\0') \
+ if (__glibc_unlikely (ch == 0) && *inptr != '\0') \
{ \
/* This is an illegal character. */ \
STANDARD_FROM_LOOP_ERR_HANDLER (1); \
@@ -526,7 +526,7 @@ static const char from_ucs4[][2] =
STANDARD_TO_LOOP_ERR_HANDLER (4); \
} \
} \
- else if (__builtin_expect (from_ucs4[ch][0] == '\0', 0) && ch != 0) \
+ else if (__glibc_unlikely (from_ucs4[ch][0] == '\0') && ch != 0) \
{ \
/* Illegal characters. */ \
STANDARD_TO_LOOP_ERR_HANDLER (4); \
diff --git a/iconvdata/johab.c b/iconvdata/johab.c
index 01375e3..47c0916 100644
--- a/iconvdata/johab.c
+++ b/iconvdata/johab.c
@@ -178,10 +178,10 @@ johab_sym_hanja_to_ucs (uint_fast32_t idx, uint_fast32_t c1, uint_fast32_t c2)
0xd831-0xd87e and 0xd891-0xd8fe are user-defined area */ \
else \
{ \
- if (__builtin_expect (ch > 0xf9, 0) \
- || __builtin_expect (ch == 0xdf, 0) \
- || (__builtin_expect (ch > 0x7e, 0) && ch < 0x84) \
- || (__builtin_expect (ch > 0xd3, 0) && ch < 0xd9)) \
+ if (__glibc_unlikely (ch > 0xf9) \
+ || __glibc_unlikely (ch == 0xdf) \
+ || (__glibc_unlikely (ch > 0x7e) && ch < 0x84) \
+ || (__glibc_unlikely (ch > 0xd3) && ch < 0xd9)) \
{ \
/* These are illegal. */ \
STANDARD_FROM_LOOP_ERR_HANDLER (1); \
@@ -212,9 +212,9 @@ johab_sym_hanja_to_ucs (uint_fast32_t idx, uint_fast32_t c1, uint_fast32_t c2)
m = mid[(idx & 0x03e0) >> 5]; \
f = final[idx & 0x001f]; \
\
- if (__builtin_expect (i == -1, 0) \
- || __builtin_expect (m == -1, 0) \
- || __builtin_expect (f == -1, 0)) \
+ if (__glibc_unlikely (i == -1) \
+ || __glibc_unlikely (m == -1) \
+ || __glibc_unlikely (f == -1)) \
{ \
/* This is illegal. */ \
STANDARD_FROM_LOOP_ERR_HANDLER (1); \
@@ -226,7 +226,7 @@ johab_sym_hanja_to_ucs (uint_fast32_t idx, uint_fast32_t c1, uint_fast32_t c2)
else if (i == 0 && m > 0 && f == 0) \
ch = 0x314e + m; /* 0x314f + m - 1 */ \
else if (__glibc_likely ((i | m) == 0) \
- && __builtin_expect (f > 0, 1)) \
+ && __glibc_likely (f > 0)) \
ch = final_to_ucs[f - 1]; /* round trip?? */ \
else \
{ \
@@ -236,13 +236,13 @@ johab_sym_hanja_to_ucs (uint_fast32_t idx, uint_fast32_t c1, uint_fast32_t c2)
} \
else \
{ \
- if (__builtin_expect (ch2 < 0x31, 0) \
- || (__builtin_expect (ch2 > 0x7e, 0) && ch2 < 0x91) \
- || __builtin_expect (ch2, 0) == 0xff \
- || (__builtin_expect (ch, 0) == 0xd9 && ch2 > 0xe8) \
- || (__builtin_expect (ch, 0) == 0xda \
+ if (__glibc_unlikely (ch2 < 0x31) \
+ || (__glibc_unlikely (ch2 > 0x7e) && ch2 < 0x91) \
+ || __glibc_unlikely (ch2) == 0xff \
+ || (__glibc_unlikely (ch) == 0xd9 && ch2 > 0xe8) \
+ || (__glibc_unlikely (ch) == 0xda \
&& ch2 > 0xa0 && ch2 < 0xd4) \
- || (__builtin_expect (ch, 0) == 0xde && ch2 > 0xf1)) \
+ || (__glibc_unlikely (ch) == 0xde && ch2 > 0xf1)) \
{ \
/* This is illegal. */ \
STANDARD_FROM_LOOP_ERR_HANDLER (1); \
@@ -351,7 +351,7 @@ johab_sym_hanja_to_ucs (uint_fast32_t idx, uint_fast32_t c1, uint_fast32_t c2)
uint32_t temp; \
\
written = ucs4_to_ksc5601_hanja (ch, outptr, outend - outptr); \
- if (__builtin_expect (written, 1) == 0) \
+ if (__glibc_likely (written) == 0) \
{ \
result = __GCONV_FULL_OUTPUT; \
break; \
@@ -380,12 +380,12 @@ johab_sym_hanja_to_ucs (uint_fast32_t idx, uint_fast32_t c1, uint_fast32_t c2)
uint32_t temp; \
\
written = ucs4_to_ksc5601_sym (ch, outptr, outend - outptr); \
- if (__builtin_expect (written, 1) == 0) \
+ if (__glibc_likely (written) == 0) \
{ \
result = __GCONV_FULL_OUTPUT; \
break; \
} \
- if (__builtin_expect (written == __UNKNOWN_10646_CHAR, 0) \
+ if (__glibc_unlikely (written == __UNKNOWN_10646_CHAR) \
|| (outptr[0] == 0x22 && outptr[1] > 0x68)) \
{ \
UNICODE_TAG_HANDLER (ch, 4); \
diff --git a/iconvdata/sjis.c b/iconvdata/sjis.c
index 2590b33..9395459 100644
--- a/iconvdata/sjis.c
+++ b/iconvdata/sjis.c
@@ -4331,12 +4331,12 @@ static const char from_ucs4_extra[0x100][2] =
{ \
uint32_t ch = *inptr; \
\
- if (__builtin_expect (ch, 0) == 0x5c) \
+ if (__glibc_unlikely (ch) == 0x5c) \
{ \
ch = 0xa5; \
++inptr; \
} \
- else if (__builtin_expect (ch, 0) == 0x7e) \
+ else if (__glibc_unlikely (ch) == 0x7e) \
{ \
ch = 0x203e; \
++inptr; \
@@ -4348,9 +4348,9 @@ static const char from_ucs4_extra[0x100][2] =
ch += 0xfec0; \
++inptr; \
} \
- else if (__builtin_expect (ch > 0xea, 0) \
- || __builtin_expect (ch, 0) == 0xa0 \
- || __builtin_expect (ch <= 0x80, 0)) \
+ else if (__glibc_unlikely (ch > 0xea) \
+ || __glibc_unlikely (ch) == 0xa0 \
+ || __glibc_unlikely (ch <= 0x80)) \
{ \
/* These are illegal. */ \
STANDARD_FROM_LOOP_ERR_HANDLER (1); \
@@ -4377,10 +4377,10 @@ static const char from_ucs4_extra[0x100][2] =
/* This is illegal. */ \
STANDARD_FROM_LOOP_ERR_HANDLER (1); \
} \
- else if ((__builtin_expect (idx > 0x84be && idx < 0x889f, 0)) \
- || (__builtin_expect (idx > 0x88fc && idx < 0x8940, 0)) \
- || (__builtin_expect (idx > 0x9ffc && idx < 0xe040, 0)) \
- || __builtin_expect (idx > 0xeaa4, 0)) \
+ else if ((__glibc_unlikely (idx > 0x84be && idx < 0x889f)) \
+ || (__glibc_unlikely (idx > 0x88fc && idx < 0x8940)) \
+ || (__glibc_unlikely (idx > 0x9ffc && idx < 0xe040)) \
+ || __glibc_unlikely (idx > 0xeaa4)) \
{ \
/* This is illegal. */ \
STANDARD_FROM_LOOP_ERR_HANDLER (2); \
@@ -4446,8 +4446,8 @@ static const char from_ucs4_extra[0x100][2] =
cp = from_ucs4_greek[ch - 0x391]; \
else if (ch >= 0x2010 && ch <= 0x9fa0) \
cp = from_ucs4_cjk[ch - 0x02010]; \
- else if (__builtin_expect (ch >= 0xff01, 1) \
- && __builtin_expect (ch <= 0xffef, 1)) \
+ else if (__glibc_likely (ch >= 0xff01) \
+ && __glibc_likely (ch <= 0xffef)) \
cp = from_ucs4_extra[ch - 0xff00]; \
else \
{ \
@@ -4459,7 +4459,7 @@ static const char from_ucs4_extra[0x100][2] =
else \
cp = from_ucs4_lat1[ch]; \
\
- if (__builtin_expect (cp[0] == '\0', 0) && ch != 0) \
+ if (__glibc_unlikely (cp[0] == '\0') && ch != 0) \
{ \
/* Illegal character. */ \
STANDARD_TO_LOOP_ERR_HANDLER (4); \
diff --git a/iconvdata/t.61.c b/iconvdata/t.61.c
index 13f1f28..14ef857 100644
--- a/iconvdata/t.61.c
+++ b/iconvdata/t.61.c
@@ -385,7 +385,7 @@ static const char from_ucs4[][2] =
uint32_t ch = *inptr; \
int increment = 1; \
\
- if (__builtin_expect (ch >= 0xc1, 0) && ch <= 0xcf) \
+ if (__glibc_unlikely (ch >= 0xc1) && ch <= 0xcf) \
{ \
/* Composed character. First test whether the next byte \
is also available. */ \
@@ -400,8 +400,8 @@ static const char from_ucs4[][2] =
\
ch2 = inptr[1]; \
\
- if (__builtin_expect (ch2 < 0x20, 0) \
- || __builtin_expect (ch2 >= 0x80, 0)) \
+ if (__glibc_unlikely (ch2 < 0x20) \
+ || __glibc_unlikely (ch2 >= 0x80)) \
{ \
/* This is illegal. */ \
STANDARD_FROM_LOOP_ERR_HANDLER (1); \
@@ -414,7 +414,7 @@ static const char from_ucs4[][2] =
else \
ch = to_ucs4[ch]; \
\
- if (__builtin_expect (ch == 0, 0) && *inptr != '\0') \
+ if (__glibc_unlikely (ch == 0) && *inptr != '\0') \
{ \
/* This is an illegal character. */ \
STANDARD_FROM_LOOP_ERR_HANDLER (increment); \
@@ -450,13 +450,13 @@ static const char from_ucs4[][2] =
\
if (__glibc_unlikely (ch >= sizeof (from_ucs4) / sizeof (from_ucs4[0]))) \
{ \
- if (__builtin_expect (ch, 0) == 0x2126) \
+ if (__glibc_unlikely (ch) == 0x2126) \
cp = "\xe0"; \
- else if (__builtin_expect (ch, 0) == 0x2c7) \
+ else if (__glibc_unlikely (ch) == 0x2c7) \
cp = "\xcf\x20"; \
- else if (__builtin_expect (ch < 0x2d8, 0) \
- || __builtin_expect (ch > 0x2dd, 0) \
- || __builtin_expect (ch == 0x2dc, 0)) \
+ else if (__glibc_unlikely (ch < 0x2d8) \
+ || __glibc_unlikely (ch > 0x2dd) \
+ || __glibc_unlikely (ch == 0x2dc)) \
{ \
UNICODE_TAG_HANDLER (ch, 4); \
\
@@ -476,7 +476,7 @@ static const char from_ucs4[][2] =
{ \
cp = from_ucs4[ch]; \
\
- if (__builtin_expect (cp[0] == '\0', 0) && ch != 0) \
+ if (__glibc_unlikely (cp[0] == '\0') && ch != 0) \
{ \
/* Illegal. */ \
STANDARD_TO_LOOP_ERR_HANDLER (4); \
diff --git a/iconvdata/tcvn5712-1.c b/iconvdata/tcvn5712-1.c
index 5edc653..9add2e1 100644
--- a/iconvdata/tcvn5712-1.c
+++ b/iconvdata/tcvn5712-1.c
@@ -460,7 +460,7 @@ static const struct
\
/* If we don't have enough room to output ch as well, then deal \
with it in another round. */ \
- if (!must_buffer_ch && __builtin_expect (outptr + 4 > outend, 0)) \
+ if (!must_buffer_ch && __glibc_unlikely (outptr + 4 > outend)) \
continue; \
} \
\
diff --git a/iconvdata/tscii.c b/iconvdata/tscii.c
index 644cb96..2bd566c 100644
--- a/iconvdata/tscii.c
+++ b/iconvdata/tscii.c
@@ -347,7 +347,7 @@ static const uint32_t tscii_next_state[6] =
/* Retrieve the successor state. */ \
*statep = tscii_next_state[(*statep >> 4) & 0x0f]; \
} \
- while (*statep != 0 && __builtin_expect (outptr + 4 <= outend, 1)); \
+ while (*statep != 0 && __glibc_likely (outptr + 4 <= outend)); \
\
if (*statep != 0) \
{ \
diff --git a/iconvdata/uhc.c b/iconvdata/uhc.c
index 629f2d6..3494e1f 100644
--- a/iconvdata/uhc.c
+++ b/iconvdata/uhc.c
@@ -3064,9 +3064,9 @@ static const char uhc_hangul_from_ucs[11172][2] =
*/ \
if (ch <= 0x7f) \
++inptr; \
- else if (__builtin_expect (ch <= 0x80, 0) \
- || __builtin_expect (ch >= 0xfe, 0) \
- || __builtin_expect (ch == 0xc9, 0)) \
+ else if (__glibc_unlikely (ch <= 0x80) \
+ || __glibc_unlikely (ch >= 0xfe) \
+ || __glibc_unlikely (ch == 0xc9)) \
{ \
/* This is illegal. */ \
STANDARD_FROM_LOOP_ERR_HANDLER (1); \
@@ -3107,12 +3107,12 @@ static const char uhc_hangul_from_ucs[11172][2] =
\
if (ch < 0xa1 || ch2 < 0xa1) \
{ \
- if (__builtin_expect (ch > 0xc6, 0) \
- || __builtin_expect (ch2 < 0x41, 0) \
- || __builtin_expect (ch2 > 0xfe, 0) \
- || (__builtin_expect (ch2 > 0x5a, 0) && ch2 < 0x61) \
- || (__builtin_expect (ch2 > 0x7a, 0) && ch2 < 0x81) \
- || (__builtin_expect (ch == 0xc6, 0) && ch2 > 0x52)) \
+ if (__glibc_unlikely (ch > 0xc6) \
+ || __glibc_unlikely (ch2 < 0x41) \
+ || __glibc_unlikely (ch2 > 0xfe) \
+ || (__glibc_unlikely (ch2 > 0x5a) && ch2 < 0x61) \
+ || (__glibc_unlikely (ch2 > 0x7a) && ch2 < 0x81) \
+ || (__glibc_unlikely (ch == 0xc6) && ch2 > 0x52)) \
{ \
/* This is not legal. */ \
STANDARD_FROM_LOOP_ERR_HANDLER (1); \
@@ -3135,8 +3135,8 @@ static const char uhc_hangul_from_ucs[11172][2] =
else \
{ \
ch = ksc5601_to_ucs4 (&inptr, 2, 0x80); \
- if (__builtin_expect (ch == __UNKNOWN_10646_CHAR, 0) \
- || __builtin_expect (ch == 0x327e, 0)) \
+ if (__glibc_unlikely (ch == __UNKNOWN_10646_CHAR) \
+ || __glibc_unlikely (ch == 0x327e)) \
{ \
/* Illegal. */ \
STANDARD_FROM_LOOP_ERR_HANDLER (2); \
@@ -3208,8 +3208,8 @@ static const char uhc_hangul_from_ucs[11172][2] =
{ \
size_t written = ucs4_to_ksc5601_sym (ch, outptr, outend - outptr); \
\
- if (__builtin_expect (ch == 0x327e, 0) \
- || __builtin_expect (written == __UNKNOWN_10646_CHAR, 0)) \
+ if (__glibc_unlikely (ch == 0x327e) \
+ || __glibc_unlikely (written == __UNKNOWN_10646_CHAR)) \
{ \
UNICODE_TAG_HANDLER (ch, 4); \
STANDARD_TO_LOOP_ERR_HANDLER (4); \
diff --git a/iconvdata/utf-16.c b/iconvdata/utf-16.c
index 342de08..c4b2c48 100644
--- a/iconvdata/utf-16.c
+++ b/iconvdata/utf-16.c
@@ -285,7 +285,7 @@ gconv_end (struct __gconv_step *data)
{ \
u1 = bswap_16 (u1); \
\
- if (__builtin_expect (u1 < 0xd800, 1) || u1 > 0xdfff) \
+ if (__glibc_likely (u1 < 0xd800) || u1 > 0xdfff) \
{ \
/* No surrogate. */ \
put32 (outptr, u1); \
@@ -307,8 +307,8 @@ gconv_end (struct __gconv_step *data)
\
inptr += 2; \
u2 = bswap_16 (get16 (inptr)); \
- if (__builtin_expect (u2 < 0xdc00, 0) \
- || __builtin_expect (u2 > 0xdfff, 0)) \
+ if (__glibc_unlikely (u2 < 0xdc00) \
+ || __glibc_unlikely (u2 > 0xdfff)) \
{ \
/* This is no valid second word for a surrogate. */ \
inptr -= 2; \
@@ -321,7 +321,7 @@ gconv_end (struct __gconv_step *data)
} \
else \
{ \
- if (__builtin_expect (u1 < 0xd800, 1) || u1 > 0xdfff) \
+ if (__glibc_likely (u1 < 0xd800) || u1 > 0xdfff) \
{ \
/* No surrogate. */ \
put32 (outptr, u1); \
@@ -341,8 +341,8 @@ gconv_end (struct __gconv_step *data)
\
inptr += 2; \
uint16_t u2 = get16 (inptr); \
- if (__builtin_expect (u2 < 0xdc00, 0) \
- || __builtin_expect (u2 > 0xdfff, 0)) \
+ if (__glibc_unlikely (u2 < 0xdc00) \
+ || __glibc_unlikely (u2 > 0xdfff)) \
{ \
/* This is no valid second word for a surrogate. */ \
inptr -= 2; \
diff --git a/iconvdata/utf-32.c b/iconvdata/utf-32.c
index 3e196ac..fe779f9 100644
--- a/iconvdata/utf-32.c
+++ b/iconvdata/utf-32.c
@@ -72,7 +72,7 @@
put32u (outbuf, BOM); \
outbuf += 4; \
} \
- else if (__builtin_expect (data->__invocation_counter == 0, 0) \
+ else if (__glibc_unlikely (data->__invocation_counter == 0) \
&& ((var == UTF_32LE && BYTE_ORDER == BIG_ENDIAN) \
|| (var == UTF_32BE && BYTE_ORDER == LITTLE_ENDIAN))) \
data->__flags |= __GCONV_SWAP; \
diff --git a/iconvdata/utf-7.c b/iconvdata/utf-7.c
index 74a8e5b..4ca91e5 100644
--- a/iconvdata/utf-7.c
+++ b/iconvdata/utf-7.c
@@ -218,7 +218,7 @@ base64 (unsigned int i)
\
/* If accumulated data is nonzero, the input is invalid. */ \
/* Also, partial UTF-16 characters are invalid. */ \
- if (__builtin_expect (statep->__value.__wch != 0, 0) \
+ if (__glibc_unlikely (statep->__value.__wch != 0) \
|| __glibc_unlikely ((statep->__count >> 3) <= 26)) \
{ \
STANDARD_FROM_LOOP_ERR_HANDLER ((statep->__count = 0, 1)); \
@@ -261,7 +261,7 @@ base64 (unsigned int i)
indeed form a Low Surrogate. */ \
uint32_t wc2 = wch & 0xffff; \
\
- if (! __builtin_expect (wc2 >= 0xdc00 && wc2 < 0xe000, 1)) \
+ if (! __glibc_likely (wc2 >= 0xdc00 && wc2 < 0xe000)) \
{ \
STANDARD_FROM_LOOP_ERR_HANDLER ((statep->__count = 0, 1));\
} \
--
1.9.3