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 a regression that sneaked in, all subtractions should work again

Browse Source
This commit is contained in:
mrdudz 2023-09-02 06:44:53 +02:00
parent 341286bf16
commit f0eadc69e1
3 changed files with 38 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/cc65/expr.c
View File

@ -2284,6 +2284,8 @@ static void hie_internal (const GenDesc* Ops, /* List of generators */
unsigned long Val1 = Expr->IVal;
unsigned long Val2 = Expr2.IVal;
LOG(("hie_internal lhs is const and rhs is const"));
/* Both operands are constant, remove the generated code */
RemoveCode (&Mark1);
@ -2403,7 +2405,7 @@ LOG(("hie_internal Expr->Type:%s Expr2->Type:%s\n",
** returned without this modification). This allows more efficient operations,
** but does not affect correctness for the same reasons explained in g_typeadjust.
*/
LOG(("hie_internal ?1\n"));
LOG(("hie_internal lhs is const, rhs is not const\n"));
if (ltype == CF_INT && Expr->IVal >= 0 && Expr->IVal < 256) {
ltype = CF_CHAR | CF_UNSIGNED;
}
@ -2444,7 +2446,7 @@ LOG(("hie_internal Expr->Type:%s Expr2->Type:%s\n",
*/
unsigned rtype = TypeOf (Expr2.Type);
type = 0;
LOG(("hie_internal ?2 rconst: %d rtype:%x\n", rconst, rtype));
LOG(("hie_internal ?2 ltype:%4x rconst: %d rtype:%4x\n", ltype, rconst, rtype));
if (rconst) {
/* As above, but for the RHS. */
if (rtype == CF_INT && Expr2.IVal >= 0 && Expr2.IVal < 256) {
@ -3963,6 +3965,7 @@ static void parsesub (ExprDesc* Expr)
/* Remove pushed value from stack */
RemoveCode (&Mark2);
if (IsClassInt (lhst)) {
// lhs is integer, rhs is constant
LOG(("parsesub: lhst int\n"));
/* Adjust the types */
flags = typeadjust (Expr, &Expr2, 1);
@ -3974,18 +3977,21 @@ static void parsesub (ExprDesc* Expr)
}
}
else if (IsClassFloat (lhst)) {
// lhs is float, rhs is constant
LOG(("parsesub: lhst float\n"));
/* Adjust the types */
// flags = typeadjust (&Expr2, Expr, 1);
if (rscale != 1) {
Internal("scale != 1 for float");
}
/* Do the subtraction */
if (IsClassFloat(rhst)) {
LOG(("parsesub: rhst const float\n"));
LOG(("parsesub: rhst const float %f\n", Expr2.V.FVal.V));
flags = typeadjust (&Expr2, Expr, 1);
// flags = typeadjust (Expr, &Expr2, 1);
g_dec (flags | CF_CONST, FP_D_As32bitRaw(Expr2.V.FVal));
} else {
LOG(("parsesub: rhst const int: %d\n", Expr2.IVal * rscale));
/* Adjust rhs type */
LoadExpr(CF_FLOAT, Expr);
if (rscale != 1) {
Internal("scale != 1 for float");
}
g_dec (flags | CF_CONST, FP_D_As32bitRaw(FP_D_FromInt(Expr2.IVal * rscale)));
// g_dec (flags | CF_CONST, Expr2.IVal * rscale);
}

12
test/val/float-basic-var-const.c
View File

@ -34,6 +34,7 @@ unsigned long var_ulong;
int result = 0;
#if 1
// returns 1 if value in f matches the string
// the string is a hex value without leading "0x"
int compare(float f, char *str)
@ -209,4 +210,13 @@ int main(void)
printf("\nfloat-basic-var-const (res:%d)\n", result);
return result;
}
#else
int main(void)
{
fp1 = 16.25f;
fp3 = fp1 - 8.5f;
printf("substraction: %s-%s=%s\n", _ftostr(buf, fp1), _ftostr(buf2, 8.5f), _ftostr(buf3, fp3));
printf(" fp3:0x%08lx [0x40f80000] %s (exp:7.75)", *((uint32_t*)&fp3), _ftostr(buf, fp3));
return result;
}
#endif

15
test/val/float-basic-var-intconst.c
View File

@ -39,6 +39,7 @@ unsigned char var_char;
unsigned int var_int;
float var_float;
#if 1
// returns 1 if value in f matches the string
// the string is a hex value without leading "0x"
int compare(float f, char *str)
@ -81,11 +82,11 @@ void varintconst(void)
fp1 = var_float + 47;
printf("fp1:0x%08lx [42687df4] %s (58.123)\n", *((uint32_t*)&fp1), _ftostr(buf, fp1));
test1(fp1, "42687df4");
#if 1
fp1 = var_float - 47;
printf("fp1:0x%08lx [c20f820c] %s (-35.877)\n", *((uint32_t*)&fp1), _ftostr(buf, fp1));
test1(fp1, "c20f820c");
#endif
#if 0 // works but gives wrong result
fp1 = var_float * 47;
printf("fp1:0x%08lx [42687df4] %s (522.781)\n", *((uint32_t*)&fp1), _ftostr(buf, fp1));
@ -154,3 +155,13 @@ int main(void)
printf("\nfloat-basic-var-intconst (res:%d)\n", result);
return result;
}
#else
int main(void)
{
fp1 = var_float - 47;
printf("fp1:0x%08lx [c20f820c] %s (-35.877)\n", *((uint32_t*)&fp1), _ftostr(buf, fp1));
fp1 = var_float - 47.0f;
printf("fp1:0x%08lx [c20f820c] %s (-35.877)\n", *((uint32_t*)&fp1), _ftostr(buf, fp1));
return result;
}
#endif