6502/cc65
1
0
Fork 0
mirror of https://github.com/cc65/cc65.git synced 2025-03-03 09:32:33 +00:00
Code Issues Projects Releases Wiki Activity

Fix broken/incomplete floating point parsing

Browse Source 
- Fractional digit scale was broken
- Base was partially ignored
- Exponent sign was ignored
- Exponent for hex float is 2 not 10
This commit is contained in:
bbbradsmith 2023-05-02 23:49:40 -04:00
parent 805e98a7aa
commit a109f475ed
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/cc65/scanner.c
View File

@ -687,20 +687,21 @@ static void NumericConst (void)
/* Check for a fractional part and read it */ /* Check for a fractional part and read it */
if (SB_Peek (&Src) == '.') { if (SB_Peek (&Src) == '.') {
Double Scale; Double Scale, ScaleDigit;
/* Skip the dot */ /* Skip the dot */
SB_Skip (&Src); SB_Skip (&Src);
/* Read fractional digits */ /* Read fractional digits */
Scale = FP_D_Make (1.0); ScaleDigit = FP_D_Div (FP_D_Make (1.0), FP_D_FromInt (Base));
Scale = ScaleDigit;
while (IsXDigit (SB_Peek (&Src)) && (DigitVal = HexVal (SB_Peek (&Src))) < Base) { while (IsXDigit (SB_Peek (&Src)) && (DigitVal = HexVal (SB_Peek (&Src))) < Base) {
/* Get the value of this digit */ /* Get the value of this digit */
Double FracVal = FP_D_Div (FP_D_FromInt (DigitVal * Base), Scale); Double FracVal = FP_D_Mul (FP_D_FromInt (DigitVal), Scale);
/* Add it to the float value */ /* Add it to the float value */
FVal = FP_D_Add (FVal, FracVal); FVal = FP_D_Add (FVal, FracVal);
/* Scale base */ /* Adjust Scale for next digit */
Scale = FP_D_Mul (Scale, FP_D_FromInt (DigitVal)); Scale = FP_D_Mul (Scale, ScaleDigit);
/* Skip the digit */ /* Skip the digit */
SB_Skip (&Src); SB_Skip (&Src);
} }
@ -712,12 +713,15 @@ static void NumericConst (void)
unsigned Digits; unsigned Digits;
unsigned Exp; unsigned Exp;
int Sign;
/* Skip the exponent notifier */ /* Skip the exponent notifier */
SB_Skip (&Src); SB_Skip (&Src);
/* Read an optional sign */ /* Read an optional sign */
Sign = 0;
if (SB_Peek (&Src) == '-') { if (SB_Peek (&Src) == '-') {
Sign = 1;
SB_Skip (&Src); SB_Skip (&Src);
} else if (SB_Peek (&Src) == '+') { } else if (SB_Peek (&Src) == '+') {
SB_Skip (&Src); SB_Skip (&Src);
@ -747,9 +751,11 @@ static void NumericConst (void)
Warning ("Floating constant exponent is too large"); Warning ("Floating constant exponent is too large");
} }
/* Scale the exponent and adjust the value accordingly */ /* Scale the exponent and adjust the value accordingly.
** Decimal exponents are base 10, hexadecimal exponents are base 2 (C99).
*/
if (Exp) { if (Exp) {
FVal = FP_D_Mul (FVal, FP_D_Make (pow (10, Exp))); FVal = FP_D_Mul (FVal, FP_D_Make (pow ((Base == 16) ? 2.0 : 10.0, (Sign ? -1.0 : 1.0) * Exp)));
} }
} }