luisgulo/gambas-source-code
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Some support for older versions of gcc without overflow detection.

Browse source 
[INTERPRETER]
* BUG: Some support for older versions of gcc without overflow detection.
This commit is contained in:
Benoît Minisini 2023-09-29 03:21:07 +02:00
parent 8f477200d8
commit 9c6c65107b
1 changed files with 18 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
main/gbx/gbx_number.c
View file

@ -33,6 +33,7 @@
#include "gbx_type.h"
#include "gb_common_buffer.h"
#include "gb_overflow.h"
#include "gbx_local.h"
#include "gbx_math.h"
#include "gbx_string.h"
@ -83,6 +84,9 @@ static int read_integer(int base, bool minus, int64_t *result, bool local, bool
};
uint64_t nbr;
#if DO_NOT_CHECK_OVERFLOW
uint64_t nbr2;
#endif
int d, n, c, nmax;
const char *thsep;
int lthsep;
@ -136,10 +140,17 @@ static int read_integer(int base, bool minus, int64_t *result, bool local, bool
}
else
{
#if DO_NOT_CHECK_OVERFLOW
nbr2 = nbr * 10 + d;
if ((nbr2 / 10) != nbr || nbr2 > ((uint64_t)LLONG_MAX + minus))
return NB_READ_OVERFLOW;
nbr = nbr2;
#else
if (__builtin_umull_overflow(nbr, 10, &nbr))
return NB_READ_OVERFLOW;
if (__builtin_uaddl_overflow(nbr, (uint64_t)d, &nbr))
return NB_READ_OVERFLOW;
#endif
}
c = get_char();
@ -175,10 +186,17 @@ static int read_integer(int base, bool minus, int64_t *result, bool local, bool
}
else
{
#if DO_NOT_CHECK_OVERFLOW
nbr2 = nbr * base + d;
if ((nbr2 / base) != nbr || nbr2 > ((uint64_t)LLONG_MAX + minus))
return NB_READ_OVERFLOW;
nbr = nbr2;
#else
if (__builtin_umull_overflow(nbr, base, &nbr))
return NB_READ_OVERFLOW;
if (__builtin_uaddl_overflow(nbr, (uint64_t)d, &nbr))
return NB_READ_OVERFLOW;
#endif
}
c = get_char();