gered/picoc
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

proper typecast, L/R shift fixes

Browse source
This commit is contained in:
Joseph Poirier 2017-08-14 23:53:36 -05:00
parent e4a559a1dc
commit 3a0bf87bb0
No known key found for this signature in database
GPG key ID: 65858A2540EBDA40
1 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
expression.c
View file

@ -351,7 +351,7 @@ long ExpressionAssignInt(struct ParseState *Parser, struct Value *DestValue,
DestValue->Val->UnsignedShortInteger = (unsigned short)FromInt; DestValue->Val->UnsignedShortInteger = (unsigned short)FromInt;
break; break;
case TypeUnsignedLong: case TypeUnsignedLong:
DestValue->Val->UnsignedLongInteger = (int64_t)FromInt; DestValue->Val->UnsignedLongInteger = (uint64_t)FromInt;
break; break;
case TypeUnsignedChar: case TypeUnsignedChar:
DestValue->Val->UnsignedCharacter = (unsigned char)FromInt; DestValue->Val->UnsignedCharacter = (unsigned char)FromInt;
@ -519,7 +519,7 @@ void ExpressionAssign(struct ParseState *Parser, struct Value *DestValue,
DestValue->Val->Character = (char)ExpressionCoerceInteger(SourceValue); DestValue->Val->Character = (char)ExpressionCoerceInteger(SourceValue);
break; break;
case TypeLong: case TypeLong:
DestValue->Val->LongInteger = (long)ExpressionCoerceInteger(SourceValue); DestValue->Val->LongInteger = ExpressionCoerceInteger(SourceValue);
break; break;
case TypeUnsignedInt: case TypeUnsignedInt:
DestValue->Val->UnsignedInteger = DestValue->Val->UnsignedInteger =
@ -531,7 +531,7 @@ void ExpressionAssign(struct ParseState *Parser, struct Value *DestValue,
break; break;
case TypeUnsignedLong: case TypeUnsignedLong:
DestValue->Val->UnsignedLongInteger = DestValue->Val->UnsignedLongInteger =
(unsigned long)ExpressionCoerceUnsignedInteger(SourceValue); ExpressionCoerceUnsignedInteger(SourceValue);
break; break;
case TypeUnsignedChar: case TypeUnsignedChar:
DestValue->Val->UnsignedCharacter = DestValue->Val->UnsignedCharacter =
@ -991,8 +991,8 @@ void ExpressionInfixOperator(struct ParseState *Parser,
ExpressionPushFP(Parser, StackTop, ResultFP); ExpressionPushFP(Parser, StackTop, ResultFP);
} else if (IS_NUMERIC_COERCIBLE(TopValue) && IS_NUMERIC_COERCIBLE(BottomValue)) { } else if (IS_NUMERIC_COERCIBLE(TopValue) && IS_NUMERIC_COERCIBLE(BottomValue)) {
/* integer operation */ /* integer operation */
long TopInt = ExpressionCoerceInteger(TopValue); int64_t TopInt = ExpressionCoerceInteger(TopValue);
long BottomInt = ExpressionCoerceInteger(BottomValue); int64_t BottomInt = ExpressionCoerceInteger(BottomValue);
switch (Op) { switch (Op) {
case TokenAssign: case TokenAssign:
ResultInt = ExpressionAssignInt(Parser, BottomValue, TopInt, false); ResultInt = ExpressionAssignInt(Parser, BottomValue, TopInt, false);
@ -1022,8 +1022,12 @@ void ExpressionInfixOperator(struct ParseState *Parser,
BottomInt<<TopInt, false); BottomInt<<TopInt, false);
break; break;
case TokenShiftRightAssign: case TokenShiftRightAssign:
ResultInt = ExpressionAssignInt(Parser, BottomValue, //ResultInt = ExpressionAssignInt(Parser, BottomValue,
BottomInt>>TopInt, false); // BottomInt>>TopInt, false);
if (BottomValue->Typ->Base == TypeUnsignedInt || BottomValue->Typ->Base == TypeUnsignedLong)
ResultInt = ExpressionAssignInt(Parser, BottomValue, (uint64_t) BottomInt >> TopInt, false);
else
ResultInt = ExpressionAssignInt(Parser, BottomValue, BottomInt >> TopInt, false);
break; break;
case TokenArithmeticAndAssign: case TokenArithmeticAndAssign:
ResultInt = ExpressionAssignInt(Parser, BottomValue, ResultInt = ExpressionAssignInt(Parser, BottomValue,
@ -1071,7 +1075,11 @@ void ExpressionInfixOperator(struct ParseState *Parser,
ResultInt = BottomInt >= TopInt; ResultInt = BottomInt >= TopInt;
break; break;
case TokenShiftLeft: case TokenShiftLeft:
ResultInt = BottomInt << TopInt; //ResultInt = BottomInt << TopInt;
if (BottomValue->Typ->Base == TypeUnsignedInt || BottomValue->Typ->Base == TypeUnsignedLong)
ResultInt = (uint64_t) BottomInt >> TopInt;
else
ResultInt = BottomInt >> TopInt;
break; break;
case TokenShiftRight: case TokenShiftRight:
ResultInt = BottomInt >> TopInt; ResultInt = BottomInt >> TopInt;