6502/kickc
1
0
Fork 0
mirror of https://gitlab.com/camelot/kickc.git synced 2024-12-27 09:31:18 +00:00
Code Issues Projects Releases Wiki Activity

Added forward reference support yo procedure references.

Browse Source
This commit is contained in:
jespergravgaard 2018-08-05 17:46:42 +02:00
parent b755cd4297
commit b8841a90f5
3 changed files with 51 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/dk/camelot64/kickc/passes/Pass1ResolveForwardReferences.java
View File

@ -4,6 +4,7 @@ import dk.camelot64.kickc.model.CompileError;
import dk.camelot64.kickc.model.Program;
import dk.camelot64.kickc.model.iterator.ProgramValueIterator;
import dk.camelot64.kickc.model.symbols.Scope;
import dk.camelot64.kickc.model.symbols.Symbol;
import dk.camelot64.kickc.model.symbols.Variable;
import dk.camelot64.kickc.model.values.ForwardVariableRef;
import dk.camelot64.kickc.model.values.RValue;
@ -22,10 +23,10 @@ public class Pass1ResolveForwardReferences extends Pass1Base {
if(rValue instanceof ForwardVariableRef) {
String varName = ((ForwardVariableRef) rValue).getName();
Scope currentScope = getScope().getScope(currentBlock.getScope());
Variable variable = currentScope.getVariable(varName);
if(variable!=null) {
getLog().append("Resolved forward reference " + varName+" to "+variable.toString(getProgram()));
programValue.set(variable.getRef());
Symbol symbol = currentScope.getSymbol(varName);
if(symbol!=null) {
getLog().append("Resolved forward reference " + varName+" to "+symbol.toString(getProgram()));
programValue.set((RValue) symbol.getRef());
} else {
getLog().append("ERROR! Unknown variable " + varName);
throw new CompileError("ERROR! Unknown variable " + varName, currentStmt.getSource());

17
src/test/java/dk/camelot64/kickc/test/kc/test-interrupt.kc
View File

@ -1,5 +1,14 @@
void()** KERNEL_IRQ = $0314;
void main() {
*KERNEL_IRQ = &irq;
byte* FGCOL = $d021;
while(true) {
(*FGCOL)++;
}
}
interrupt(kernel) void irq() {
byte* BGCOL = $d020;
(*BGCOL)++;
@ -8,11 +17,3 @@ interrupt(kernel) void irq() {
}
(*BGCOL)++;
}
void main() {
*KERNEL_IRQ = &irq;
byte* FGCOL = $d021;
while(true) {
(*FGCOL)++;
}
}

72
src/test/java/dk/camelot64/kickc/test/ref/test-interrupt.log
View File

@ -1,6 +1,15 @@
PARSING src/test/java/dk/camelot64/kickc/test/kc/test-interrupt.kc
void()** KERNEL_IRQ = $0314;
void main() {
*KERNEL_IRQ = &irq;
byte* FGCOL = $d021;
while(true) {
(*FGCOL)++;
}
}
interrupt(kernel) void irq() {
byte* BGCOL = $d020;
(*BGCOL)++;
@ -10,17 +19,10 @@ interrupt(kernel) void irq() {
(*BGCOL)++;
}
void main() {
*KERNEL_IRQ = &irq;
byte* FGCOL = $d021;
while(true) {
(*FGCOL)++;
}
}
Adding pre/post-modifier *((byte*) irq::BGCOL) ← ++ *((byte*) irq::BGCOL)
Adding pre/post-modifier *((byte*) irq::BGCOL) ← ++ *((byte*) irq::BGCOL)
Adding pre/post-modifier *((byte*) main::FGCOL) ← ++ *((byte*) main::FGCOL)
Adding pre/post-modifier *((byte*) irq::BGCOL) ← ++ *((byte*) irq::BGCOL)
Adding pre/post-modifier *((byte*) irq::BGCOL) ← ++ *((byte*) irq::BGCOL)
Resolved forward reference irq to interrupt(KERNEL)(void()) irq()
SYMBOLS
(label) @1
(label) @2
@ -42,23 +44,12 @@ interrupt(KERNEL)(void()) irq()
(byte*) main::FGCOL
Promoting word/signed word/dword/signed dword to void()** in KERNEL_IRQ ← ((void()**)) 788
Promoting word/dword/signed dword to byte* in irq::BGCOL ← ((byte*)) 53280
Promoting word/dword/signed dword to byte* in main::FGCOL ← ((byte*)) 53281
Promoting word/dword/signed dword to byte* in irq::BGCOL ← ((byte*)) 53280
INITIAL CONTROL FLOW GRAPH
@begin: scope:[] from
(void()**) KERNEL_IRQ ← ((void()**)) (word/signed word/dword/signed dword) 788
to:@1
irq: scope:[irq] from
(byte*) irq::BGCOL ← ((byte*)) (word/dword/signed dword) 53280
*((byte*) irq::BGCOL) ← ++ *((byte*) irq::BGCOL)
asm { lda$dc0d }
*((byte*) irq::BGCOL) ← ++ *((byte*) irq::BGCOL)
to:irq::@return
irq::@return: scope:[irq] from irq
return
to:@return
@1: scope:[] from @begin
to:@2
main: scope:[main] from
(void()*~) main::$0 ← & interrupt(KERNEL)(void()) irq()
*((void()**) KERNEL_IRQ) ← (void()*~) main::$0
@ -81,16 +72,27 @@ main::@6: scope:[main] from
main::@return: scope:[main] from main::@3
return
to:@return
@1: scope:[] from @begin
to:@2
irq: scope:[irq] from
(byte*) irq::BGCOL ← ((byte*)) (word/dword/signed dword) 53280
*((byte*) irq::BGCOL) ← ++ *((byte*) irq::BGCOL)
asm { lda$dc0d }
*((byte*) irq::BGCOL) ← ++ *((byte*) irq::BGCOL)
to:irq::@return
irq::@return: scope:[irq] from irq
return
to:@return
@2: scope:[] from @1
call main
to:@end
@end: scope:[] from @2
Removing empty block @1
Removing empty block main::@4
Removing empty block main::@3
Removing empty block main::@5
Removing empty block main::@6
Removing empty block @1
PROCEDURE MODIFY VARIABLE ANALYSIS
Completing Phi functions...
@ -100,15 +102,6 @@ CONTROL FLOW GRAPH SSA WITH ASSIGNMENT CALL & RETURN
@begin: scope:[] from
(void()**) KERNEL_IRQ#0 ← ((void()**)) (word/signed word/dword/signed dword) 788
to:@2
irq: scope:[irq] from
(byte*) irq::BGCOL#0 ← ((byte*)) (word/dword/signed dword) 53280
*((byte*) irq::BGCOL#0) ← ++ *((byte*) irq::BGCOL#0)
asm { lda$dc0d }
*((byte*) irq::BGCOL#0) ← ++ *((byte*) irq::BGCOL#0)
to:irq::@return
irq::@return: scope:[irq] from irq
return
to:@return
main: scope:[main] from @2
(void()**) KERNEL_IRQ#1 ← phi( @2/(void()**) KERNEL_IRQ#2 )
(void()*~) main::$0 ← & interrupt(KERNEL)(void()) irq()
@ -126,6 +119,15 @@ main::@2: scope:[main] from main::@1
main::@return: scope:[main] from main::@1
return
to:@return
irq: scope:[irq] from
(byte*) irq::BGCOL#0 ← ((byte*)) (word/dword/signed dword) 53280
*((byte*) irq::BGCOL#0) ← ++ *((byte*) irq::BGCOL#0)
asm { lda$dc0d }
*((byte*) irq::BGCOL#0) ← ++ *((byte*) irq::BGCOL#0)
to:irq::@return
irq::@return: scope:[irq] from irq
return
to:@return
@2: scope:[] from @begin
(void()**) KERNEL_IRQ#2 ← phi( @begin/(void()**) KERNEL_IRQ#0 )
call main
@ -171,9 +173,9 @@ Redundant Phi (void()**) KERNEL_IRQ#1 (void()**) KERNEL_IRQ#0
Redundant Phi (byte*) main::FGCOL#1 (byte*) main::FGCOL#0
Succesful SSA optimization Pass2RedundantPhiElimination
Constant (const void()**) KERNEL_IRQ#0 = ((void()**))788
Constant (const byte*) irq::BGCOL#0 = ((byte*))53280
Constant (const void()*) main::$0 = &irq
Constant (const byte*) main::FGCOL#0 = ((byte*))53281
Constant (const byte*) irq::BGCOL#0 = ((byte*))53280
Succesful SSA optimization Pass2ConstantIdentification
if() condition always true - replacing block destination if(true) goto main::@2
Succesful SSA optimization Pass2ConstantIfs
@ -320,12 +322,12 @@ Statement [4] *((const void()**) KERNEL_IRQ#0) ← &interrupt(KERNEL)(void()) ir
Statement asm { lda$dc0d } always clobbers reg byte a
REGISTER UPLIFT SCOPES
Uplift Scope [irq]
Uplift Scope [main]
Uplift Scope [irq]
Uplift Scope []
Uplifting [irq] best 310 combination
Uplifting [main] best 310 combination
Uplifting [irq] best 310 combination
Uplifting [] best 310 combination
ASSEMBLER BEFORE OPTIMIZATION