6502
/
macross
mirror of https://github.com/Museum-of-Art-and-Digital-Entertainment/macross.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #9 from ksherlock/fix_null_operand_eval 

Better checks for null operands
This commit is contained in:
Michael Steil 2016-04-13 14:43:40 -07:00
parent c91b6231a6 752bd31a3f
commit f319c607d5
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
expressionSemantics.c
View File

@ -1109,7 +1109,8 @@ evaluateExpressionInternally(expressionType *expression, bool isTopLevel, fixupK
evaluateExpression(expressionType *expression, fixupKindType kindOfFixup)
{
valueType *result;
nullEvaluate(expression);
expressionFailed = FALSE;
referencesToNote[currentOperandNumber] = NULL;
result = evaluateExpressionInternally(expression, TRUE, kindOfFixup,

1
operandStuffSD_6502.c
View File

@ -299,6 +299,7 @@ evaluateOperand(operandType *operand)
case Y_INDEXED_OPND:
result = evaluateExpression(operand->theOperand.expressionUnion,
performingFixups ? NO_FIXUP : OPERAND_FIXUP);
nullEvaluate(result);
if (operand->kindOfOperand != EXPRESSION_OPND) {
if (result->addressMode != EXPRESSION_OPND) {
error(BAD_ADDRESS_MODE_ERROR);