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

fix float const - int var

Browse Source
This commit is contained in:
mrdudz 2023-09-02 00:08:21 +02:00
parent 9481f7a498
commit fee2b834b0
3 changed files with 35 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libsrc/float/readme.md
View File

@ -89,7 +89,6 @@ NOT WORKING YET:
/test/val/float-basic-var-var.c +=, -=
/test/val/float-basic-const-intvar.c -
/test/val/float-basic-var-intvar.c -, +=, -=
/test/val/float-basic-var-intconst.c -, *, /, +=, -=, *=, /=

22
src/cc65/expr.c
View File

@ -3932,6 +3932,7 @@ static void parsesub (ExprDesc* Expr)
}
} else {
LOG(("parsesub: lhs not const, rhs is const\n"));
/* Left hand side is not constant, right hand side is */
if (IsClassPtr (lhst) && IsClassInt (rhst)) {
@ -3999,6 +4000,7 @@ static void parsesub (ExprDesc* Expr)
}
} else {
LOG(("parsesub: rhs not const\n"));
/* We'll use the pushed lhs on stack instead of the original source */
ED_FinalizeRValLoad (Expr);
@ -4016,10 +4018,28 @@ static void parsesub (ExprDesc* Expr)
} else if (IsClassFloat (lhst) && IsClassFloat (rhst)) {
/* Float substraction */
/* FIXME: float - what to do here exactly? */
LOG(("%s:%d float substraction\n", __FILE__, __LINE__));
LOG(("%s:%d parsesub float - float\n", __FILE__, __LINE__));
/* Adjust operand types */
/*flags = typeadjust (Expr, &Expr2, 0);*/
flags = CF_FLOAT;
} else if (IsClassFloat (lhst) && IsClassInt (rhst)) {
/* Float substraction */
/* FIXME: float - what to do here exactly? */
LOG(("%s:%d parsesub float - int\n", __FILE__, __LINE__));
#if 1
/* Adjust operand types */
flags = typeadjust (Expr, &Expr2, 0);
//flags = CF_FLOAT;
#endif
} else if (IsClassInt (lhst) && IsClassFloat (rhst)) {
/* Float substraction */
/* FIXME: float - what to do here exactly? */
LOG(("FIXME: %s:%d parsesub int - float\n", __FILE__, __LINE__));
#if 0
/* Adjust operand types */
/*flags = typeadjust (Expr, &Expr2, 0);*/
flags = CF_FLOAT;
#endif
} else {
/* OOPS */
Error ("Invalid operands for binary operator '-'");

29
test/val/float-basic-const-intvar.c
View File

@ -63,35 +63,34 @@ void constintvar(void)
printf("addition: %s+%d=%s\n", _ftostr(buf, 16.75f), var_sint, _ftostr(buf3, fp3));
printf(" fp3:0x%08lx [0x42a18000] %s (80.75)", *((uint32_t*)&fp3), _ftostr(buf, fp3));
test1(fp3, "42a18000");
#if 0 // Invalid operands for binary operator '-'
var_sint = 16;
fp3 = 18.5f - var_sint;
printf("substraction: %s-%s=%s\n", _ftostr(buf, 8.5f), _ftostr(buf2, fp2), _ftostr(buf3, fp3));
printf(" fp3:0x%08lx [0xc0f80000] %s (-7.75)", *((uint32_t*)&fp3), _ftostr(buf, fp3));
test1(fp3, "c0f80000");
printf("substraction: %s-%d=%s\n", _ftostr(buf, 8.5f), var_sint, _ftostr(buf3, fp3));
printf(" fp3:0x%08lx [0x40200000] %s (2.5)", *((uint32_t*)&fp3), _ftostr(buf, fp3));
test1(fp3, "40200000");
var_sint = 13;
fp3 = 20.3f - var_sint;
printf("fp3:0x%08lx [0x3e4cccce] %s (0.2)", *((uint32_t*)&fp3), _ftostr(buf, fp3));
test1(fp3, "3e4cccce");
fp3 = 20.6f - var_sint;
printf("fp3:0x%08lx [0x40f33334] %s (7.6)", *((uint32_t*)&fp3), _ftostr(buf, fp3));
test1(fp3, "40f33334");
var_sint = 13;
fp3 = 10.1f - var_sint;
printf("fp3:0x%08lx [0xbe4cccce] %s (-0.2)", *((uint32_t*)&fp3), _ftostr(buf, fp3));
test1(fp3, "be4cccce");
#endif
#if 1
fp3 = 10.2f - var_sint;
printf("fp3:0x%08lx [0xc0333334] %s (-2.8)", *((uint32_t*)&fp3), _ftostr(buf, fp3));
test1(fp3, "c0333334");
var_sint = 2;
fp3 = 16.25f * var_sint;
printf("multiplication: %s*%d=%s\n", _ftostr(buf, 16.25f), var_sint, _ftostr(buf3, fp3));
printf(" fp3:0x%08lx [0x42020000] %s (32.5)", *((uint32_t*)&fp3), _ftostr(buf, fp3));
test1(fp3, "42020000");
#endif
#if 1
var_sint = 2;
fp3 = 16.2f / var_sint;
printf("division: %s/%d=%s\n", _ftostr(buf, 16.2f), var_sint, _ftostr(buf3, fp3));
printf(" fp3:0x%08lx [0x4101999a] %s (8.1)", *((uint32_t*)&fp3), _ftostr(buf, fp3));
test1(fp3, "4101999a");
#endif
}
int main(void)