6502/kickc
1
0
Fork 0
mirror of https://gitlab.com/camelot/kickc.git synced 2025-01-09 20:31:44 +00:00
Code Issues Projects Releases Wiki Activity

Working on fixing test errors - fixed pointer-dereference-indexed - 228/350 working.

Browse Source
This commit is contained in:
jespergravgaard 2019-05-08 23:24:48 +02:00
parent 64a8389e6e
commit ea990b5e87
3 changed files with 67 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
src/main/java/dk/camelot64/kickc/model/iterator/ProgramExpressionBinary.java
View File

@ -269,4 +269,60 @@ public interface ProgramExpressionBinary extends ProgramExpression {
getConstantBinary().setRight(new ConstantCastValue(toType, getConstantBinary().getRight()));
}
}
/** Binary expression that is an indexed dereference of a pointer eg. ptr[i] or *(ptr+i). */
class ProgramExpressionBinaryPointerDereferenceIndexed implements ProgramExpressionBinary {
/** A program value containing a {@link ConstantBinary}. */
private ProgramValue programValue;
public ProgramExpressionBinaryPointerDereferenceIndexed(ProgramValue programValue) {
this.programValue = programValue;
}
public PointerDereferenceIndexed getPointerDereferenceIndexed() {
return (PointerDereferenceIndexed) programValue.get();
}
@Override
public RValue getLeft() {
return getPointerDereferenceIndexed().getPointer();
}
@Override
public OperatorBinary getOperator() {
return Operators.PLUS;
}
@Override
public RValue getRight() {
return getPointerDereferenceIndexed().getIndex();
}
@Override
public void set(Value value) {
programValue.set(value);
}
@Override
public void addLeftCast(SymbolType toType, ListIterator<Statement> stmtIt, ScopeRef currentScope, ProgramScope symbols) {
if(getPointerDereferenceIndexed().getPointer() instanceof ConstantValue) {
getPointerDereferenceIndexed().setPointer(new ConstantCastValue(toType, (ConstantValue) getPointerDereferenceIndexed().getPointer()));
} else {
// Try to use CastValue - may later have to be supported!
getPointerDereferenceIndexed().setPointer(new CastValue(toType, getPointerDereferenceIndexed().getPointer()));
}
}
@Override
public void addRightCast(SymbolType toType, ListIterator<Statement> stmtIt, ScopeRef currentScope, ProgramScope symbols) {
if(getPointerDereferenceIndexed().getIndex() instanceof ConstantValue) {
getPointerDereferenceIndexed().setIndex(new ConstantCastValue(toType, (ConstantValue) getPointerDereferenceIndexed().getIndex()));
} else {
// Try to use CastValue - may later have to be supported!
getPointerDereferenceIndexed().setIndex(new CastValue(toType, getPointerDereferenceIndexed().getIndex()));
}
}
}
}

17
src/main/java/dk/camelot64/kickc/model/iterator/ProgramExpressionIterator.java
View File

@ -7,6 +7,7 @@ import dk.camelot64.kickc.model.statements.StatementAssignment;
import dk.camelot64.kickc.model.statements.StatementConditionalJump;
import dk.camelot64.kickc.model.values.ConstantBinary;
import dk.camelot64.kickc.model.values.ConstantUnary;
import dk.camelot64.kickc.model.values.PointerDereferenceIndexed;
import java.util.ListIterator;
@ -25,13 +26,16 @@ public class ProgramExpressionIterator {
*/
public static void execute(Program program, ProgramExpressionHandler handler) {
// Iterate all symbols
ProgramValueIterator.execute(program.getScope(), (programValue, currentStmt, stmtIt, currentBlock) -> {
ProgramValueHandler programValueHandler = (programValue, currentStmt, stmtIt, currentBlock) -> {
if(programValue.get() instanceof ConstantBinary) {
handler.execute(new ProgramExpressionBinary.ProgramExpressionBinaryConstant(programValue), null, null, null);
} else if(programValue.get() instanceof ConstantUnary) {
handler.execute(new ProgramExpressionUnary.ProgramExpressionUnaryConstant(programValue), null, null, null);
} else if(programValue.get() instanceof PointerDereferenceIndexed) {
handler.execute(new ProgramExpressionBinary.ProgramExpressionBinaryPointerDereferenceIndexed(programValue), null, null, null);
}
});
};
ProgramValueIterator.execute(program.getScope(), programValueHandler);
// Iterate all blocks/statements
for(ControlFlowBlock block : program.getGraph().getAllBlocks()) {
@ -53,14 +57,7 @@ public class ProgramExpressionIterator {
}
}
// Iterate all statement values
ProgramValueIterator.execute(stmt, (programValue, currentStmt, stmtIt1, currentBlock) -> {
if(programValue.get() instanceof ConstantBinary) {
handler.execute(new ProgramExpressionBinary.ProgramExpressionBinaryConstant(programValue), stmt, stmtIt, block);
} else if(programValue.get() instanceof ConstantUnary) {
handler.execute(new ProgramExpressionUnary.ProgramExpressionUnaryConstant(programValue), stmt, stmtIt, block);
}
}, stmtIt, block);
ProgramValueIterator.execute(stmt, programValueHandler, stmtIt, block);
}
}

8
src/main/java/dk/camelot64/kickc/passes/PassNAddNumberTypeConversions.java
View File

@ -30,13 +30,13 @@ public class PassNAddNumberTypeConversions extends Pass2SsaOptimization {
// Convert both left and right to the found type
SymbolType leftType = SymbolTypeInference.inferType(getProgram().getScope(), left);
if(!leftType.equals(conversionType) && !(leftType instanceof SymbolTypePointer)) {
getLog().append("Adding number conversion cast (" + conversionType + ") " + binary.getLeft().toString() + " in " + currentStmt.toString(getProgram(), false));
binary.addLeftCast(conversionType, stmtIt, currentBlock.getScope(), getScope());
getLog().append("Adding number conversion cast (" + conversionType + ") " + binary.getLeft().toString() + " in " + (currentStmt==null?"":currentStmt.toString(getProgram(), false)));
binary.addLeftCast(conversionType, stmtIt, currentBlock==null?null:currentBlock.getScope(), getScope());
}
SymbolType rightType = SymbolTypeInference.inferType(getProgram().getScope(), right);
if(!rightType.equals(conversionType) && !(rightType instanceof SymbolTypePointer)) {
getLog().append("Adding number conversion cast (" + conversionType + ") " + binary.getRight().toString() + " in " + currentStmt.toString(getProgram(), false));
binary.addRightCast(conversionType, stmtIt, currentBlock.getScope(), getScope());
getLog().append("Adding number conversion cast (" + conversionType + ") " + binary.getRight().toString() + " in " + ((currentStmt==null)?"":currentStmt.toString(getProgram(), false)));
binary.addRightCast(conversionType, stmtIt, currentBlock==null?null:currentBlock.getScope(), getScope());
}
}
}