mirror of
git://sourceware.org/git/glibc.git
synced 2024-11-27 03:41:23 +08:00
Update.
2003-11-17 Jakub Jelinek <jakub@redhat.com> * posix/regcomp.c (optimize_utf8): Optimize multi-byte chars as well. * posix/bug-regex20.c (tests): Add new tests. Multi-byte char followed by dup operator is expected to be optimized. * posix/regexec.c (check_node_accept_bytes): Move nrules and j variables to the block where they are only used, initialize nrules only immediately before using it. 2003-11-15 Andreas Jaeger <aj@suse.de> * sysdeps/x86_64/fpu/s_scalbnl.S: New file. * sysdeps/x86_64/fpu/s_truncl.S: New file. * sysdeps/x86_64/fpu/s_nearbyintl.S: New file. * sysdeps/x86_64/fpu/s_floorl.S: New file. * sysdeps/x86_64/fpu/s_ilogbl.S: New file. * sysdeps/x86_64/fpu/e_remainderl.S: New file. * math/libm-test.inc (floor_test): Test also 0.25. (ceil_test): Test -0.25.
This commit is contained in:
parent
5ddb5bf5fb
commit
5f93cd52f6
23
ChangeLog
23
ChangeLog
@ -1,3 +1,26 @@
|
||||
2003-11-17 Jakub Jelinek <jakub@redhat.com>
|
||||
|
||||
* posix/regcomp.c (optimize_utf8): Optimize multi-byte chars as
|
||||
well.
|
||||
* posix/bug-regex20.c (tests): Add new tests. Multi-byte char
|
||||
followed by dup operator is expected to be optimized.
|
||||
|
||||
* posix/regexec.c (check_node_accept_bytes): Move nrules and j
|
||||
variables to the block where they are only used, initialize
|
||||
nrules only immediately before using it.
|
||||
|
||||
2003-11-15 Andreas Jaeger <aj@suse.de>
|
||||
|
||||
* sysdeps/x86_64/fpu/s_scalbnl.S: New file.
|
||||
* sysdeps/x86_64/fpu/s_truncl.S: New file.
|
||||
* sysdeps/x86_64/fpu/s_nearbyintl.S: New file.
|
||||
* sysdeps/x86_64/fpu/s_floorl.S: New file.
|
||||
* sysdeps/x86_64/fpu/s_ilogbl.S: New file.
|
||||
* sysdeps/x86_64/fpu/e_remainderl.S: New file.
|
||||
|
||||
* math/libm-test.inc (floor_test): Test also ±0.25.
|
||||
(ceil_test): Test -0.25.
|
||||
|
||||
2003-11-17 Ulrich Drepper <drepper@redhat.com>
|
||||
|
||||
* sysdeps/posix/getaddrinfo.c: Add support for destination address
|
||||
|
@ -43,15 +43,35 @@ static struct
|
||||
\xe2\x80\x94 EM DASH */
|
||||
/* Should be optimized. */
|
||||
{RE_SYNTAX_POSIX_BASIC, "foo", "b\xc3\xa4rfoob\xc3\xa4z", 4, 1},
|
||||
{RE_SYNTAX_POSIX_BASIC, "b\xc3\xa4z", "b\xc3\xa4rfoob\xc3\xa4z", 7, 1},
|
||||
{RE_SYNTAX_POSIX_BASIC, "b\xc3\xa4*z", "b\xc3\xa4rfoob\xc3\xa4z", 7, 1},
|
||||
{RE_SYNTAX_POSIX_BASIC, "b\xc3\xa4*z", "b\xc3\xa4rfoobz", 7, 1},
|
||||
{RE_SYNTAX_POSIX_BASIC, "b\xc3\xa4\\+z",
|
||||
"b\xc3\xa4rfoob\xc3\xa4\xc3\xa4z", 7, 1},
|
||||
{RE_SYNTAX_POSIX_BASIC, "b\xc3\xa4\\?z", "b\xc3\xa4rfoob\xc3\xa4z", 7, 1},
|
||||
{RE_SYNTAX_POSIX_BASIC, "b\xc3\xa4\\{1,2\\}z",
|
||||
"b\xc3\xa4rfoob\xc3\xa4z", 7, 1},
|
||||
{RE_SYNTAX_POSIX_BASIC, "^x\\|xy*z$", "\xc3\xb6xyyz", 2, 1},
|
||||
{RE_SYNTAX_POSIX_BASIC, "^x\\\\y\\{6\\}z\\+", "x\\yyyyyyzz\xc3\xb6", 0, 1},
|
||||
{RE_SYNTAX_POSIX_BASIC, "^x\\\\y\\{2,36\\}z\\+", "x\\yzz\xc3\xb6", -1, 1},
|
||||
{RE_SYNTAX_POSIX_BASIC, "^x\\\\y\\{,3\\}z\\+", "x\\yyyzz\xc3\xb6", 0, 1},
|
||||
{RE_SYNTAX_POSIX_BASIC, "^x\\|x\xc3\xa4*z$",
|
||||
"\xc3\xb6x\xc3\xa4\xc3\xa4z", 2, 1},
|
||||
{RE_SYNTAX_POSIX_BASIC, "^x\\\\\xc3\x84\\{6\\}z\\+",
|
||||
"x\\\xc3\x84\xc3\x84\xc3\x84\xc3\x84\xc3\x84\xc3\x84zz\xc3\xb6", 0, 1},
|
||||
{RE_SYNTAX_POSIX_BASIC, "^x\\\\\xc3\x84\\{2,36\\}z\\+",
|
||||
"x\\\xc3\x84zz\xc3\xb6", -1, 1},
|
||||
{RE_SYNTAX_POSIX_BASIC, "^x\\\\\xc3\x84\\{,3\\}z\\+",
|
||||
"x\\\xc3\x84\xc3\x84\xc3\x84zz\xc3\xb6", 0, 1},
|
||||
{RE_SYNTAX_POSIX_BASIC, "x[C]y", "axCy", 1, 1},
|
||||
{RE_SYNTAX_POSIX_BASIC, "x[ABC]y", "axCy", 1, 1},
|
||||
{RE_SYNTAX_POSIX_BASIC, "\\`x\\|z\\'", "x\xe2\x80\x94", 0, 1},
|
||||
{RE_SYNTAX_POSIX_BASIC, "\\(xy\\)z\\1a\\1", "\xe2\x80\x94xyzxyaxy\xc3\x84", 3, 1},
|
||||
{RE_SYNTAX_POSIX_BASIC, "xy\\?z", "\xc3\x84xz\xc3\xb6", 2, 1},
|
||||
{RE_SYNTAX_POSIX_BASIC, "\\`\xc3\x84\\|z\\'", "\xc3\x84\xe2\x80\x94", 0, 1},
|
||||
{RE_SYNTAX_POSIX_BASIC, "\\(x\xc3\x84\\)z\\1\x61\\1",
|
||||
"\xe2\x80\x94x\xc3\x84zx\xc3\x84\x61x\xc3\x84\xc3\x96", 3, 1},
|
||||
{RE_SYNTAX_POSIX_BASIC, "x\xc3\x96\\?z", "\xc3\x84xz\xc3\xb6", 2, 1},
|
||||
{RE_SYNTAX_POSIX_EXTENDED, "foo", "b\xc3\xa4rfoob\xc3\xa4z", 4, 1},
|
||||
{RE_SYNTAX_POSIX_EXTENDED, "^x|xy*z$", "\xc3\xb6xyyz", 2, 1},
|
||||
{RE_SYNTAX_POSIX_EXTENDED, "^x\\\\y{6}z+", "x\\yyyyyyzz\xc3\xb6", 0, 1},
|
||||
@ -64,7 +84,6 @@ static struct
|
||||
{RE_SYNTAX_POSIX_EXTENDED, "xy?z", "\xc3\x84xz\xc3\xb6", 2, 1},
|
||||
/* Should not be optimized. */
|
||||
{RE_SYNTAX_POSIX_BASIC, "x.y", "ax\xe2\x80\x94yz", 1, 0},
|
||||
{RE_SYNTAX_POSIX_BASIC, "x\xc3\x96*y", "ax\xc3\x96\xc3\x96yz", 1, 0},
|
||||
{RE_SYNTAX_POSIX_BASIC, "x[\xc3\x84\xc3\xa4]y", "ax\xc3\xa4y", 1, 0},
|
||||
{RE_SYNTAX_POSIX_BASIC, "x[A-Z,]y", "axCy", 1, 0},
|
||||
{RE_SYNTAX_POSIX_BASIC, "x[^y]z", "ax\xe2\x80\x94z", 1, 0},
|
||||
@ -77,7 +96,6 @@ static struct
|
||||
{RE_SYNTAX_POSIX_BASIC, "a\\wz", "a\xc3\x84z", 0, 0},
|
||||
{RE_SYNTAX_POSIX_BASIC, "x\\Wz", "\xc3\x96x\xe2\x80\x94z", 2, 0},
|
||||
{RE_SYNTAX_POSIX_EXTENDED, "x.y", "ax\xe2\x80\x94yz", 1, 0},
|
||||
{RE_SYNTAX_POSIX_EXTENDED, "x\xc3\x96*y", "ax\xc3\x96\xc3\x96yz", 1, 0},
|
||||
{RE_SYNTAX_POSIX_EXTENDED, "x[\xc3\x84\xc3\xa4]y", "ax\xc3\xa4y", 1, 0},
|
||||
{RE_SYNTAX_POSIX_EXTENDED, "x[A-Z,]y", "axCy", 1, 0},
|
||||
{RE_SYNTAX_POSIX_EXTENDED, "x[^y]z", "ax\xe2\x80\x94z", 1, 0},
|
||||
|
@ -965,17 +965,14 @@ static void
|
||||
optimize_utf8 (dfa)
|
||||
re_dfa_t *dfa;
|
||||
{
|
||||
int node, i;
|
||||
int node, i, mb_chars = 0;
|
||||
|
||||
for (node = 0; node < dfa->nodes_len; ++node)
|
||||
switch (dfa->nodes[node].type)
|
||||
{
|
||||
case CHARACTER:
|
||||
/* Chars >= 0x80 are optimizable in some cases (e.g. when not
|
||||
followed by DUP operator, not in bracket etc.).
|
||||
For now punt on them all. */
|
||||
if (dfa->nodes[node].opr.c >= 0x80)
|
||||
return;
|
||||
mb_chars = 1;
|
||||
break;
|
||||
case ANCHOR:
|
||||
switch (dfa->nodes[node].opr.idx)
|
||||
@ -1010,6 +1007,12 @@ optimize_utf8 (dfa)
|
||||
return;
|
||||
}
|
||||
|
||||
if (mb_chars)
|
||||
for (node = 0; node < dfa->nodes_len; ++node)
|
||||
if (dfa->nodes[node].type == CHARACTER
|
||||
&& dfa->nodes[node].opr.c >= 0x80)
|
||||
dfa->nodes[node].mb_partial = 0;
|
||||
|
||||
/* The search can be in single byte locale. */
|
||||
dfa->mb_cur_max = 1;
|
||||
dfa->is_utf8 = 0;
|
||||
|
@ -3483,10 +3483,6 @@ check_node_accept_bytes (preg, node_idx, input, str_idx)
|
||||
int elem_len = re_string_elem_size_at (input, str_idx);
|
||||
int char_len = re_string_char_size_at (input, str_idx);
|
||||
int i;
|
||||
# ifdef _LIBC
|
||||
int j;
|
||||
uint32_t nrules = _NL_CURRENT_WORD (LC_COLLATE, _NL_COLLATE_NRULES);
|
||||
# endif /* _LIBC */
|
||||
if (elem_len <= 1 && char_len <= 1)
|
||||
return 0;
|
||||
if (node->type == OP_PERIOD)
|
||||
@ -3505,6 +3501,8 @@ check_node_accept_bytes (preg, node_idx, input, str_idx)
|
||||
# ifdef _LIBC
|
||||
const unsigned char *pin = ((char *) re_string_get_buffer (input)
|
||||
+ str_idx);
|
||||
int j;
|
||||
uint32_t nrules;
|
||||
# endif /* _LIBC */
|
||||
int match_len = 0;
|
||||
wchar_t wc = ((cset->nranges || cset->nchar_classes || cset->nmbchars)
|
||||
@ -3529,6 +3527,7 @@ check_node_accept_bytes (preg, node_idx, input, str_idx)
|
||||
}
|
||||
|
||||
# ifdef _LIBC
|
||||
nrules = _NL_CURRENT_WORD (LC_COLLATE, _NL_COLLATE_NRULES);
|
||||
if (nrules != 0)
|
||||
{
|
||||
unsigned int in_collseq = 0;
|
||||
|
20
sysdeps/x86_64/fpu/e_remainderl.S
Normal file
20
sysdeps/x86_64/fpu/e_remainderl.S
Normal file
@ -0,0 +1,20 @@
|
||||
/*
|
||||
* Written by J.T. Conklin <jtc@netbsd.org>.
|
||||
* Public domain.
|
||||
*
|
||||
* Adapted for `long double' by Ulrich Drepper <drepper@cygnus.com>.
|
||||
* Adapted for x86-64 by Andreas Jaeger <aj@suse.de>.
|
||||
*/
|
||||
|
||||
#include <machine/asm.h>
|
||||
|
||||
ENTRY(__ieee754_remainderl)
|
||||
fldt 24(%rsp)
|
||||
fldt 8(%rsp)
|
||||
1: fprem1
|
||||
fstsw %ax
|
||||
testl $0x400,%eax
|
||||
jnz 1b
|
||||
fstp %st(1)
|
||||
ret
|
||||
END (__ieee754_remainderl)
|
30
sysdeps/x86_64/fpu/s_floorl.S
Normal file
30
sysdeps/x86_64/fpu/s_floorl.S
Normal file
@ -0,0 +1,30 @@
|
||||
/*
|
||||
* Written by J.T. Conklin <jtc@netbsd.org>.
|
||||
* Changes for long double by Ulrich Drepper <drepper@cygnus.com>
|
||||
* Changes for x86-64 by Andreas Jaeger <aj@suse.de>=09
|
||||
* Public domain.
|
||||
*/
|
||||
|
||||
#include <machine/asm.h>
|
||||
|
||||
ENTRY(__floorl)
|
||||
fldt 8(%rsp)
|
||||
|
||||
fstcw -4(%rsp) /* store fpu control word */
|
||||
|
||||
/* We use here %edx although only the low 1 bits are defined.
|
||||
But none of the operations should care and they are faster
|
||||
than the 16 bit operations. */
|
||||
movl $0x400,%edx /* round towards -oo */
|
||||
orl -4(%rsp),%edx
|
||||
andl $0xf7ff,%edx
|
||||
movl %edx,-8(%rsp)
|
||||
fldcw -8(%rsp) /* load modified control word */
|
||||
|
||||
frndint /* round */
|
||||
|
||||
fldcw -4(%rsp) /* restore original control word */
|
||||
|
||||
ret
|
||||
END (__floorl)
|
||||
weak_alias (__floorl, floorl)
|
35
sysdeps/x86_64/fpu/s_ilogbl.S
Normal file
35
sysdeps/x86_64/fpu/s_ilogbl.S
Normal file
@ -0,0 +1,35 @@
|
||||
/*
|
||||
* Written by J.T. Conklin <jtc@netbsd.org>.
|
||||
* Changes for long double by Ulrich Drepper <drepper@cygnus.com>
|
||||
* Adapted for x86-64 by Andreas Jaeger <aj@suse.de>.
|
||||
* Public domain.
|
||||
*/
|
||||
|
||||
#include <machine/asm.h>
|
||||
|
||||
ENTRY(__ilogbl)
|
||||
fldt 8(%rsp)
|
||||
/* I added the following ugly construct because ilogb(+-Inf) is
|
||||
required to return INT_MAX in ISO C99.
|
||||
-- jakub@redhat.com. */
|
||||
fxam /* Is NaN or +-Inf? */
|
||||
fstsw %ax
|
||||
movb $0x45, %dh
|
||||
andb %ah, %dh
|
||||
cmpb $0x05, %dh
|
||||
je 1f /* Is +-Inf, jump. */
|
||||
|
||||
fxtract
|
||||
fstp %st
|
||||
|
||||
fistpl -4(%rsp)
|
||||
fwait
|
||||
movl -4(%rsp),%eax
|
||||
|
||||
ret
|
||||
|
||||
1: fstp %st
|
||||
movl $0x7fffffff, %eax
|
||||
ret
|
||||
END (__ilogbl)
|
||||
weak_alias (__ilogbl, ilogbl)
|
21
sysdeps/x86_64/fpu/s_nearbyintl.S
Normal file
21
sysdeps/x86_64/fpu/s_nearbyintl.S
Normal file
@ -0,0 +1,21 @@
|
||||
/*
|
||||
* Written by J.T. Conklin <jtc@netbsd.org>.
|
||||
* Public domain.
|
||||
*/
|
||||
/* Adapted for use as nearbyint by Ulrich Drepper <drepper@cygnus.com>. */
|
||||
|
||||
#include <machine/asm.h>
|
||||
|
||||
ENTRY(__nearbyintl)
|
||||
fldt 8(%rsp)
|
||||
fnstcw -4(%rsp)
|
||||
movl -4(%rsp), %eax
|
||||
orl $0x20, %eax
|
||||
movl %eax, -8(%rsp)
|
||||
fldcw -8(%rsp)
|
||||
frndint
|
||||
fclex
|
||||
fldcw -4(%rsp)
|
||||
ret
|
||||
END (__nearbyintl)
|
||||
weak_alias (__nearbyintl, nearbyintl)
|
18
sysdeps/x86_64/fpu/s_scalbnl.S
Normal file
18
sysdeps/x86_64/fpu/s_scalbnl.S
Normal file
@ -0,0 +1,18 @@
|
||||
/*
|
||||
* Written by J.T. Conklin <jtc@netbsd.org>.
|
||||
* Changes for long double by Ulrich Drepper <drepper@cygnus.com>
|
||||
* Changes for x86-64 by Andreas Jaeger <aj@suse.de>=09
|
||||
* Public domain.
|
||||
*/
|
||||
|
||||
#include <machine/asm.h>
|
||||
|
||||
ENTRY(__scalbnl)
|
||||
movl %edi,-4(%rsp)
|
||||
fildl -4(%rsp)
|
||||
fldt 8(%rsp)
|
||||
fscale
|
||||
fstp %st(1)
|
||||
ret
|
||||
END (__scalbnl)
|
||||
weak_alias (__scalbnl, scalbnl)
|
34
sysdeps/x86_64/fpu/s_truncl.S
Normal file
34
sysdeps/x86_64/fpu/s_truncl.S
Normal file
@ -0,0 +1,34 @@
|
||||
/* Truncate long double value.
|
||||
Copyright (C) 1997, 2003 Free Software Foundation, Inc.
|
||||
This file is part of the GNU C Library.
|
||||
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
|
||||
|
||||
The GNU C Library is free software; you can redistribute it and/or
|
||||
modify it under the terms of the GNU Lesser General Public
|
||||
License as published by the Free Software Foundation; either
|
||||
version 2.1 of the License, or (at your option) any later version.
|
||||
|
||||
The GNU C Library is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
Lesser General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU Lesser General Public
|
||||
License along with the GNU C Library; if not, write to the Free
|
||||
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
||||
02111-1307 USA. */
|
||||
|
||||
#include <machine/asm.h>
|
||||
|
||||
ENTRY(__truncl)
|
||||
fldt 8(%rsp)
|
||||
fstcw -4(%rsp)
|
||||
movl $0xc00, %edx
|
||||
orl -4(%rsp), %edx
|
||||
movl %edx, -8(%rsp)
|
||||
fldcw -8(%rsp)
|
||||
frndint
|
||||
fldcw -4(%rsp)
|
||||
ret
|
||||
END(__truncl)
|
||||
weak_alias (__truncl, truncl)
|
Loading…
Reference in New Issue
Block a user