6502/kickc
1
0
Fork 0
mirror of https://gitlab.com/camelot/kickc.git synced 2025-02-05 21:30:52 +00:00
Code Issues Projects Releases Wiki Activity

Added SymbolVariableRef (preparing for refacing ValueReplacer and ReferenceInfos)

Browse Source
This commit is contained in:
Jesper Gravgaard 2018-07-21 22:58:42 +09:00
parent 3328a570c6
commit 62cfda6468
5 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/dk/camelot64/kickc/model/values/ConstantRef.java
View File

@ -5,7 +5,7 @@ import dk.camelot64.kickc.model.symbols.ProgramScope;
import dk.camelot64.kickc.model.types.SymbolType;
/** A reference to a named Constant (in the symbol table) */
public class ConstantRef extends SymbolRef implements ConstantValue {
public class ConstantRef extends SymbolVariableRef implements ConstantValue {
public ConstantRef(ConstantVar constantVar) {
super(constantVar.getFullName());

10
src/main/java/dk/camelot64/kickc/model/values/SymbolVariableRef.java Normal file
View File

@ -0,0 +1,10 @@
package dk.camelot64.kickc.model.values;
/** A reference to a Variable or Constant (in the symbol table) */
public abstract class SymbolVariableRef extends SymbolRef implements RValue {
public SymbolVariableRef(String fullName) {
super(fullName);
}
}

2
src/main/java/dk/camelot64/kickc/model/values/VariableRef.java
View File

@ -3,7 +3,7 @@ package dk.camelot64.kickc.model.values;
import dk.camelot64.kickc.model.symbols.Variable;
/** A reference to a variable from the symbol table */
public class VariableRef extends SymbolRef implements RValue, LValue {
public class VariableRef extends SymbolVariableRef implements RValue, LValue {
public VariableRef(String fullName) {
super(fullName);

1
src/main/java/dk/camelot64/kickc/passes/Pass2ConstantIdentification.java
View File

@ -313,7 +313,6 @@ public class Pass2ConstantIdentification extends Pass2SsaOptimization {
* @return true if the address-of operator is used on the variable
*/
public static boolean isAddressOfUsed(VariableRef var, Program program) {
for(ControlFlowBlock block : program.getGraph().getAllBlocks()) {
for(Statement statement : block.getStatements()) {
if(statement instanceof StatementAssignment) {

21
src/main/java/dk/camelot64/kickc/passes/PassNVariableReferenceInfos.java
View File

@ -1,6 +1,7 @@
package dk.camelot64.kickc.passes;
import dk.camelot64.kickc.model.*;
import dk.camelot64.kickc.model.symbols.SymbolVariable;
import dk.camelot64.kickc.model.values.*;
import dk.camelot64.kickc.model.statements.*;
import dk.camelot64.kickc.model.symbols.ConstantVar;
@ -54,16 +55,16 @@ public class PassNVariableReferenceInfos extends Pass2Base {
* @param rValue The rValue
* @return All referenced variables / constants
*/
private static Collection<SymbolRef> getReferenced(RValue rValue) {
private static Collection<SymbolVariableRef> getReferenced(RValue rValue) {
if(rValue == null) {
return new ArrayList<>();
} else if(rValue instanceof ConstantBinary) {
Collection<SymbolRef> used = new LinkedHashSet<>();
Collection<SymbolVariableRef> used = new LinkedHashSet<>();
used.addAll(getReferenced(((ConstantBinary) rValue).getLeft()));
used.addAll(getReferenced(((ConstantBinary) rValue).getRight()));
return used;
} else if(rValue instanceof ConstantArrayList) {
Collection<SymbolRef> used = new LinkedHashSet<>();
Collection<SymbolVariableRef> used = new LinkedHashSet<>();
for(ConstantValue elem : ((ConstantArrayList) rValue).getElements()) {
used.addAll(getReferenced(elem));
}
@ -75,7 +76,7 @@ public class PassNVariableReferenceInfos extends Pass2Base {
} else if(rValue instanceof ConstantUnary) {
return getReferenced(((ConstantUnary) rValue).getOperand());
} else if(rValue instanceof ConstantRef) {
return Arrays.asList((SymbolRef) rValue);
return Arrays.asList((SymbolVariableRef) rValue);
} else if(rValue instanceof ConstantString) {
return new ArrayList<>();
} else if(rValue instanceof ConstantInteger) {
@ -89,14 +90,14 @@ public class PassNVariableReferenceInfos extends Pass2Base {
} else if(rValue instanceof PointerDereferenceSimple) {
return getReferenced(((PointerDereferenceSimple) rValue).getPointer());
} else if(rValue instanceof PointerDereferenceIndexed) {
Collection<SymbolRef> used = new LinkedHashSet<>();
Collection<SymbolVariableRef> used = new LinkedHashSet<>();
used.addAll(getReferenced(((PointerDereferenceIndexed) rValue).getPointer()));
used.addAll(getReferenced(((PointerDereferenceIndexed) rValue).getIndex()));
return used;
} else if(rValue instanceof VariableRef) {
return Arrays.asList((SymbolRef) rValue);
return Arrays.asList((SymbolVariableRef) rValue);
} else if(rValue instanceof ValueList) {
LinkedHashSet<SymbolRef> used = new LinkedHashSet<>();
LinkedHashSet<SymbolVariableRef> used = new LinkedHashSet<>();
for(RValue value : ((ValueList) rValue).getList()) {
used.addAll(getReferenced(value));
}
@ -108,7 +109,7 @@ public class PassNVariableReferenceInfos extends Pass2Base {
} else if(rValue instanceof ConstantVarPointer) {
return getReferenced(((ConstantVarPointer) rValue).getToVar());
} else if(rValue instanceof RangeValue) {
Collection<SymbolRef> used = new LinkedHashSet<>();
Collection<SymbolVariableRef> used = new LinkedHashSet<>();
used.addAll(getReferenced(((RangeValue) rValue).getRangeFirst()));
used.addAll(getReferenced(((RangeValue) rValue).getRangeLast()));
return used;
@ -323,8 +324,8 @@ public class PassNVariableReferenceInfos extends Pass2Base {
* @param statement The statement to examine
* @return The referenced variables / constants (VariableRef / ConstantRef)
*/
private Collection<SymbolRef> getReferenced(Statement statement) {
LinkedHashSet<SymbolRef> referenced = new LinkedHashSet<>();
private Collection<SymbolVariableRef> getReferenced(Statement statement) {
LinkedHashSet<SymbolVariableRef> referenced = new LinkedHashSet<>();
if(statement instanceof StatementPhiBlock) {
StatementPhiBlock phiBlock = (StatementPhiBlock) statement;
for(StatementPhiBlock.PhiVariable phiVariable : phiBlock.getPhiVariables()) {