bslathi19/cc65
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fixed a bug

Browse Source 
git-svn-id: svn://svn.cc65.org/cc65/trunk@1922 b7a2c559-68d2-44c3-8de9-860c34a00d81
This commit is contained in:
cuz
2003-02-02 21:05:39 +00:00
parent 4fe0f3ae3c
commit c5868d30c0
1 changed files with 49 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

88
src/cc65/expr.c
View File

@@ -501,7 +501,7 @@ void CheckBoolExpr (ExprDesc* lval)
void exprhs (unsigned flags, int k, ExprDesc *lval) void exprhs (unsigned flags, int k, ExprDesc* lval)
/* Put the result of an expression into the primary register */ /* Put the result of an expression into the primary register */
{ {
int f; int f;
@@ -2034,53 +2034,53 @@ static void parseadd (int k, ExprDesc* lval)
g_scale (CF_INT, CheckedPSizeOf (lhst)); g_scale (CF_INT, CheckedPSizeOf (lhst));
/* Operate on pointers, result type is a pointer */ /* Operate on pointers, result type is a pointer */
flags |= CF_PTR; flags |= CF_PTR;
/* Generate the code for the add */ /* Generate the code for the add */
if (lval->Flags == E_MCONST) { if (lval->Flags == E_MCONST) {
/* Numeric constant */ /* Numeric constant */
g_inc (flags, lval->ConstVal); g_inc (flags, lval->ConstVal);
} else { } else {
/* Constant address */ /* Constant address */
g_addaddr_static (flags, lval->Name, lval->ConstVal); g_addaddr_static (flags, lval->Name, lval->ConstVal);
} }
} else if (IsClassInt (lhst) && IsClassPtr (rhst)) { } else if (IsClassInt (lhst) && IsClassPtr (rhst)) {
/* Left is int, right is pointer, must scale lhs. */ /* Left is int, right is pointer, must scale lhs. */
unsigned ScaleFactor = CheckedPSizeOf (rhst); unsigned ScaleFactor = CheckedPSizeOf (rhst);
/* Operate on pointers, result type is a pointer */ /* Operate on pointers, result type is a pointer */
flags |= CF_PTR; flags |= CF_PTR;
lval->Type = lval2.Type; lval->Type = lval2.Type;
/* Since we do already have rhs in the primary, if lhs is /* Since we do already have rhs in the primary, if lhs is
* not a numeric constant, and the scale factor is not one * not a numeric constant, and the scale factor is not one
* (no scaling), we must take the long way over the stack. * (no scaling), we must take the long way over the stack.
*/ */
if (lval->Flags == E_MCONST) { if (lval->Flags == E_MCONST) {
/* Numeric constant, scale lhs */ /* Numeric constant, scale lhs */
lval->ConstVal *= ScaleFactor; lval->ConstVal *= ScaleFactor;
/* Generate the code for the add */ /* Generate the code for the add */
g_inc (flags, lval->ConstVal); g_inc (flags, lval->ConstVal);
} else if (ScaleFactor == 1) { } else if (ScaleFactor == 1) {
/* Constant address but no need to scale */ /* Constant address but no need to scale */
g_addaddr_static (flags, lval->Name, lval->ConstVal); g_addaddr_static (flags, lval->Name, lval->ConstVal);
} else { } else {
/* Constant address that must be scaled */ /* Constant address that must be scaled */
g_push (TypeOf (lval2.Type), 0); /* rhs --> stack */ g_push (TypeOf (lval2.Type), 0); /* rhs --> stack */
g_getimmed (flags, lval->Name, lval->ConstVal); g_getimmed (flags, lval->Name, lval->ConstVal);
g_scale (CF_PTR, ScaleFactor); g_scale (CF_PTR, ScaleFactor);
g_add (CF_PTR, 0); g_add (CF_PTR, 0);
} }
} else if (IsClassInt (lhst) && IsClassInt (rhst)) { } else if (IsClassInt (lhst) && IsClassInt (rhst)) {
/* Integer addition */ /* Integer addition */
flags |= typeadjust (lval, &lval2, 1); flags |= typeadjust (lval, &lval2, 1);
/* Generate the code for the add */ /* Generate the code for the add */
if (lval->Flags == E_MCONST) { if (lval->Flags == E_MCONST) {
/* Numeric constant */ /* Numeric constant */
g_inc (flags, lval->ConstVal); g_inc (flags, lval->ConstVal);
} else { } else {
/* Constant address */ /* Constant address */
g_addaddr_static (flags, lval->Name, lval->ConstVal); g_addaddr_static (flags, lval->Name, lval->ConstVal);
} }
} else { } else {
/* OOPS */ /* OOPS */
Error ("Invalid operands for binary operator `+'"); Error ("Invalid operands for binary operator `+'");
@@ -2156,8 +2156,16 @@ static void parseadd (int k, ExprDesc* lval)
flags = CF_PTR; flags = CF_PTR;
lval->Type = lval2.Type; lval->Type = lval2.Type;
} else if (IsClassInt (lhst) && IsClassInt (rhst)) { } else if (IsClassInt (lhst) && IsClassInt (rhst)) {
/* Integer addition */ /* Integer addition. Note: Result is never constant.
flags = typeadjust (lval, &lval2, 0); * Problem here is that typeadjust does not know if the
* variable is an rvalue or lvalue, so if both operands
* are dereferenced constant numeric addresses, typeadjust
* thinks the operation works on constants. Removing
* CF_CONST here means handling the symptoms, however, the
* whole parser is such a mess that I fear to break anything
* when trying to apply another solution.
*/
flags = typeadjust (lval, &lval2, 0) & ~CF_CONST;
} else { } else {
/* OOPS */ /* OOPS */
Error ("Invalid operands for binary operator `+'"); Error ("Invalid operands for binary operator `+'");