lib/libxml2
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxml2.git synced 2025-08-07 06:43:02 +03:00
Code Activity

trying to avoid bug #72150 which was apparently caused by a gcc bug (or a

Browse Source 
* xpath.c: trying to avoid bug #72150 which was apparently
  caused by a gcc bug (or a processor problem) as detailed
  at http://veillard.com/gcc.bug
Daniel
This commit is contained in:
Daniel Veillard
2002-03-07 08:36:03 +00:00
parent f742d34179
commit 7b41613ff3
2 changed files with 37 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@@ -1,3 +1,9 @@
Thu Mar 7 09:34:16 CET 2002 Daniel Veillard <daniel@veillard.com>
* xpath.c: trying to avoid bug #72150 which was apparently
caused by a gcc bug (or a processor problem) as detailed
at http://veillard.com/gcc.bug
Thu Mar 7 01:02:37 CET 2002 Daniel Veillard <daniel@veillard.com> Thu Mar 7 01:02:37 CET 2002 Daniel Veillard <daniel@veillard.com>
* tree.c python/tests/Makefile.am python/tests/cutnpaste.py: * tree.c python/tests/Makefile.am python/tests/cutnpaste.py:

39
xpath.c
View File

@@ -6779,7 +6779,7 @@ xmlXPathParseNameComplex(xmlXPathParserContextPtr ctxt, int qualified) {
double double
xmlXPathStringEvalNumber(const xmlChar *str) { xmlXPathStringEvalNumber(const xmlChar *str) {
const xmlChar *cur = str; const xmlChar *cur = str;
double ret = 0.0; double ret;
double mult = 1; double mult = 1;
int ok = 0; int ok = 0;
int isneg = 0; int isneg = 0;
@@ -6787,6 +6787,7 @@ xmlXPathStringEvalNumber(const xmlChar *str) {
int is_exponent_negative = 0; int is_exponent_negative = 0;
#ifdef __GNUC__ #ifdef __GNUC__
unsigned long tmp = 0; unsigned long tmp = 0;
double temp;
#endif #endif
while (IS_BLANK(*cur)) cur++; while (IS_BLANK(*cur)) cur++;
@@ -6800,15 +6801,20 @@ xmlXPathStringEvalNumber(const xmlChar *str) {
#ifdef __GNUC__ #ifdef __GNUC__
/* /*
* tmp is a workaround against a gcc compiler bug * tmp/temp is a workaround against a gcc compiler bug
* http://veillard.com/gcc.bug
*/ */
ret = 0;
while ((*cur >= '0') && (*cur <= '9')) { while ((*cur >= '0') && (*cur <= '9')) {
tmp = tmp * 10 + (*cur - '0'); ret = ret * 10;
tmp = (*cur - '0');
ok = 1; ok = 1;
cur++; cur++;
temp = (double) tmp;
ret = ret + temp;
} }
ret = (double) tmp;
#else #else
ret = 0;
while ((*cur >= '0') && (*cur <= '9')) { while ((*cur >= '0') && (*cur <= '9')) {
ret = ret * 10 + (*cur - '0'); ret = ret * 10 + (*cur - '0');
ok = 1; ok = 1;
@@ -6862,23 +6868,40 @@ xmlXPathCompNumber(xmlXPathParserContextPtr ctxt)
{ {
double ret = 0.0; double ret = 0.0;
double mult = 1; double mult = 1;
int ok = 0, tmp = 0; int ok = 0;
int exponent = 0; int exponent = 0;
int is_exponent_negative = 0; int is_exponent_negative = 0;
#ifdef __GNUC__
unsigned long tmp = 0;
double temp;
#endif
CHECK_ERROR; CHECK_ERROR;
if ((CUR != '.') && ((CUR < '0') || (CUR > '9'))) { if ((CUR != '.') && ((CUR < '0') || (CUR > '9'))) {
XP_ERROR(XPATH_NUMBER_ERROR); XP_ERROR(XPATH_NUMBER_ERROR);
} }
#ifdef __GNUC__
/* /*
* Try to work around a gcc optimizer bug * tmp/temp is a workaround against a gcc compiler bug
* http://veillard.com/gcc.bug
*/ */
ret = 0;
while ((CUR >= '0') && (CUR <= '9')) { while ((CUR >= '0') && (CUR <= '9')) {
tmp = tmp * 10 + (CUR - '0'); ret = ret * 10;
tmp = (CUR - '0');
ok = 1;
NEXT;
temp = (double) tmp;
ret = ret + temp;
}
#else
ret = 0;
while ((CUR >= '0') && (CUR <= '9')) {
ret = ret * 10 + (CUR - '0');
ok = 1; ok = 1;
NEXT; NEXT;
} }
ret = (double) tmp; #endif
if (CUR == '.') { if (CUR == '.') {
NEXT; NEXT;
if (((CUR < '0') || (CUR > '9')) && (!ok)) { if (((CUR < '0') || (CUR > '9')) && (!ok)) {