diff --git a/src/main/java/dk/camelot64/kickc/fragment/AsmFragmentTemplate.java b/src/main/java/dk/camelot64/kickc/fragment/AsmFragmentTemplate.java index bb3d563b0..1db93c6e6 100644 --- a/src/main/java/dk/camelot64/kickc/fragment/AsmFragmentTemplate.java +++ b/src/main/java/dk/camelot64/kickc/fragment/AsmFragmentTemplate.java @@ -11,7 +11,7 @@ import org.antlr.v4.runtime.*; public class AsmFragmentTemplate { /** true if the fragment was loaded from disk. */ - boolean file; + private boolean file; /** The fragment template signature name. */ private String signature; /** The fragment template body */ diff --git a/src/main/java/dk/camelot64/kickc/passes/Pass4CodeGeneration.java b/src/main/java/dk/camelot64/kickc/passes/Pass4CodeGeneration.java index 1e2e5e661..6ab23f6a1 100644 --- a/src/main/java/dk/camelot64/kickc/passes/Pass4CodeGeneration.java +++ b/src/main/java/dk/camelot64/kickc/passes/Pass4CodeGeneration.java @@ -220,8 +220,8 @@ public class Pass4CodeGeneration { throw new AsmFragmentInstance.AluNotApplicableException(); } StatementAssignment assignment = (StatementAssignment) statement; - AsmFragmentInstanceSpec signature = new AsmFragmentInstanceSpec(assignment, assignmentAlu, program); - AsmFragmentInstance asmFragmentInstance = AsmFragmentTemplateManager.getFragment(signature, program.getLog()); + AsmFragmentInstanceSpec asmFragmentInstanceSpec = new AsmFragmentInstanceSpec(assignment, assignmentAlu, program); + AsmFragmentInstance asmFragmentInstance = AsmFragmentTemplateManager.getFragment(asmFragmentInstanceSpec, program.getLog()); asm.getCurrentSegment().setFragment(asmFragmentInstance.getFragmentName()); asmFragmentInstance.generate(asm); aluState.clear(); @@ -254,8 +254,8 @@ public class Pass4CodeGeneration { } } } else if(statement instanceof StatementConditionalJump) { - AsmFragmentInstanceSpec asmSignature = new AsmFragmentInstanceSpec((StatementConditionalJump) statement, block, program, getGraph()); - AsmFragmentInstance asmFragmentInstance = AsmFragmentTemplateManager.getFragment(asmSignature, program.getLog()); + AsmFragmentInstanceSpec asmFragmentInstanceSpec = new AsmFragmentInstanceSpec((StatementConditionalJump) statement, block, program, getGraph()); + AsmFragmentInstance asmFragmentInstance = AsmFragmentTemplateManager.getFragment(asmFragmentInstanceSpec, program.getLog()); asm.getCurrentSegment().setFragment(asmFragmentInstance.getFragmentName()); asmFragmentInstance.generate(asm); } else if(statement instanceof StatementCall) { @@ -340,8 +340,8 @@ public class Pass4CodeGeneration { if(isRegisterCopy(lValue, rValue)) { asm.getCurrentSegment().setFragment("register_copy"); } else { - AsmFragmentInstanceSpec asmSignature = new AsmFragmentInstanceSpec(lValue, rValue, program, scope); - AsmFragmentInstance asmFragmentInstance = AsmFragmentTemplateManager.getFragment(asmSignature, program.getLog()); + AsmFragmentInstanceSpec asmFragmentInstanceSpec = new AsmFragmentInstanceSpec(lValue, rValue, program, scope); + AsmFragmentInstance asmFragmentInstance = AsmFragmentTemplateManager.getFragment(asmFragmentInstanceSpec, program.getLog()); asm.getCurrentSegment().setFragment(asmFragmentInstance.getFragmentName()); asmFragmentInstance.generate(asm); }