From b3a1c330a7fba721e4c0536004c7b8aabfffdb9c Mon Sep 17 00:00:00 2001 From: jespergravgaard Date: Sun, 28 Jan 2018 10:25:40 +0100 Subject: [PATCH] Removed two synthable fragments --- .../dk/camelot64/kickc/fragment/AsmFragmentInstanceSpec.java | 2 +- .../dk/camelot64/kickc/fragment/AsmFragmentTemplateUsages.java | 2 +- .../kickc/fragment/asm/vbuaa=pbuz1_derefidx_vbuxx.asm | 3 --- .../dk/camelot64/kickc/fragment/asm/vbuxx=vbuaa_minus_1.asm | 2 -- 4 files changed, 2 insertions(+), 7 deletions(-) delete mode 100644 src/main/java/dk/camelot64/kickc/fragment/asm/vbuaa=pbuz1_derefidx_vbuxx.asm delete mode 100644 src/main/java/dk/camelot64/kickc/fragment/asm/vbuxx=vbuaa_minus_1.asm diff --git a/src/main/java/dk/camelot64/kickc/fragment/AsmFragmentInstanceSpec.java b/src/main/java/dk/camelot64/kickc/fragment/AsmFragmentInstanceSpec.java index f3b2c76d7..7c3c56c37 100644 --- a/src/main/java/dk/camelot64/kickc/fragment/AsmFragmentInstanceSpec.java +++ b/src/main/java/dk/camelot64/kickc/fragment/AsmFragmentInstanceSpec.java @@ -238,7 +238,7 @@ public class AsmFragmentInstanceSpec { return name; } else if(value instanceof ConstantValue) { if(type == null) { - type = SymbolTypeInference.inferType(program.getScope(), (RValue) value); + type = SymbolTypeInference.inferType(program.getScope(), (ConstantValue) value); } String name = getTypePrefix(type) + getConstName(value); bind(name, value); diff --git a/src/main/java/dk/camelot64/kickc/fragment/AsmFragmentTemplateUsages.java b/src/main/java/dk/camelot64/kickc/fragment/AsmFragmentTemplateUsages.java index 9d7b238bc..4d3e1a4b3 100644 --- a/src/main/java/dk/camelot64/kickc/fragment/AsmFragmentTemplateUsages.java +++ b/src/main/java/dk/camelot64/kickc/fragment/AsmFragmentTemplateUsages.java @@ -99,7 +99,7 @@ public class AsmFragmentTemplateUsages { } } if(fileUsage == null) { - throw new RuntimeException("Error! Template file never loaded according to usage stats " + fileName); + log.append("Error! Template file never loaded according to usage stats " + fileName); } if(allZero) { log.append("git mv " + fileName + " unused # Loaded but never used"); diff --git a/src/main/java/dk/camelot64/kickc/fragment/asm/vbuaa=pbuz1_derefidx_vbuxx.asm b/src/main/java/dk/camelot64/kickc/fragment/asm/vbuaa=pbuz1_derefidx_vbuxx.asm deleted file mode 100644 index 9903c8a3f..000000000 --- a/src/main/java/dk/camelot64/kickc/fragment/asm/vbuaa=pbuz1_derefidx_vbuxx.asm +++ /dev/null @@ -1,3 +0,0 @@ -stx $ff -ldy $ff -lda ({z1}),y diff --git a/src/main/java/dk/camelot64/kickc/fragment/asm/vbuxx=vbuaa_minus_1.asm b/src/main/java/dk/camelot64/kickc/fragment/asm/vbuxx=vbuaa_minus_1.asm deleted file mode 100644 index dae454c50..000000000 --- a/src/main/java/dk/camelot64/kickc/fragment/asm/vbuxx=vbuaa_minus_1.asm +++ /dev/null @@ -1,2 +0,0 @@ -txa -dex \ No newline at end of file