OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

merge from gcc

This commit is contained in:
DJ Delorie 2005-04-13 01:05:22 +00:00
parent 18d89c4cd1
commit ea7143ac88
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libiberty/ChangeLog
View File

@ -1,3 +1,8 @@
2005-04-12 Gabriel Dos Reis <gdr@integrable-solutions.net>
* regex.c (wcs_re_match_2_internal, byte_re_match_2_internal):
Replace not with negate.
2005-04-12 Gabriel Dos Reis <gdr@integrable-solutions.net>
* configure.ac: Check declarations for basename, ffs, asprintf,

16
libiberty/regex.c
View File

@ -6172,7 +6172,7 @@ byte_re_match_2_internal (struct re_pattern_buffer *bufp,
uint32_t nrules;
# endif /* _LIBC */
#endif /* WCHAR */
boolean not = (re_opcode_t) *(p - 1) == charset_not;
boolean negate = (re_opcode_t) *(p - 1) == charset_not;
DEBUG_PRINT2 ("EXECUTING charset%s.\n", not ? "_not" : "");
PREFETCH ();
@ -6541,7 +6541,7 @@ byte_re_match_2_internal (struct re_pattern_buffer *bufp,
if (c == *workp)
goto char_set_matched;
not = !not;
negate = !negate;
char_set_matched:
if (not) goto fail;
@ -6550,11 +6550,11 @@ byte_re_match_2_internal (struct re_pattern_buffer *bufp,
bit list is a full 32 bytes long. */
if (c < (unsigned) (*p * BYTEWIDTH)
&& p[1 + c / BYTEWIDTH] & (1 << (c % BYTEWIDTH)))
not = !not;
negate = !negate;
p += 1 + *p;
if (!not) goto fail;
if (!negate) goto fail;
#undef WORK_BUFFER_SIZE
#endif /* WCHAR */
SET_REGS_MATCHED ();
@ -7044,15 +7044,15 @@ byte_re_match_2_internal (struct re_pattern_buffer *bufp,
else if ((re_opcode_t) p1[3] == charset
|| (re_opcode_t) p1[3] == charset_not)
{
int not = (re_opcode_t) p1[3] == charset_not;
int negate = (re_opcode_t) p1[3] == charset_not;
if (c < (unsigned) (p1[4] * BYTEWIDTH)
&& p1[5 + c / BYTEWIDTH] & (1 << (c % BYTEWIDTH)))
not = !not;
negate = !negate;
/* `not' is equal to 1 if c would match, which means
/* `negate' is equal to 1 if c would match, which means
that we can't change to pop_failure_jump. */
if (!not)
if (!negate)
{
p[-3] = (unsigned char) pop_failure_jump;
DEBUG_PRINT1 (" No match => pop_failure_jump.\n");