From b3dfb503f57b37a8a31f4a54449d731e44067f04 Mon Sep 17 00:00:00 2001 From: jespergravgaard Date: Sun, 28 May 2017 12:46:14 +0200 Subject: [PATCH] Now supporting fibonacci array generation --- src/dk/camelot64/kickc/asm/AsmFragment.java | 34 ++++++-- .../kickc/asm/fragment/coptr1=coby2.asm | 2 + .../asm/fragment/xby_lt_coby1_then_la1.asm | 2 + .../kickc/asm/fragment/zpby1=_star_cowo1.asm | 2 + .../asm/fragment/zpby1=_star_zpptrby1.asm | 3 + .../kickc/asm/fragment/zpby1=xby_minus_1.asm | 3 + .../asm/fragment/zpby1=xby_minus_coby1.asm | 4 + .../kickc/asm/fragment/zpiby1=zpby1.asm | 3 + .../asm/fragment/zpptrby1=cowo1_plus_xby.asm | 7 ++ .../fragment/zpptrby1=cowo1_plus_zpby1.asm | 7 ++ .../icl/Pass1GenerateStatementSequence.java | 7 +- .../kickc/icl/Pass2AliasElimination.java | 2 +- .../Pass2ConditionalJumpSimplification.java | 3 +- .../kickc/icl/Pass2ConstantPropagation.java | 9 ++- .../kickc/icl/Pass2CullEmptyBlocks.java | 2 +- .../icl/Pass2RedundantPhiElimination.java | 2 +- .../kickc/icl/Pass2SelfPhiElimination.java | 4 +- ...ization.java => Pass2SsaOptimization.java} | 80 ++++++++++++------- .../kickc/icl/Pass5AsmOptimization.java | 33 ++++++++ .../kickc/icl/Pass5NextJumpElimination.java | 23 ++---- .../kickc/icl/PassTypeInference.java | 28 ++++++- .../kickc/icl/PointerDereference.java | 16 +--- .../kickc/icl/PointerDereferenceConstant.java | 24 ++++++ .../kickc/icl/PointerDereferenceVariable.java | 28 +++++++ src/dk/camelot64/kickc/test/Main.java | 19 +++-- src/dk/camelot64/kickc/test/fibmem.kc | 8 ++ 26 files changed, 271 insertions(+), 84 deletions(-) create mode 100644 src/dk/camelot64/kickc/asm/fragment/coptr1=coby2.asm create mode 100644 src/dk/camelot64/kickc/asm/fragment/xby_lt_coby1_then_la1.asm create mode 100644 src/dk/camelot64/kickc/asm/fragment/zpby1=_star_cowo1.asm create mode 100644 src/dk/camelot64/kickc/asm/fragment/zpby1=_star_zpptrby1.asm create mode 100644 src/dk/camelot64/kickc/asm/fragment/zpby1=xby_minus_1.asm create mode 100644 src/dk/camelot64/kickc/asm/fragment/zpby1=xby_minus_coby1.asm create mode 100644 src/dk/camelot64/kickc/asm/fragment/zpiby1=zpby1.asm create mode 100644 src/dk/camelot64/kickc/asm/fragment/zpptrby1=cowo1_plus_xby.asm create mode 100644 src/dk/camelot64/kickc/asm/fragment/zpptrby1=cowo1_plus_zpby1.asm rename src/dk/camelot64/kickc/icl/{Pass2Optimization.java => Pass2SsaOptimization.java} (73%) create mode 100644 src/dk/camelot64/kickc/icl/Pass5AsmOptimization.java create mode 100644 src/dk/camelot64/kickc/icl/PointerDereferenceConstant.java create mode 100644 src/dk/camelot64/kickc/icl/PointerDereferenceVariable.java create mode 100644 src/dk/camelot64/kickc/test/fibmem.kc diff --git a/src/dk/camelot64/kickc/asm/AsmFragment.java b/src/dk/camelot64/kickc/asm/AsmFragment.java index 17e5f5635..d054283f0 100644 --- a/src/dk/camelot64/kickc/asm/AsmFragment.java +++ b/src/dk/camelot64/kickc/asm/AsmFragment.java @@ -101,6 +101,8 @@ public class AsmFragment { private static String getOperatorFragmentName(Operator operator) { String op = operator.getOperator(); switch (op) { + case "*": + return "_star_"; case "+": return "_plus_"; case "-": @@ -198,8 +200,8 @@ public class AsmFragment { bindings.put(name, value); return name; } - } else if (value instanceof PointerDereference) { - PointerDereference deref = (PointerDereference) value; + } else if (value instanceof PointerDereferenceVariable) { + PointerDereferenceVariable deref = (PointerDereferenceVariable) value; Variable pointer = deref.getPointer(); RegisterAllocation.Register register = symbols.getRegister(pointer); if (RegisterAllocation.RegisterType.ZP_PTR_BYTE.equals(register.getType())) { @@ -207,13 +209,21 @@ public class AsmFragment { bindings.put(name, value); return name; } + } else if (value instanceof PointerDereferenceConstant) { + PointerDereferenceConstant deref = (PointerDereferenceConstant) value; + Constant pointer = deref.getPointer(); + if(pointer instanceof ConstantInteger) { + String name = "coptr"+ nextConstByteIdx++; + bindings.put(name, value); + return name; + } } else if (value instanceof ConstantInteger) { ConstantInteger intValue = (ConstantInteger) value; - if (intValue.getType().equals(SymbolTypeBasic.BYTE)) { + if (SymbolTypeBasic.BYTE.equals(intValue.getType())) { String name = "coby" + nextConstByteIdx++; bindings.put(name, value); return name; - } else if (intValue.getType().equals(SymbolTypeBasic.WORD)) { + } else if (SymbolTypeBasic.WORD.equals(intValue.getType())) { String name = "cowo" + nextConstByteIdx++; bindings.put(name, value); return name; @@ -234,6 +244,9 @@ public class AsmFragment { */ public String getBoundValue(String name) { Value boundValue = getBinding(name); + if(boundValue==null) { + throw new RuntimeException("Binding not found in fragment '" + name+"'"); + } String bound; if (boundValue instanceof Variable) { RegisterAllocation.Register register = symbols.getRegister((Variable) boundValue); @@ -246,8 +259,8 @@ public class AsmFragment { } else { throw new RuntimeException("Register Type not implemented " + register); } - } else if(boundValue instanceof PointerDereference) { - PointerDereference deref = (PointerDereference) boundValue; + } else if(boundValue instanceof PointerDereferenceVariable) { + PointerDereferenceVariable deref = (PointerDereferenceVariable) boundValue; Variable pointer = deref.getPointer(); RegisterAllocation.Register register = symbols.getRegister(pointer); if(register instanceof RegisterAllocation.RegisterZpPointerByte) { @@ -255,6 +268,15 @@ public class AsmFragment { } else { throw new RuntimeException("Bound Value Type not implemented " + boundValue); } + } else if(boundValue instanceof PointerDereferenceConstant) { + PointerDereferenceConstant deref = (PointerDereferenceConstant) boundValue; + Constant pointer = deref.getPointer(); + if (pointer instanceof ConstantInteger) { + ConstantInteger intPointer = (ConstantInteger) pointer; + bound = Integer.toString(intPointer.getNumber()); + } else { + throw new RuntimeException("Bound Value Type not implemented " + boundValue); + } } else if (boundValue instanceof ConstantInteger) { ConstantInteger boundInt = (ConstantInteger) boundValue; if (boundInt.getType().equals(SymbolTypeBasic.BYTE)) { diff --git a/src/dk/camelot64/kickc/asm/fragment/coptr1=coby2.asm b/src/dk/camelot64/kickc/asm/fragment/coptr1=coby2.asm new file mode 100644 index 000000000..5956ed8ab --- /dev/null +++ b/src/dk/camelot64/kickc/asm/fragment/coptr1=coby2.asm @@ -0,0 +1,2 @@ +lda #{coby2} +sta {coptr1} \ No newline at end of file diff --git a/src/dk/camelot64/kickc/asm/fragment/xby_lt_coby1_then_la1.asm b/src/dk/camelot64/kickc/asm/fragment/xby_lt_coby1_then_la1.asm new file mode 100644 index 000000000..22bb869e9 --- /dev/null +++ b/src/dk/camelot64/kickc/asm/fragment/xby_lt_coby1_then_la1.asm @@ -0,0 +1,2 @@ +cpx #{coby1} +bcc {la1} \ No newline at end of file diff --git a/src/dk/camelot64/kickc/asm/fragment/zpby1=_star_cowo1.asm b/src/dk/camelot64/kickc/asm/fragment/zpby1=_star_cowo1.asm new file mode 100644 index 000000000..03bfd7fd3 --- /dev/null +++ b/src/dk/camelot64/kickc/asm/fragment/zpby1=_star_cowo1.asm @@ -0,0 +1,2 @@ +lda {cowo1} +sta {zpby1} \ No newline at end of file diff --git a/src/dk/camelot64/kickc/asm/fragment/zpby1=_star_zpptrby1.asm b/src/dk/camelot64/kickc/asm/fragment/zpby1=_star_zpptrby1.asm new file mode 100644 index 000000000..b3e8813c7 --- /dev/null +++ b/src/dk/camelot64/kickc/asm/fragment/zpby1=_star_zpptrby1.asm @@ -0,0 +1,3 @@ +ldy #0 +lda ({zpptrby1}),y +sta {zpby1} \ No newline at end of file diff --git a/src/dk/camelot64/kickc/asm/fragment/zpby1=xby_minus_1.asm b/src/dk/camelot64/kickc/asm/fragment/zpby1=xby_minus_1.asm new file mode 100644 index 000000000..5b296499b --- /dev/null +++ b/src/dk/camelot64/kickc/asm/fragment/zpby1=xby_minus_1.asm @@ -0,0 +1,3 @@ +dex +stx {zpby1} +inx \ No newline at end of file diff --git a/src/dk/camelot64/kickc/asm/fragment/zpby1=xby_minus_coby1.asm b/src/dk/camelot64/kickc/asm/fragment/zpby1=xby_minus_coby1.asm new file mode 100644 index 000000000..e1263758c --- /dev/null +++ b/src/dk/camelot64/kickc/asm/fragment/zpby1=xby_minus_coby1.asm @@ -0,0 +1,4 @@ +txa +sec +sbc #{coby1} +sta {zpby1} \ No newline at end of file diff --git a/src/dk/camelot64/kickc/asm/fragment/zpiby1=zpby1.asm b/src/dk/camelot64/kickc/asm/fragment/zpiby1=zpby1.asm new file mode 100644 index 000000000..7a4cba618 --- /dev/null +++ b/src/dk/camelot64/kickc/asm/fragment/zpiby1=zpby1.asm @@ -0,0 +1,3 @@ +ldy #0 +lda {zpby1} +sta ({zpiby1}),y \ No newline at end of file diff --git a/src/dk/camelot64/kickc/asm/fragment/zpptrby1=cowo1_plus_xby.asm b/src/dk/camelot64/kickc/asm/fragment/zpptrby1=cowo1_plus_xby.asm new file mode 100644 index 000000000..32bad96a1 --- /dev/null +++ b/src/dk/camelot64/kickc/asm/fragment/zpptrby1=cowo1_plus_xby.asm @@ -0,0 +1,7 @@ +txa +clc +adc #<{cowo1} +sta {zpptrby1} +lda #0 +adc #>{cowo1} +sta {zpptrby1}+1 diff --git a/src/dk/camelot64/kickc/asm/fragment/zpptrby1=cowo1_plus_zpby1.asm b/src/dk/camelot64/kickc/asm/fragment/zpptrby1=cowo1_plus_zpby1.asm new file mode 100644 index 000000000..9b9f96b07 --- /dev/null +++ b/src/dk/camelot64/kickc/asm/fragment/zpptrby1=cowo1_plus_zpby1.asm @@ -0,0 +1,7 @@ +lda #<{cowo1} +clc +adc {zpby1} +sta {zpptrby1} +lda #>{cowo1} +adc #0 +sta {zpptrby1}+1 \ No newline at end of file diff --git a/src/dk/camelot64/kickc/icl/Pass1GenerateStatementSequence.java b/src/dk/camelot64/kickc/icl/Pass1GenerateStatementSequence.java index 4da7ecc60..d1329c304 100644 --- a/src/dk/camelot64/kickc/icl/Pass1GenerateStatementSequence.java +++ b/src/dk/camelot64/kickc/icl/Pass1GenerateStatementSequence.java @@ -165,7 +165,7 @@ public class Pass1GenerateStatementSequence extends KickCBaseVisitor { VariableIntermediate tmpVar = symbolTable.newIntermediateAssignment(); Statement stmt = new StatementAssignment(tmpVar, lval, operator, index); sequence.addStatement(stmt); - return new PointerDereference(tmpVar); + return new PointerDereferenceVariable(tmpVar); } @Override @@ -218,7 +218,10 @@ public class Pass1GenerateStatementSequence extends KickCBaseVisitor { VariableIntermediate tmpVar = symbolTable.newIntermediateAssignment(); Statement stmt = new StatementAssignment(tmpVar, array, operator, index); sequence.addStatement(stmt); - return new PointerDereference(tmpVar); + VariableIntermediate tmpVar2 = symbolTable.newIntermediateAssignment(); + Statement stmt2 = new StatementAssignment(tmpVar2, null, new Operator("*"), tmpVar ); + sequence.addStatement(stmt2); + return tmpVar2; } @Override diff --git a/src/dk/camelot64/kickc/icl/Pass2AliasElimination.java b/src/dk/camelot64/kickc/icl/Pass2AliasElimination.java index 27318426b..8b58f86a0 100644 --- a/src/dk/camelot64/kickc/icl/Pass2AliasElimination.java +++ b/src/dk/camelot64/kickc/icl/Pass2AliasElimination.java @@ -5,7 +5,7 @@ import java.util.Iterator; import java.util.Map; /** Compiler Pass eliminating alias assignments */ -public class Pass2AliasElimination extends Pass2Optimization { +public class Pass2AliasElimination extends Pass2SsaOptimization { public Pass2AliasElimination(ControlFlowGraph graph, SymbolTable symbolTable) { super(graph, symbolTable); diff --git a/src/dk/camelot64/kickc/icl/Pass2ConditionalJumpSimplification.java b/src/dk/camelot64/kickc/icl/Pass2ConditionalJumpSimplification.java index 578ffe60b..cd6e2008b 100644 --- a/src/dk/camelot64/kickc/icl/Pass2ConditionalJumpSimplification.java +++ b/src/dk/camelot64/kickc/icl/Pass2ConditionalJumpSimplification.java @@ -1,14 +1,13 @@ package dk.camelot64.kickc.icl; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; import java.util.Map; /** * Compiler Pass simplifying conditional jumps that are simple comparisons */ -public class Pass2ConditionalJumpSimplification extends Pass2Optimization { +public class Pass2ConditionalJumpSimplification extends Pass2SsaOptimization { private Map> allUsages; diff --git a/src/dk/camelot64/kickc/icl/Pass2ConstantPropagation.java b/src/dk/camelot64/kickc/icl/Pass2ConstantPropagation.java index 521cf94aa..d577afc26 100644 --- a/src/dk/camelot64/kickc/icl/Pass2ConstantPropagation.java +++ b/src/dk/camelot64/kickc/icl/Pass2ConstantPropagation.java @@ -4,7 +4,7 @@ import java.util.HashMap; import java.util.Map; /** Compiler Pass propagating constants in expressions eliminating constant variables */ -public class Pass2ConstantPropagation extends Pass2Optimization { +public class Pass2ConstantPropagation extends Pass2SsaOptimization { public Pass2ConstantPropagation(ControlFlowGraph graph, SymbolTable symbolTable) { super(graph, symbolTable); @@ -47,7 +47,9 @@ public class Pass2ConstantPropagation extends Pass2Optimization { } else { // Constant unary expression Constant constant = calculateUnary(assignment.getOperator(), (Constant) assignment.getRValue2()); - constants.put(variable, constant); + if(constant!=null) { + constants.put(variable, constant); + } } } else if (assignment.getRValue1() instanceof Constant && assignment.getRValue2() instanceof Constant) { // Constant binary expression @@ -141,6 +143,9 @@ public class Pass2ConstantPropagation extends Pass2Optimization { case "+": { return c; } + case "*": { // pointer dereference + return null; + } default: throw new RuntimeException("Unhandled Unary Operator " + operator.getOperator()); } diff --git a/src/dk/camelot64/kickc/icl/Pass2CullEmptyBlocks.java b/src/dk/camelot64/kickc/icl/Pass2CullEmptyBlocks.java index 576d36452..6a0fc0a3e 100644 --- a/src/dk/camelot64/kickc/icl/Pass2CullEmptyBlocks.java +++ b/src/dk/camelot64/kickc/icl/Pass2CullEmptyBlocks.java @@ -3,7 +3,7 @@ package dk.camelot64.kickc.icl; import java.util.*; /** Pass that culls empty control flow blocks from the program */ -public class Pass2CullEmptyBlocks extends Pass2Optimization { +public class Pass2CullEmptyBlocks extends Pass2SsaOptimization { public Pass2CullEmptyBlocks(ControlFlowGraph graph, SymbolTable symbolTable) { super(graph, symbolTable); diff --git a/src/dk/camelot64/kickc/icl/Pass2RedundantPhiElimination.java b/src/dk/camelot64/kickc/icl/Pass2RedundantPhiElimination.java index 847ea83dc..ff0dfefc8 100644 --- a/src/dk/camelot64/kickc/icl/Pass2RedundantPhiElimination.java +++ b/src/dk/camelot64/kickc/icl/Pass2RedundantPhiElimination.java @@ -4,7 +4,7 @@ import java.util.HashMap; import java.util.Map; /** Compiler Pass eliminating redundant phi functions */ -public class Pass2RedundantPhiElimination extends Pass2Optimization{ +public class Pass2RedundantPhiElimination extends Pass2SsaOptimization { public Pass2RedundantPhiElimination(ControlFlowGraph graph, SymbolTable symbolTable) { super(graph, symbolTable); diff --git a/src/dk/camelot64/kickc/icl/Pass2SelfPhiElimination.java b/src/dk/camelot64/kickc/icl/Pass2SelfPhiElimination.java index 08c342979..067bb1904 100644 --- a/src/dk/camelot64/kickc/icl/Pass2SelfPhiElimination.java +++ b/src/dk/camelot64/kickc/icl/Pass2SelfPhiElimination.java @@ -1,11 +1,9 @@ package dk.camelot64.kickc.icl; -import java.util.HashMap; import java.util.Iterator; -import java.util.Map; /** Compiler Pass eliminating phi self assignments */ -public class Pass2SelfPhiElimination extends Pass2Optimization{ +public class Pass2SelfPhiElimination extends Pass2SsaOptimization { public Pass2SelfPhiElimination(ControlFlowGraph graph, SymbolTable symbolTable) { super(graph, symbolTable); diff --git a/src/dk/camelot64/kickc/icl/Pass2Optimization.java b/src/dk/camelot64/kickc/icl/Pass2SsaOptimization.java similarity index 73% rename from src/dk/camelot64/kickc/icl/Pass2Optimization.java rename to src/dk/camelot64/kickc/icl/Pass2SsaOptimization.java index 8568d7a7f..ff390bea8 100644 --- a/src/dk/camelot64/kickc/icl/Pass2Optimization.java +++ b/src/dk/camelot64/kickc/icl/Pass2SsaOptimization.java @@ -3,15 +3,15 @@ package dk.camelot64.kickc.icl; import java.util.*; /** - * Optimization performed during Compiler Pass 2. + * Optimization on Single Static Assignment form (Control Flow Graph) performed during Compiler Pass 2. * Optimizations are performed repeatedly until none of them yield any result - * */ -public abstract class Pass2Optimization { + */ +public abstract class Pass2SsaOptimization { private ControlFlowGraph graph; private SymbolTable symbolTable; - public Pass2Optimization(ControlFlowGraph graph, SymbolTable symbolTable) { + public Pass2SsaOptimization(ControlFlowGraph graph, SymbolTable symbolTable) { this.graph = graph; this.symbolTable = symbolTable; } @@ -31,7 +31,9 @@ public abstract class Pass2Optimization { */ public abstract boolean optimize(); - /** Singleton signalling that an RValue is never assigned and can safely be discarded as rvalue in phi-functions.*/ + /** + * Singleton signalling that an RValue is never assigned and can safely be discarded as rvalue in phi-functions. + */ public static RValue VOID = new RValue() { @Override public String toString() { @@ -41,33 +43,52 @@ public abstract class Pass2Optimization { /** * Replace all usages of variables in statements with aliases. + * * @param aliases Variables that have alias values. */ public void replaceVariables(final Map aliases) { ControlFlowGraphBaseVisitor visitor = new ControlFlowGraphBaseVisitor() { @Override public Void visitAssignment(StatementAssignment assignment) { - if(getAlias(aliases, assignment.getLValue()) !=null) { - RValue alias = getAlias(aliases, assignment.getLValue()); - if(alias instanceof LValue) { + LValue lValue = assignment.getLValue(); + if (getAlias(aliases, lValue) != null) { + RValue alias = getAlias(aliases, lValue); + if (alias instanceof LValue) { assignment.setLValue((LValue) alias); + } else { + throw new RuntimeException("Error replacing LValue variable " + lValue + " with " + alias); } } - if(getAlias(aliases, assignment.getRValue1())!=null) { + if (getAlias(aliases, assignment.getRValue1()) != null) { assignment.setRValue1(getAlias(aliases, assignment.getRValue1())); } - if(getAlias(aliases, assignment.getRValue2())!=null) { + if (getAlias(aliases, assignment.getRValue2()) != null) { assignment.setRValue2(getAlias(aliases, assignment.getRValue2())); } + // Handle pointer dereference in LValue + if (lValue instanceof PointerDereferenceVariable) { + PointerDereferenceVariable deref = (PointerDereferenceVariable) lValue; + Variable pointer = deref.getPointer(); + if (getAlias(aliases, pointer) != null) { + RValue alias = getAlias(aliases, pointer); + if (alias instanceof Variable) { + deref.setPointerVariable((Variable) alias); + } else if (alias instanceof Constant) { + assignment.setLValue(new PointerDereferenceConstant((Constant) alias)); + } else { + throw new RuntimeException("Error replacing LValue variable " + lValue + " with " + alias); + } + } + } return null; } @Override public Void visitConditionalJump(StatementConditionalJump conditionalJump) { - if(getAlias(aliases, conditionalJump.getRValue1())!=null) { + if (getAlias(aliases, conditionalJump.getRValue1()) != null) { conditionalJump.setRValue1(getAlias(aliases, conditionalJump.getRValue1())); } - if(getAlias(aliases, conditionalJump.getRValue2())!=null) { + if (getAlias(aliases, conditionalJump.getRValue2()) != null) { conditionalJump.setRValue2(getAlias(aliases, conditionalJump.getRValue2())); } return null; @@ -75,9 +96,9 @@ public abstract class Pass2Optimization { @Override public Void visitPhi(StatementPhi phi) { - if(getAlias(aliases, phi.getLValue())!=null) { + if (getAlias(aliases, phi.getLValue()) != null) { RValue alias = getAlias(aliases, phi.getLValue()); - if(alias instanceof LValue) { + if (alias instanceof LValue) { phi.setLValue((Variable) alias); } } @@ -98,15 +119,16 @@ public abstract class Pass2Optimization { visitor.visitGraph(graph); } - /** Get the alias to use for an RValue. + /** + * Get the alias to use for an RValue. * * @param aliases The alias map - * @param rValue The RValue to find an alias for + * @param rValue The RValue to find an alias for * @return The alias to use. Null if no alias exists. */ - private static RValue getAlias(Map aliases,RValue rValue) { + private static RValue getAlias(Map aliases, RValue rValue) { RValue alias = aliases.get(rValue); - while (aliases.get(alias)!=null) { + while (aliases.get(alias) != null) { alias = aliases.get(alias); } return alias; @@ -114,14 +136,15 @@ public abstract class Pass2Optimization { /** * Replace all usages of a label in statements with another label. + * * @param replacements Variables that have alias values. */ public void replaceLabels(final Map replacements) { ControlFlowGraphBaseVisitor visitor = new ControlFlowGraphBaseVisitor() { @Override - public Void visitConditionalJump(StatementConditionalJump conditionalJump) { - if(getReplacement(replacements, conditionalJump.getDestination())!=null) { + public Void visitConditionalJump(StatementConditionalJump conditionalJump) { + if (getReplacement(replacements, conditionalJump.getDestination()) != null) { conditionalJump.setDestination(getReplacement(replacements, conditionalJump.getDestination())); } return null; @@ -129,7 +152,7 @@ public abstract class Pass2Optimization { @Override public Void visitJump(StatementJump jump) { - if(getReplacement(replacements, jump.getDestination())!=null) { + if (getReplacement(replacements, jump.getDestination()) != null) { jump.setDestination(getReplacement(replacements, jump.getDestination())); } return null; @@ -139,7 +162,7 @@ public abstract class Pass2Optimization { public Void visitPhi(StatementPhi phi) { for (StatementPhi.PreviousSymbol previousSymbol : phi.getPreviousVersions()) { Label replacement = getReplacement(replacements, previousSymbol.getBlock().getLabel()); - if(replacement !=null) { + if (replacement != null) { previousSymbol.setBlock(graph.getBlock(replacement)); } } @@ -149,15 +172,16 @@ public abstract class Pass2Optimization { visitor.visitGraph(graph); } - /** Get the label to use as replacement for another label. + /** + * Get the label to use as replacement for another label. * * @param replacements The label replacement map - * @param label The label to find a replacement for + * @param label The label to find a replacement for * @return The alias to use. Null if no replacement exists. */ - private static Label getReplacement(Map replacements,Label label) { + private static Label getReplacement(Map replacements, Label label) { Label replacement = replacements.get(label); - while (replacements.get(replacement)!=null) { + while (replacements.get(replacement) != null) { replacement = replacements.get(replacement); } return replacement; @@ -166,6 +190,7 @@ public abstract class Pass2Optimization { /** * Remove all assignments to specific LValues from the control flow graph (as they are no longer needed). + * * @param variables The variables to eliminate */ public void removeAssignments(Collection variables) { @@ -177,7 +202,7 @@ public abstract class Pass2Optimization { if (variables.contains(assignment.getLValue())) { iterator.remove(); } - } else if(statement instanceof StatementPhi) { + } else if (statement instanceof StatementPhi) { StatementPhi phi = (StatementPhi) statement; if (variables.contains(phi.getLValue())) { iterator.remove(); @@ -189,6 +214,7 @@ public abstract class Pass2Optimization { /** * Remove variables from the symbol table + * * @param variables The variables to remove */ public void deleteSymbols(Collection variables) { diff --git a/src/dk/camelot64/kickc/icl/Pass5AsmOptimization.java b/src/dk/camelot64/kickc/icl/Pass5AsmOptimization.java new file mode 100644 index 000000000..4fa7b9dc8 --- /dev/null +++ b/src/dk/camelot64/kickc/icl/Pass5AsmOptimization.java @@ -0,0 +1,33 @@ +package dk.camelot64.kickc.icl; + +import dk.camelot64.kickc.asm.AsmLine; +import dk.camelot64.kickc.asm.AsmProgram; + +import java.util.Iterator; +import java.util.List; + +/** Optimization performed on Assembler Code (Asm Code). + * Optimizations are performed repeatedly until none of them yield any result + **/ +public class Pass5AsmOptimization { + + private AsmProgram program; + + public Pass5AsmOptimization(AsmProgram program) { + this.program = program; + } + + public AsmProgram getProgram() { + return program; + } + + public void remove(List remove) { + for (Iterator iterator = program.getLines().iterator(); iterator.hasNext(); ) { + AsmLine line = iterator.next(); + if (remove.contains(line)) { + System.out.println("Removing instruction "+line.getAsm()); + iterator.remove(); + } + } + } +} diff --git a/src/dk/camelot64/kickc/icl/Pass5NextJumpElimination.java b/src/dk/camelot64/kickc/icl/Pass5NextJumpElimination.java index ec5bf11a0..6098d48ae 100644 --- a/src/dk/camelot64/kickc/icl/Pass5NextJumpElimination.java +++ b/src/dk/camelot64/kickc/icl/Pass5NextJumpElimination.java @@ -10,23 +10,20 @@ import java.util.Iterator; import java.util.List; /** Optimize assembler code by removing jumps to labels immediately following the jump */ -public class Pass5NextJumpElimination { - - private AsmProgram program; +public class Pass5NextJumpElimination extends Pass5AsmOptimization { public Pass5NextJumpElimination(AsmProgram program) { - this.program = program; + super(program); } public boolean optimize() { - List remove = new ArrayList<>(); + List removeLines = new ArrayList<>(); AsmInstruction candidate = null; - for (AsmLine line : program.getLines()) { + for (AsmLine line : getProgram().getLines()) { if(candidate!=null) { if(line instanceof AsmLabel) { if(((AsmLabel) line).getLabel().equals(candidate.getParameter())) { - remove.add(candidate); - candidate = null; + removeLines.add(candidate); } } } @@ -38,13 +35,7 @@ public class Pass5NextJumpElimination { } } } - for (Iterator iterator = program.getLines().iterator(); iterator.hasNext(); ) { - AsmLine line = iterator.next(); - if (remove.contains(line)) { - System.out.println("Removing jump to next instruction "+line.getAsm()); - iterator.remove(); - } - } - return remove.size()>0; + remove(removeLines); + return removeLines.size()>0; } } diff --git a/src/dk/camelot64/kickc/icl/PassTypeInference.java b/src/dk/camelot64/kickc/icl/PassTypeInference.java index edf1a5872..90c5646be 100644 --- a/src/dk/camelot64/kickc/icl/PassTypeInference.java +++ b/src/dk/camelot64/kickc/icl/PassTypeInference.java @@ -18,7 +18,8 @@ public class PassTypeInference { if (operator == null || assignment.getRValue1() == null) { // Copy operation or Unary operation RValue rValue = assignment.getRValue2(); - SymbolType type = inferType(rValue); + SymbolType subType = inferType(rValue); + SymbolType type = inferType(operator, subType); symbol.setInferredType(type); } else { // Binary operation @@ -33,6 +34,23 @@ public class PassTypeInference { } } + private SymbolType inferType(Operator operator, SymbolType subType) { + if(operator==null) { + return subType; + } + String op = operator.getOperator(); + switch (op) { + case "*": + if(subType instanceof SymbolTypePointer) { + return ((SymbolTypePointer) subType).getElementType(); + } else { + throw new RuntimeException("Type error: Dereferencing a non-pointer "+subType); + } + default: + return subType; + } + } + private SymbolType inferType(SymbolType type1, Operator operator, SymbolType type2) { String op = operator.getOperator(); switch (op) { @@ -55,7 +73,15 @@ public class PassTypeInference { if (type1 instanceof SymbolTypePointer && (type2.equals(SymbolTypeBasic.BYTE) || type2.equals(SymbolTypeBasic.WORD))) { return new SymbolTypePointer(((SymbolTypePointer) type1).getElementType()); } + if (type1 instanceof SymbolTypePointer && type2 instanceof SymbolTypePointer) { + SymbolType elmType1 = ((SymbolTypePointer) type1).getElementType(); + SymbolType elmType2 = ((SymbolTypePointer) type2).getElementType(); + return inferType(elmType1, operator, elmType2); + } case "*": + if(type1==null && type2 instanceof SymbolTypePointer) { + return ((SymbolTypePointer) type2).getElementType(); + } case "/": if (SymbolTypeBasic.WORD.equals(type1) || SymbolTypeBasic.WORD.equals(type2)) { return SymbolTypeBasic.WORD; diff --git a/src/dk/camelot64/kickc/icl/PointerDereference.java b/src/dk/camelot64/kickc/icl/PointerDereference.java index 1c34f946a..89578d0b1 100644 --- a/src/dk/camelot64/kickc/icl/PointerDereference.java +++ b/src/dk/camelot64/kickc/icl/PointerDereference.java @@ -1,20 +1,8 @@ package dk.camelot64.kickc.icl; /** A dereferenced pointer */ -public class PointerDereference implements LValue { +public interface PointerDereference extends LValue { - private Variable pointer; + Value getPointer(); - public PointerDereference(Variable pointer) { - this.pointer = pointer; - } - - public Variable getPointer() { - return pointer; - } - - @Override - public String toString() { - return "*(" + pointer + ')'; - } } diff --git a/src/dk/camelot64/kickc/icl/PointerDereferenceConstant.java b/src/dk/camelot64/kickc/icl/PointerDereferenceConstant.java new file mode 100644 index 000000000..36e511aef --- /dev/null +++ b/src/dk/camelot64/kickc/icl/PointerDereferenceConstant.java @@ -0,0 +1,24 @@ +package dk.camelot64.kickc.icl; + +/** A dereferenced constant pointer */ +public class PointerDereferenceConstant implements LValue { + + private Constant pointer; + + public PointerDereferenceConstant(Constant pointer) { + this.pointer = pointer; + } + + public Constant getPointer() { + return pointer; + } + + public Constant getPointerConstant() { + return pointer; + } + + @Override + public String toString() { + return "*(" + pointer + ')'; + } +} diff --git a/src/dk/camelot64/kickc/icl/PointerDereferenceVariable.java b/src/dk/camelot64/kickc/icl/PointerDereferenceVariable.java new file mode 100644 index 000000000..e1148a10e --- /dev/null +++ b/src/dk/camelot64/kickc/icl/PointerDereferenceVariable.java @@ -0,0 +1,28 @@ +package dk.camelot64.kickc.icl; + +/** A dereferenced variable pointer */ +public class PointerDereferenceVariable implements PointerDereference { + + private Variable pointer; + + public PointerDereferenceVariable(Variable pointer) { + this.pointer = pointer; + } + + public Variable getPointer() { + return pointer; + } + + public Variable getPointerVariable() { + return pointer; + } + + @Override + public String toString() { + return "*(" + pointer + ')'; + } + + public void setPointerVariable(Variable pointer) { + this.pointer = pointer; + } +} diff --git a/src/dk/camelot64/kickc/test/Main.java b/src/dk/camelot64/kickc/test/Main.java index a92a5dc70..c3c865a99 100644 --- a/src/dk/camelot64/kickc/test/Main.java +++ b/src/dk/camelot64/kickc/test/Main.java @@ -13,7 +13,7 @@ import java.util.List; /** Test my KickC Grammar */ public class Main { public static void main(String[] args) throws IOException { - final String fileName = "src/dk/camelot64/kickc/test/mem.kc"; + final String fileName = "src/dk/camelot64/kickc/test/fibmem.kc"; final CharStream input = CharStreams.fromFileName(fileName); System.out.println(input.toString()); KickCLexer lexer = new KickCLexer(input); @@ -42,7 +42,7 @@ public class Main { new Pass1GenerateSingleStaticAssignmentForm(symbolTable, controlFlowGraph); pass1GenerateSingleStaticAssignmentForm.generate(); - List optimizations = new ArrayList<>(); + List optimizations = new ArrayList<>(); optimizations.add(new Pass2CullEmptyBlocks(controlFlowGraph, symbolTable)); optimizations.add(new Pass2ConstantPropagation(controlFlowGraph, symbolTable)); optimizations.add(new Pass2AliasElimination(controlFlowGraph, symbolTable)); @@ -53,14 +53,14 @@ public class Main { System.out.println("INITIAL CONTROL FLOW GRAPH"); System.out.println(controlFlowGraph.toString()); - boolean optimized = true; - while (optimized) { - optimized = false; - for (Pass2Optimization optimization : optimizations) { + boolean ssaOptimized = true; + while (ssaOptimized) { + ssaOptimized = false; + for (Pass2SsaOptimization optimization : optimizations) { boolean stepOptimized = optimization.optimize(); if (stepOptimized) { System.out.println("Succesful optimization "+optimization); - optimized = true; + ssaOptimized = true; System.out.println("CONTROL FLOW GRAPH"); System.out.println(controlFlowGraph.toString()); } @@ -73,7 +73,10 @@ public class Main { Pass4CodeGeneration pass4CodeGeneration = new Pass4CodeGeneration(controlFlowGraph, symbolTable); AsmProgram asmProgram = pass4CodeGeneration.generate(); Pass5NextJumpElimination pass5NextJumpElimination = new Pass5NextJumpElimination(asmProgram); - pass5NextJumpElimination.optimize(); + boolean asmOptimized = true; + while(asmOptimized) { + asmOptimized = pass5NextJumpElimination.optimize(); + } System.out.println("SYMBOLS"); diff --git a/src/dk/camelot64/kickc/test/fibmem.kc b/src/dk/camelot64/kickc/test/fibmem.kc new file mode 100644 index 000000000..d727226f5 --- /dev/null +++ b/src/dk/camelot64/kickc/test/fibmem.kc @@ -0,0 +1,8 @@ +byte[15] fibs = $1100; +fibs[0] = 0; +fibs[1] = 1; +byte i = 2; +while(i<15) { + fibs[i] = fibs[i-2]+fibs[i-1]; + i = i + 1; +}