6502/kickc
1
0
Fork 0
mirror of https://gitlab.com/camelot/kickc.git synced 2024-06-03 07:29:37 +00:00
Code Issues Projects Releases Wiki Activity

Fixed problem where constant bool return causes ASM compile error. Closes #719

Browse Source
This commit is contained in:
jespergravgaard 2021-10-14 08:02:06 +02:00
parent a69fb9c419
commit e826accb9c
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/dk/camelot64/kickc/passes/Pass4CodeGeneration.java
View File

@ -383,8 +383,8 @@ public class Pass4CodeGeneration {
if(!hasData(constantVar)) {
String asmName = constantVar.getAsmName() == null ? constantVar.getLocalName() : constantVar.getAsmName();
if(asmName != null && !added.contains(asmName)) {
if(SymbolType.isInteger(constantVar.getType()) && constantVar.getRef().getScopeDepth() > 0) {
// Use label for integers referenced in other scope - to allow cross-scope referencing
if(isIntTypeInScope(constantVar)) {
// Use label for integers/bools referenced in other scope - to allow cross-scope referencing
if(!useLabelForConst(scopeRef, constantVar)) {
// Use constant for constant integers not referenced outside scope
added.add(asmName);
@ -413,7 +413,7 @@ public class Pass4CodeGeneration {
added.add(asmName);
String asmConstant = AsmFormat.getAsmConstant(program, constantVar.getInitValue(), 99, scopeRef);
addConstantLabelDecl(asmName, constantVar, asmConstant, asm);
} else if(SymbolType.isInteger(constantVar.getType()) && constantVar.getRef().getScopeDepth() > 0) {
} else if(isIntTypeInScope(constantVar)) {
// Use label for integers referenced in other scope - to allow cross-scope referencing
if(useLabelForConst(scopeRef, constantVar)) {
// Use label for integers referenced in other scope - to allow cross-scope referencing
@ -453,6 +453,10 @@ public class Pass4CodeGeneration {
}
private boolean isIntTypeInScope(Variable constantVar) {
return (SymbolType.isInteger(constantVar.getType()) || SymbolType.BOOLEAN.equals(constantVar.getType())) && constantVar.getRef().getScopeDepth() > 0;
}
private void addConstant(String asmName, Variable constantVar, String asmConstant, AsmProgram asm) {
// Add any comments
generateComments(asm, constantVar.getComments());