6502/cc65
1
0
Fork 0
mirror of https://github.com/cc65/cc65.git synced 2024-06-17 16:29:32 +00:00
Code Issues Projects Releases Wiki Activity

fix (some) issues with float constants

Browse Source
This commit is contained in:
mrdudz 2022-11-13 23:47:15 +01:00
parent 7467503f6e
commit 331a8c7bc3
5 changed files with 36 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libsrc/float/readme.md
View File

@ -26,7 +26,6 @@ NOT WORKING YET:
- float values as in "12.34f" work, but "12.34" does not - should it?
- addition, float const + float var
- substraction, float const - float var
- division, float const / float var

32
src/cc65/expr.c
View File

@ -3201,8 +3201,8 @@ static void parseadd (ExprDesc* Expr, int DoArrayRef)
flags |= typeadjust (Expr, &Expr2, 1);
} else if (!DoArrayRef && IsClassFloat (lhst) && IsClassFloat (rhst)) {
/* Float addition */
/*flags |= typeadjust (Expr, &Expr2, 1);*/
LOG(("%s:%d float addition (const + var)\n", __FILE__, __LINE__));
flags |= typeadjust (Expr, &Expr2, 1);
} else {
/* OOPS */
LOG(("%s:%d OOPS\n", __FILE__, __LINE__));
@ -3211,19 +3211,23 @@ static void parseadd (ExprDesc* Expr, int DoArrayRef)
/* Generate the code for the add */
if (!AddDone) {
if (ED_IsAbs (Expr) &&
Expr->IVal >= 0 &&
Expr->IVal * lscale < 256) {
/* Numeric constant */
g_inc (flags, Expr->IVal * lscale);
AddDone = 1;
if (!IsClassFloat (lhst) && !IsClassFloat (rhst)) {
if (ED_IsAbs (Expr) &&
Expr->IVal >= 0 &&
Expr->IVal * lscale < 256) {
LOG(("%s:%d call g_inc for integer\n", __FILE__, __LINE__));
/* Numeric constant */
g_inc (flags, Expr->IVal * lscale);
AddDone = 1;
}
}
}
LOG(("%s:%d AddDone:%d\n", __FILE__, __LINE__, AddDone));
if (!AddDone) {
if (ED_IsLocQuasiConst (&Expr2) &&
rscale == 1 &&
CheckedSizeOf (rhst) == SIZEOF_CHAR) {
LOG(("%s:%d char\n", __FILE__, __LINE__));
/* Change the order back */
RemoveCode (&Mark);
/* Load lhs */
@ -3238,8 +3242,17 @@ static void parseadd (ExprDesc* Expr, int DoArrayRef)
}
} else if (ED_IsAbs (Expr)) {
/* Numeric constant */
g_inc (flags, Expr->IVal * lscale);
if (TypeOf (Expr->Type) == CF_FLOAT) {
//FP_D_As32bitRaw()
LOG(("%s:%d const float\n", __FILE__, __LINE__));
Double res = FP_D_Mul(Expr->V.FVal, FP_D_FromInt(lscale));
g_inc (flags, FP_D_As32bitRaw(res));
} else {
LOG(("%s:%d const ival:%d\n", __FILE__, __LINE__, Expr->IVal));
g_inc (flags, Expr->IVal * lscale);
}
} else if (lscale == 1) {
LOG(("%s:%d addr\n", __FILE__, __LINE__));
if (ED_IsLocStack (Expr)) {
/* Constant address */
g_addaddr_local (flags, Expr->IVal);
@ -3247,6 +3260,7 @@ static void parseadd (ExprDesc* Expr, int DoArrayRef)
g_addaddr_static (flags, Expr->Name, Expr->IVal);
}
} else {
LOG(("%s:%d call long way\n", __FILE__, __LINE__));
/* Since we do already have rhs in the primary, if lhs is
** not a numeric constant, and the scale factor is not one
** (no scaling), we must take the long way over the stack.

8
test/todo/float-basic-const-var.c
View File

@ -60,12 +60,6 @@ void constvar(void)
{
printf("\nconstant vs variable\n\n");
fp2 = 64.25f;
fp3 = 16.75f + fp2;
printf("addition: %s+%s=%s\n", _ftostr(buf, 16.75f), _ftostr(buf2, fp2), _ftostr(buf3, fp3));
printf(" fp3:0x%08lx [0x42a20000] %s (81.0)", *((uint32_t*)&fp3), _ftostr(buf, fp3));
test1(fp3, "42a20000");
fp2 = 16.25;
fp3 = 8.5f - fp2;
printf("substraction: %s-%s=%s\n", _ftostr(buf, 8.5f), _ftostr(buf2, fp2), _ftostr(buf3, fp3));
@ -91,5 +85,5 @@ int main(void)
WAIT();
printf("\nfloat-basic-const-var (res:%d)\n", result);
return result;
return (result == 2) ? EXIT_FAILURE : EXIT_SUCCESS; // only fail while ALL sub tests fail
}

2
test/val/float-basic.c
View File

@ -70,7 +70,7 @@ void constvar(void)
fp3 = 16.75f + fp2;
printf("addition: %s+%s=%s\n", _ftostr(buf, 16.75f), _ftostr(buf2, fp2), _ftostr(buf3, fp3));
printf(" fp3:0x%08lx [0x42a20000] %s (81.0)", *((uint32_t*)&fp3), _ftostr(buf, fp3));
SKIPPEDtest1(fp3, "42a20000");
test1(fp3, "42a20000");
fp2 = 16.25;
fp3 = 8.5f - fp2;

13
test/val/float-mixed.c
View File

@ -74,8 +74,16 @@ void test(void)
printf("floatconst + intvar * floatconst\n");
fp1 = XMIN + ch * XSTEP;
printf("fp1:0x%08lx [0x3f19979a] %s (0.5999)\n", *((uint32_t*)&fp1), _ftostr(buf, fp1));
test1(fp1, "3f19979a");
printf("fp1:0x%08lx [0x402663e6] %s (2.5997)\n", *((uint32_t*)&fp1), _ftostr(buf, fp1));
test1(fp1, "402663e6");
ch = 4;
fp1 = ch * 2.0f + 3.0f;
fp2 = 3.0f + ch * 2.0f;
printf(" fp1:0x%08lx [0x41300000] %s (exp:11)\n", *((uint32_t*)&fp1), _ftostr(buf, fp1));
printf(" fp2:0x%08lx [0x41300000] %s (exp:11)\n", *((uint32_t*)&fp2), _ftostr(buf, fp2));
test1(fp1, "41300000");
test1(fp2, "41300000");
printf("floatconst / intconst, intconst / floatconst\n");
fp1 = ( (20.0f / 4.5f));
@ -91,6 +99,7 @@ void test(void)
test1(fp1, "408e38e4");
printf(" fp2:0x%08lx [0x3e666666] %s (exp:0.225000)\n", *((uint32_t*)&fp2), _ftostr(buf, fp2));
test1(fp2, "3e666666");
}
int main(void)