6502/kickc
1
0
Fork 0
mirror of https://gitlab.com/camelot/kickc.git synced 2025-04-05 07:40:39 +00:00
Code Issues Projects Releases Wiki Activity

Added support for advanced indirect calls. Calls are now fragments. Added support for @outside_flow ASM tag placing ASM at the end of the current scope. Added support for expanding label names in ASM fragments. Closes #708

Browse Source
This commit is contained in:
jespergravgaard 2021-08-09 01:48:50 +02:00
parent 92755c6287
commit d3ed5f774f
68 changed files with 3537 additions and 2595 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/fragment/cache/fragment-cache-csg65ce02.asm vendored
View File

@ -1,4 +1,4 @@
//KICKC FRAGMENT CACHE 84ae04234 84ae062c1
//KICKC FRAGMENT CACHE 8d94f4f71 8d94f7000
//FRAGMENT vbuzz=vbuc1
ldz #{c1}
//FRAGMENT vbuzz_lt_vbuc1_then_la1

1679
src/main/fragment/cache/fragment-cache-mega45gs02.asm vendored
View File

File diff suppressed because it is too large Load Diff

2
src/main/fragment/cache/fragment-cache-mos6502.asm vendored
View File

@ -1,4 +1,4 @@
//KICKC FRAGMENT CACHE 84ae04234 84ae062c1
//KICKC FRAGMENT CACHE 8d94f4f71 8d94f7000
//FRAGMENT vbuz1=vbuc1
lda #{c1}
sta {z1}

579
src/main/fragment/cache/fragment-cache-mos6502x.asm vendored
View File

@ -1,4 +1,4 @@
//KICKC FRAGMENT CACHE 84ae04234 84ae062c1
//KICKC FRAGMENT CACHE 8d94f4f71 8d94f7000
//FRAGMENT vbuz1=vbuc1
lda #{c1}
sta {z1}
@ -1866,33 +1866,8 @@ lda #<{c1}
sta {z1}
lda #>{c1}
sta {z1}+1
//FRAGMENT pprz1=pprz2
lda {z2}
sta {z1}
lda {z2}+1
sta {z1}+1
//FRAGMENT pprz1=qprc1_derefidx_vbuz2
ldy {z2}
lda {c1},y
sta {z1}
lda {c1}+1,y
sta {z1}+1
//FRAGMENT pprz1=qprc1_derefidx_vbuaa
tay
lda {c1},y
sta {z1}
lda {c1}+1,y
sta {z1}+1
//FRAGMENT pprz1=qprc1_derefidx_vbuxx
lda {c1},x
sta {z1}
lda {c1}+1,x
sta {z1}+1
//FRAGMENT pprz1=qprc1_derefidx_vbuyy
lda {c1},y
sta {z1}
lda {c1}+1,y
sta {z1}+1
//FRAGMENT call_vprc1
jsr {c1}
//FRAGMENT pbuz1_lt_vwuc1_then_la1
lda {z1}+1
cmp #>{c1}
@ -2428,42 +2403,6 @@ tay
sta {c1},x
//FRAGMENT vbsyy=vbsc1
ldy #{c1}
//FRAGMENT vbuz1=_stackidxbyte_vbuc1
tsx
lda STACK_BASE+{c1},x
sta {z1}
//FRAGMENT _stackpushbyte_=vbuz1
lda {z1}
pha
//FRAGMENT _stackpullbyte_1
pla
//FRAGMENT vbuz1_eq_vbuc1_then_la1
lda #{c1}
cmp {z1}
beq {la1}
//FRAGMENT vbuaa=_stackidxbyte_vbuc1
tsx
lda STACK_BASE+{c1},x
//FRAGMENT vbuxx=_stackidxbyte_vbuc1
tsx
lda STACK_BASE+{c1},x
tax
//FRAGMENT vbuyy=_stackidxbyte_vbuc1
tsx
lda STACK_BASE+{c1},x
tay
//FRAGMENT _stackpushbyte_=vbuyy
tya
pha
//FRAGMENT vbuaa_eq_vbuc1_then_la1
cmp #{c1}
beq {la1}
//FRAGMENT vbuxx_eq_vbuc1_then_la1
cpx #{c1}
beq {la1}
//FRAGMENT vbuyy_eq_vbuc1_then_la1
cpy #{c1}
beq {la1}
//FRAGMENT vbuxx=vbuxx_plus_vbuc1
txa
axs #-[{c1}]
@ -3594,26 +3533,6 @@ sta {z1}+1
//FRAGMENT vwuz1=vwuz1_rol_1
asl {z1}
rol {z1}+1
//FRAGMENT pssz1=pssc1
lda #<{c1}
sta {z1}
lda #>{c1}
sta {z1}+1
//FRAGMENT pbuz1=qbuz2_derefidx_vbuc1
ldy #{c1}
lda ({z2}),y
sta {z1}
iny
lda ({z2}),y
sta {z1}+1
//FRAGMENT pssz1=pssz1_plus_vbuc1
lda #{c1}
clc
adc {z1}
sta {z1}
bcc !+
inc {z1}+1
!:
//FRAGMENT vwuz1=_deref_pwuc1_minus_vwuc2
sec
lda {c1}
@ -3769,6 +3688,10 @@ sta {z1}
lda {z1}+1
sbc {c1}+1,y
sta {z1}+1
//FRAGMENT vbuz1_eq_vbuc1_then_la1
lda #{c1}
cmp {z1}
beq {la1}
//FRAGMENT vwuz1=vwuz1_plus_pwuc1_derefidx_vbuz2
ldy {z2}
clc
@ -4031,6 +3954,9 @@ sta {z1}
lda {z1}+1
sbc {c1}+1,y
sta {z1}+1
//FRAGMENT vbuxx_eq_vbuc1_then_la1
cpx #{c1}
beq {la1}
//FRAGMENT vwuz1=vwuz1_plus_pwuc1_derefidx_vbuaa
tay
clc
@ -4062,6 +3988,9 @@ dex
//FRAGMENT vbuyy=vbuyy_minus_2
dey
dey
//FRAGMENT vbuyy_eq_vbuc1_then_la1
cpy #{c1}
beq {la1}
//FRAGMENT vbuz1=vbuz2_bor_vbuyy
tya
ora {z2}
@ -4121,6 +4050,9 @@ sta {z1}
bcc !+
inc {z1}+1
!:
//FRAGMENT vbuaa_eq_vbuc1_then_la1
cmp #{c1}
beq {la1}
//FRAGMENT vbuaa_eq_vbuz1_then_la1
cmp {z1}
beq {la1}
@ -4976,20 +4908,18 @@ sta {c1}
tya
ora {c1}
sta {c1}
//FRAGMENT vbuz1_le_vbuc1_then_la1
lda #{c1}
cmp {z1}
bcs {la1}
//FRAGMENT vbuaa_le_vbuc1_then_la1
cmp #{c1}
bcc {la1}
beq {la1}
//FRAGMENT _stackpushbyte_=vbuc1
lda #{c1}
pha
//FRAGMENT _stackpullbyte_1
pla
//FRAGMENT vbuz1=_stackpullbyte_
pla
sta {z1}
//FRAGMENT vbuz1=_stackidxbyte_vbuc1
tsx
lda STACK_BASE+{c1},x
sta {z1}
//FRAGMENT _stackidxbyte_vbuc1=vbuz1
lda {z1}
tsx
@ -5002,6 +4932,17 @@ tax
//FRAGMENT vbuyy=_stackpullbyte_
pla
tay
//FRAGMENT vbuaa=_stackidxbyte_vbuc1
tsx
lda STACK_BASE+{c1},x
//FRAGMENT vbuxx=_stackidxbyte_vbuc1
tsx
lda STACK_BASE+{c1},x
tax
//FRAGMENT vbuyy=_stackidxbyte_vbuc1
tsx
lda STACK_BASE+{c1},x
tay
//FRAGMENT _stackidxbyte_vbuc1=vbuaa
tsx
sta STACK_BASE+{c1},x
@ -5159,6 +5100,9 @@ lda {z1}
sta STACK_BASE+{c1},x
lda {z1}+1
sta STACK_BASE+{c1}+1,x
//FRAGMENT _stackpushbyte_=vbuz1
lda {z1}
pha
//FRAGMENT _stackpushbyte_1
pha
//FRAGMENT vssz1=_stackpullstruct_2_
@ -5342,6 +5286,9 @@ pha
lda {z1}
tay
dey
//FRAGMENT _stackpushbyte_=vbuyy
tya
pha
//FRAGMENT vbuz1=vbuaa_minus_1
sec
sbc #1
@ -5919,6 +5866,10 @@ tax
//FRAGMENT vbuyy=_byte_vduz1
lda {z1}
tay
//FRAGMENT call__deref_pprc1
jsr {c1}
//FRAGMENT _deref_pbuc1=_dec__deref_pbuc1
dec {c1}
//FRAGMENT pbuz1_derefidx_vbuaa=vbuaa
tay
sta ({z1}),y
@ -6404,8 +6355,6 @@ sta {c1}+1
//FRAGMENT _deref_pbsc1=vbsc2
lda #{c2}
sta {c1}
//FRAGMENT _deref_pbuc1=_dec__deref_pbuc1
dec {c1}
//FRAGMENT vbuz1=_dec_vbuz2
ldy {z2}
dey
@ -6622,6 +6571,10 @@ lda {z2}
clc
adc #2
sta {z1}
//FRAGMENT vbuz1_le_vbuc1_then_la1
lda #{c1}
cmp {z1}
bcs {la1}
//FRAGMENT vbuz1=vbuaa_plus_2
clc
adc #2
@ -6630,6 +6583,10 @@ sta {z1}
inx
inx
stx {z1}
//FRAGMENT vbuaa_le_vbuc1_then_la1
cmp #{c1}
bcc {la1}
beq {la1}
//FRAGMENT vbuxx_le_vbuc1_then_la1
cpx #{c1}
bcc {la1}
@ -8708,6 +8665,18 @@ tax
lda {c1}
eor #$ff
tay
//FRAGMENT pssz1=pssc1
lda #<{c1}
sta {z1}
lda #>{c1}
sta {z1}+1
//FRAGMENT pbuz1=qbuz2_derefidx_vbuc1
ldy #{c1}
lda ({z2}),y
sta {z1}
iny
lda ({z2}),y
sta {z1}+1
//FRAGMENT vwuz1=pwuz2_derefidx_vbuc1
ldy #{c1}
lda ({z2}),y
@ -8715,6 +8684,14 @@ sta {z1}
iny
lda ({z2}),y
sta {z1}+1
//FRAGMENT pssz1=pssz1_plus_vbuc1
lda #{c1}
clc
adc {z1}
sta {z1}
bcc !+
inc {z1}+1
!:
//FRAGMENT _deref_pwsc1=vwsc2
lda #<{c2}
sta {c1}
@ -11639,153 +11616,6 @@ ldy {c1}+1
sty $ff
ldy #0
sta ($fe),y
//FRAGMENT vbuz1=vbuz2_bxor_vbuz3
lda {z2}
eor {z3}
sta {z1}
//FRAGMENT _stackpushbyte_=pbuc1_derefidx_vbuz1
ldy {z1}
lda {c1},y
pha
//FRAGMENT vbuz1=vbuz2_bxor_vbuaa
eor {z2}
sta {z1}
//FRAGMENT vbuz1=vbuz2_bxor_vbuxx
txa
eor {z2}
sta {z1}
//FRAGMENT vbuz1=vbuz2_bxor_vbuyy
tya
eor {z2}
sta {z1}
//FRAGMENT vbuz1=vbuyy_bxor_vbuz2
tya
eor {z2}
sta {z1}
//FRAGMENT vbuz1=vbuyy_bxor_vbuaa
sty $ff
eor $ff
sta {z1}
//FRAGMENT vbuz1=vbuyy_bxor_vbuxx
txa
sty $ff
eor $ff
sta {z1}
//FRAGMENT vbuz1=vbuyy_bxor_vbuyy
tya
sty $ff
eor $ff
sta {z1}
//FRAGMENT vbuaa=vbuz1_bxor_vbuz2
lda {z1}
eor {z2}
//FRAGMENT vbuaa=vbuz1_bxor_vbuaa
eor {z1}
//FRAGMENT vbuaa=vbuz1_bxor_vbuxx
txa
eor {z1}
//FRAGMENT vbuaa=vbuz1_bxor_vbuyy
tya
eor {z1}
//FRAGMENT vbuaa=vbuyy_bxor_vbuz1
tya
eor {z1}
//FRAGMENT vbuaa=vbuyy_bxor_vbuaa
sty $ff
eor $ff
//FRAGMENT vbuaa=vbuyy_bxor_vbuxx
txa
sty $ff
eor $ff
//FRAGMENT vbuaa=vbuyy_bxor_vbuyy
tya
sty $ff
eor $ff
//FRAGMENT vbuxx=vbuz1_bxor_vbuz2
lda {z1}
eor {z2}
tax
//FRAGMENT vbuxx=vbuz1_bxor_vbuaa
eor {z1}
tax
//FRAGMENT vbuxx=vbuz1_bxor_vbuxx
txa
eor {z1}
tax
//FRAGMENT vbuxx=vbuz1_bxor_vbuyy
tya
eor {z1}
tax
//FRAGMENT vbuxx=vbuyy_bxor_vbuz1
tya
eor {z1}
tax
//FRAGMENT vbuxx=vbuyy_bxor_vbuaa
sty $ff
eor $ff
tax
//FRAGMENT vbuxx=vbuyy_bxor_vbuxx
sty $ff
txa
eor $ff
tax
//FRAGMENT vbuxx=vbuyy_bxor_vbuyy
tya
sty $ff
eor $ff
tax
//FRAGMENT vbuyy=vbuz1_bxor_vbuz2
lda {z1}
eor {z2}
tay
//FRAGMENT vbuyy=vbuz1_bxor_vbuaa
eor {z1}
tay
//FRAGMENT vbuyy=vbuz1_bxor_vbuxx
txa
eor {z1}
tay
//FRAGMENT vbuyy=vbuz1_bxor_vbuyy
tya
eor {z1}
tay
//FRAGMENT vbuyy=vbuyy_bxor_vbuz1
tya
eor {z1}
tay
//FRAGMENT vbuyy=vbuyy_bxor_vbuaa
sty $ff
eor $ff
tay
//FRAGMENT vbuyy=vbuyy_bxor_vbuxx
txa
sty $ff
eor $ff
tay
//FRAGMENT vbuyy=vbuyy_bxor_vbuyy
tya
sty $ff
eor $ff
tay
//FRAGMENT _stackpushbyte_=pbuc1_derefidx_vbuaa
tay
lda {c1},y
pha
//FRAGMENT _stackpushbyte_=pbuc1_derefidx_vbuxx
lda {c1},x
pha
//FRAGMENT _stackpushbyte_=pbuc1_derefidx_vbuyy
lda {c1},y
pha
//FRAGMENT vbuyy_gt_vbuaa_then_la1
tax
sty $ff
cpx $ff
bcc {la1}
//FRAGMENT vbuyy_lt_vbuaa_then_la1
sta $ff
cpy $ff
bcc {la1}
//FRAGMENT _deref_pbuc1_eq__deref_pbuc2_then_la1
lda {c1}
cmp {c2}
@ -12274,28 +12104,6 @@ sta ({z1}),y
lda #{c2}
ldy {m1}
sta {c1},y
//FRAGMENT qbuc1_derefidx_vbuz1=pbuc2
ldy {z1}
lda #<{c2}
sta {c1},y
lda #>{c2}
sta {c1}+1,y
//FRAGMENT qbuc1_derefidx_vbuaa=pbuc2
tay
lda #<{c2}
sta {c1},y
lda #>{c2}
sta {c1}+1,y
//FRAGMENT qbuc1_derefidx_vbuxx=pbuc2
lda #<{c2}
sta {c1},x
lda #>{c2}
sta {c1}+1,x
//FRAGMENT qbuc1_derefidx_vbuyy=pbuc2
lda #<{c2}
sta {c1},y
lda #>{c2}
sta {c1}+1,y
//FRAGMENT pbuz1_ge_pbuc1_then_la1
lda {z1}+1
cmp #>{c1}
@ -12940,15 +12748,6 @@ sta {z1}
lda #0
adc {z2}+1
sta {z1}+1
//FRAGMENT pssz1_lt_pssc1_then_la1
lda {z1}+1
cmp #>{c1}
bcc {la1}
bne !+
lda {z1}
cmp #<{c1}
bcc {la1}
!:
//FRAGMENT vbuz1_lt__deref_pbuc1_then_la1
lda {z1}
cmp {c1}
@ -13312,10 +13111,6 @@ sta ({z1}),y
//FRAGMENT _deref_pbuc1=_byte_pprz1
lda {z1}
sta {c1}
//FRAGMENT _stackidxbyte_vbuc1=vbuc2
lda #{c2}
tsx
sta STACK_BASE+{c1},x
//FRAGMENT vbuz1=vbuz2_band_pbuz3_derefidx_vbuc1
lda {z2}
ldy #{c1}
@ -15715,11 +15510,6 @@ adc ({z1}),y
sta {z1}+1
pla
sta {z1}
//FRAGMENT pprz1=_deref_qprc1
lda {c1}
sta {z1}
lda {c1}+1
sta {z1}+1
//FRAGMENT vbuz1_ge_vbuaa_then_la1
ldy {z1}
sta $ff
@ -16352,3 +16142,230 @@ sta {c1},x
lda #{c2}
ora {c1},y
sta {c1},y
//FRAGMENT call__deref_pprz1
jsr {la1}
{la1}: @outside_flow
jmp ({z1}) @outside_flow
//FRAGMENT pprz1=pprz2
lda {z2}
sta {z1}
lda {z2}+1
sta {z1}+1
//FRAGMENT pprz1=qprc1_derefidx_vbuz2
ldy {z2}
lda {c1},y
sta {z1}
lda {c1}+1,y
sta {z1}+1
//FRAGMENT pprz1=qprc1_derefidx_vbuaa
tay
lda {c1},y
sta {z1}
lda {c1}+1,y
sta {z1}+1
//FRAGMENT pprz1=qprc1_derefidx_vbuxx
lda {c1},x
sta {z1}
lda {c1}+1,x
sta {z1}+1
//FRAGMENT pprz1=qprc1_derefidx_vbuyy
lda {c1},y
sta {z1}
lda {c1}+1,y
sta {z1}+1
//FRAGMENT vbuz1=vbuz2_bxor_vbuz3
lda {z2}
eor {z3}
sta {z1}
//FRAGMENT _stackpushbyte_=pbuc1_derefidx_vbuz1
ldy {z1}
lda {c1},y
pha
//FRAGMENT vbuz1=vbuz2_bxor_vbuaa
eor {z2}
sta {z1}
//FRAGMENT vbuz1=vbuz2_bxor_vbuxx
txa
eor {z2}
sta {z1}
//FRAGMENT vbuz1=vbuz2_bxor_vbuyy
tya
eor {z2}
sta {z1}
//FRAGMENT vbuz1=vbuyy_bxor_vbuz2
tya
eor {z2}
sta {z1}
//FRAGMENT vbuz1=vbuyy_bxor_vbuaa
sty $ff
eor $ff
sta {z1}
//FRAGMENT vbuz1=vbuyy_bxor_vbuxx
txa
sty $ff
eor $ff
sta {z1}
//FRAGMENT vbuz1=vbuyy_bxor_vbuyy
tya
sty $ff
eor $ff
sta {z1}
//FRAGMENT vbuaa=vbuz1_bxor_vbuz2
lda {z1}
eor {z2}
//FRAGMENT vbuaa=vbuz1_bxor_vbuaa
eor {z1}
//FRAGMENT vbuaa=vbuz1_bxor_vbuxx
txa
eor {z1}
//FRAGMENT vbuaa=vbuz1_bxor_vbuyy
tya
eor {z1}
//FRAGMENT vbuaa=vbuyy_bxor_vbuz1
tya
eor {z1}
//FRAGMENT vbuaa=vbuyy_bxor_vbuaa
sty $ff
eor $ff
//FRAGMENT vbuaa=vbuyy_bxor_vbuxx
txa
sty $ff
eor $ff
//FRAGMENT vbuaa=vbuyy_bxor_vbuyy
tya
sty $ff
eor $ff
//FRAGMENT vbuxx=vbuz1_bxor_vbuz2
lda {z1}
eor {z2}
tax
//FRAGMENT vbuxx=vbuz1_bxor_vbuaa
eor {z1}
tax
//FRAGMENT vbuxx=vbuz1_bxor_vbuxx
txa
eor {z1}
tax
//FRAGMENT vbuxx=vbuz1_bxor_vbuyy
tya
eor {z1}
tax
//FRAGMENT vbuxx=vbuyy_bxor_vbuz1
tya
eor {z1}
tax
//FRAGMENT vbuxx=vbuyy_bxor_vbuaa
sty $ff
eor $ff
tax
//FRAGMENT vbuxx=vbuyy_bxor_vbuxx
sty $ff
txa
eor $ff
tax
//FRAGMENT vbuxx=vbuyy_bxor_vbuyy
tya
sty $ff
eor $ff
tax
//FRAGMENT vbuyy=vbuz1_bxor_vbuz2
lda {z1}
eor {z2}
tay
//FRAGMENT vbuyy=vbuz1_bxor_vbuaa
eor {z1}
tay
//FRAGMENT vbuyy=vbuz1_bxor_vbuxx
txa
eor {z1}
tay
//FRAGMENT vbuyy=vbuz1_bxor_vbuyy
tya
eor {z1}
tay
//FRAGMENT vbuyy=vbuyy_bxor_vbuz1
tya
eor {z1}
tay
//FRAGMENT vbuyy=vbuyy_bxor_vbuaa
sty $ff
eor $ff
tay
//FRAGMENT vbuyy=vbuyy_bxor_vbuxx
txa
sty $ff
eor $ff
tay
//FRAGMENT vbuyy=vbuyy_bxor_vbuyy
tya
sty $ff
eor $ff
tay
//FRAGMENT _stackpushbyte_=pbuc1_derefidx_vbuaa
tay
lda {c1},y
pha
//FRAGMENT _stackpushbyte_=pbuc1_derefidx_vbuxx
lda {c1},x
pha
//FRAGMENT _stackpushbyte_=pbuc1_derefidx_vbuyy
lda {c1},y
pha
//FRAGMENT vbuyy_gt_vbuaa_then_la1
tax
sty $ff
cpx $ff
bcc {la1}
//FRAGMENT vbuyy_lt_vbuaa_then_la1
sta $ff
cpy $ff
bcc {la1}
//FRAGMENT _stackidxbyte_vbuc1=vbuc2
lda #{c2}
tsx
sta STACK_BASE+{c1},x
//FRAGMENT pprz1=_deref_qprc1
lda {c1}
sta {z1}
lda {c1}+1
sta {z1}+1
//FRAGMENT qbuc1_derefidx_vbuz1=pbuc2
ldy {z1}
lda #<{c2}
sta {c1},y
lda #>{c2}
sta {c1}+1,y
//FRAGMENT qbuc1_derefidx_vbuaa=pbuc2
tay
lda #<{c2}
sta {c1},y
lda #>{c2}
sta {c1}+1,y
//FRAGMENT qbuc1_derefidx_vbuxx=pbuc2
lda #<{c2}
sta {c1},x
lda #>{c2}
sta {c1}+1,x
//FRAGMENT qbuc1_derefidx_vbuyy=pbuc2
lda #<{c2}
sta {c1},y
lda #>{c2}
sta {c1}+1,y
//FRAGMENT pssz1_lt_pssc1_then_la1
lda {z1}+1
cmp #>{c1}
bcc {la1}
bne !+
lda {z1}
cmp #<{c1}
bcc {la1}
!:
//FRAGMENT call__deref_(qprz1_derefidx_vbuc1)
ldy #{c1}
lda ({z1}),y
sta !+ +1
iny
lda ({z1}),y
sta !+ +2
!:
jsr $0000

2
src/main/fragment/cache/fragment-cache-rom6502x.asm vendored
View File

@ -1,4 +1,4 @@
//KICKC FRAGMENT CACHE 84ae04234 84ae062c1
//KICKC FRAGMENT CACHE 8d94f4f71 8d94f7000
//FRAGMENT _deref_pbuc1=_inc__deref_pbuc1
inc {c1}
//FRAGMENT isr_hardware_all_entry

2
src/main/fragment/cache/fragment-cache-wdc65c02.asm vendored
View File

@ -1,4 +1,4 @@
//KICKC FRAGMENT CACHE 84ae04234 84ae062c1
//KICKC FRAGMENT CACHE 8d94f4f71 8d94f7000
//FRAGMENT vbuz1=_deref_pbuc1
lda {c1}
sta {z1}

2
src/main/fragment/mos6502-common/call__deref_pprz1.asm
View File

@ -1,3 +1,3 @@
jsr {la1}
icall: @outside_flow
{la1}: @outside_flow
jmp ({z1}) @outside_flow

30
src/main/java/dk/camelot64/kickc/asm/AsmProgram.java
View File

@ -29,6 +29,9 @@ public class AsmProgram {
*/
private List<AsmChunk> chunks;
/**Stashed lines to be inserted outside the flow. */
private List<AsmLine> stash;
/**
* The index of the next chunk.
*/
@ -47,6 +50,7 @@ public class AsmProgram {
this.chunks = new ArrayList<>();
this.nextLineIndex = 0;
this.nextChunkIndex = 0;
this.stash = new ArrayList<>();
}
public TargetCpu getTargetCpu() {
@ -72,6 +76,32 @@ public class AsmProgram {
getCurrentChunk().addLine(line);
}
/**
* Put an ASM-line into the stash for being added to the program later.
* @param line The line
*/
public void stashLine(AsmLine line) {
stash.add(line);
}
/**
* Are there any lines in the stash
* @return true if there are
*/
public boolean hasStash() {
return stash.size()>0;
}
/**
* Add the stash lines to the program - and clear the stash
*/
public void addStash() {
for(AsmLine asmLine : stash) {
addLine(asmLine);
}
stash = new ArrayList<>();
}
/**
* Get the current encoding used for strings/chars
* @return The encoding

35
src/main/java/dk/camelot64/kickc/fragment/AsmFragmentInstance.java
View File

@ -103,6 +103,12 @@ public class AsmFragmentInstance {
} else if(boundValue instanceof Label) {
String param = AsmFormat.asmFix(((Label) boundValue).getLocalName());
return new AsmParameter(param, false);
} else if(boundValue instanceof LabelRef) {
String param = AsmFormat.asmFix(((LabelRef) boundValue).getLocalName());
return new AsmParameter(param, false);
} else if(boundValue instanceof ProcedureRef) {
String param = AsmFormat.asmFix(((ProcedureRef) boundValue).getFullName());
return new AsmParameter(param, false);
} else {
throw new InternalError("Bound Value Type not implemented " + boundValue);
}
@ -198,6 +204,16 @@ public class AsmFragmentInstance {
this.visit(context);
}
public void handleTags(AsmLine asmLine, List<TerminalNode> tags) {
AsmLine line = addTags(asmLine, tags);
if(line.getTags().has("outside_flow")) {
// Outside the normal ASM flow - stash them in the program for later
asmProgram.stashLine(line);
} else {
asmProgram.addLine(line);
}
}
private static AsmLine addTags(AsmLine asmLine, List<TerminalNode> asmTags) {
if(asmTags != null)
for(TerminalNode asmTag : asmTags) {
@ -209,13 +225,23 @@ public class AsmFragmentInstance {
@Override
public Object visitAsmLabelName(KickCParser.AsmLabelNameContext ctx) {
asmProgram.addLine(addTags(new AsmLabel(ctx.ASM_NAME().getText()), ctx.ASM_TAG()));
AsmLabel label = new AsmLabel(ctx.ASM_NAME().getText());
handleTags(label, ctx.ASM_TAG());
return null;
}
@Override
public Object visitAsmLabelMulti(KickCParser.AsmLabelMultiContext ctx) {
asmProgram.addLine(addTags(new AsmLabel(ctx.ASM_MULTI_NAME().getText()), ctx.ASM_TAG()));
AsmLabel label = new AsmLabel(ctx.ASM_MULTI_NAME().getText());
handleTags(label, ctx.ASM_TAG());
return null;
}
@Override
public Object visitAsmLabelReplace(KickCParser.AsmLabelReplaceContext ctx) {
String replaceName = ctx.ASM_NAME().getText();
AsmParameter boundValue = fragmentInstance.getBoundValue(replaceName);
handleTags(new AsmLabel(boundValue.getParam()), ctx.ASM_TAG());
return null;
}
@ -225,7 +251,8 @@ public class AsmFragmentInstance {
for(int i = 1; i < ctx.getChildCount(); i = i + 2) {
values.add(ctx.getChild(i).getText());
}
asmProgram.addLine(addTags(new AsmDataNumeric(null, AsmDataNumeric.Type.BYTE, values), ctx.ASM_TAG()));
AsmDataNumeric data = new AsmDataNumeric(null, AsmDataNumeric.Type.BYTE, values);
handleTags(data, ctx.ASM_TAG());
return null;
}
@ -239,7 +266,7 @@ public class AsmFragmentInstance {
instruction = (AsmInstruction) this.visit(paramModeCtx);
}
if(instruction != null) {
asmProgram.addLine(addTags(instruction, ctx.ASM_TAG()));
handleTags(instruction, ctx.ASM_TAG());
} else {
throw new RuntimeException("Error parsing ASM fragment line " + name + ".asm\n - Line: " + ctx.getText());
}

17
src/main/java/dk/camelot64/kickc/fragment/AsmFragmentInstanceSpecBuilder.java
View File

@ -62,17 +62,19 @@ public class AsmFragmentInstanceSpecBuilder {
* Create a fragment instance spec factory for an indirect call
* @return the fragment instance spec factory
*/
public static AsmFragmentInstanceSpecBuilder call(StatementCallExecute call, Program program) {
return new AsmFragmentInstanceSpecBuilder(call, program);
public static AsmFragmentInstanceSpecBuilder call(StatementCallExecute call, int indirectCallId, Program program) {
return new AsmFragmentInstanceSpecBuilder(call, indirectCallId, program);
}
private AsmFragmentInstanceSpecBuilder(StatementCallExecute call, Program program) {
private AsmFragmentInstanceSpecBuilder(StatementCallExecute call, int indirectCallId, Program program) {
this.program = program;
this.bindings = new LinkedHashMap<>();
ScopeRef codeScope = program.getStatementInfos().getBlock(call).getScope();
StringBuilder signature = new StringBuilder();
signature.append("call_");
signature.append(bind(call.getProcedureRVal()));
RValue procRVal = call.getProcedureRVal();
signature.append(bind(procRVal));
bind("la1", new LabelRef(codeScope.getFullName()+"::"+"icall"+indirectCallId));
this.asmFragmentInstanceSpec = new AsmFragmentInstanceSpec(program, signature.toString(), bindings, codeScope);
}
@ -487,6 +489,13 @@ public class AsmFragmentInstanceSpecBuilder {
String name = getTypePrefix(castType) + getConstName(value);
bind(name, value);
return name;
} else if(value instanceof ProcedureRef) {
if(castType == null) {
castType = SymbolTypeInference.inferType(program.getScope(), (ProcedureRef) value);
}
String name = getTypePrefix(castType) + getConstName(value);
bind(name, value);
return name;
} else if(value instanceof Label) {
String name = "la" + nextLabelIdx++;
bind(name, value);

2
src/main/java/dk/camelot64/kickc/fragment/AsmFragmentTemplate.java
View File

@ -160,6 +160,7 @@ public class AsmFragmentTemplate {
if(signature.contains("c5")) bindings.put("c5", new ConstantInteger(350L));
if(signature.contains("c6")) bindings.put("c6", new ConstantInteger(360L));
if(signature.contains("la1")) bindings.put("la1", new Label("@1", scope, true));
if(signature.startsWith("call_")) bindings.put("la1", new Label("@1", scope, true));
AsmFragmentInstance fragmentInstance =
new AsmFragmentInstance(new Program(), signature, ScopeRef.ROOT, this, bindings);
AsmProgram asm = new AsmProgram(targetCpu);
@ -167,6 +168,7 @@ public class AsmFragmentTemplate {
fragmentInstance.generate(asm);
CpuClobber cpuClobber = asm.getClobber();
this.clobber = new AsmFragmentClobber(cpuClobber);
asm.addStash();
this.cycles = asm.getCycles();
}

7
src/main/java/dk/camelot64/kickc/parser/KickCParser.g4
View File

@ -222,8 +222,10 @@ expr
| expr DOT NAME #exprDot
| expr '->' NAME #exprArrow
| expr PAR_BEGIN parameterList? PAR_END #exprCall
| SIZEOF ( expr | PAR_BEGIN typeName PAR_END ) #exprSizeOf
| TYPEID ( expr | PAR_BEGIN typeName PAR_END ) #exprTypeId
| SIZEOF PAR_BEGIN typeName PAR_END #exprSizeOfType
| SIZEOF expr #exprSizeOf
| TYPEID PAR_BEGIN typeName PAR_END #exprTypeIdType
| TYPEID expr #exprTypeId
| DEFINED PAR_BEGIN? NAME PAR_END? #exprDefined
| expr BRACKET_BEGIN commaExpr BRACKET_END #exprArray
| PAR_BEGIN typeName PAR_END expr #exprCast
@ -283,6 +285,7 @@ asmLine
asmLabel
: ASM_NAME ASM_COLON ASM_TAG* #asmLabelName
| ASM_CURLY_BEGIN ASM_NAME ASM_CURLY_END ASM_COLON ASM_TAG* #asmLabelReplace
| ASM_MULTI_NAME ASM_COLON ASM_TAG* #asmLabelMulti
;

2
src/main/java/dk/camelot64/kickc/parser/KickCParser.interp
View File

File diff suppressed because one or more lines are too long

1787
src/main/java/dk/camelot64/kickc/parser/KickCParser.java
View File

File diff suppressed because it is too large Load Diff

252
src/main/java/dk/camelot64/kickc/parser/KickCParserBaseListener.java
View File

@ -1081,30 +1081,6 @@ public class KickCParserBaseListener implements KickCParserListener {
* <p>The default implementation does nothing.</p>
*/
@Override public void exitExprPtr(KickCParser.ExprPtrContext ctx) { }
/**
* {@inheritDoc}
*
* <p>The default implementation does nothing.</p>
*/
@Override public void enterExprPreMod(KickCParser.ExprPreModContext ctx) { }
/**
* {@inheritDoc}
*
* <p>The default implementation does nothing.</p>
*/
@Override public void exitExprPreMod(KickCParser.ExprPreModContext ctx) { }
/**
* {@inheritDoc}
*
* <p>The default implementation does nothing.</p>
*/
@Override public void enterExprBinary(KickCParser.ExprBinaryContext ctx) { }
/**
* {@inheritDoc}
*
* <p>The default implementation does nothing.</p>
*/
@Override public void exitExprBinary(KickCParser.ExprBinaryContext ctx) { }
/**
* {@inheritDoc}
*
@ -1153,18 +1129,6 @@ public class KickCParserBaseListener implements KickCParserListener {
* <p>The default implementation does nothing.</p>
*/
@Override public void exitExprNumber(KickCParser.ExprNumberContext ctx) { }
/**
* {@inheritDoc}
*
* <p>The default implementation does nothing.</p>
*/
@Override public void enterExprChar(KickCParser.ExprCharContext ctx) { }
/**
* {@inheritDoc}
*
* <p>The default implementation does nothing.</p>
*/
@Override public void exitExprChar(KickCParser.ExprCharContext ctx) { }
/**
* {@inheritDoc}
*
@ -1177,30 +1141,6 @@ public class KickCParserBaseListener implements KickCParserListener {
* <p>The default implementation does nothing.</p>
*/
@Override public void exitExprArrow(KickCParser.ExprArrowContext ctx) { }
/**
* {@inheritDoc}
*
* <p>The default implementation does nothing.</p>
*/
@Override public void enterExprDot(KickCParser.ExprDotContext ctx) { }
/**
* {@inheritDoc}
*
* <p>The default implementation does nothing.</p>
*/
@Override public void exitExprDot(KickCParser.ExprDotContext ctx) { }
/**
* {@inheritDoc}
*
* <p>The default implementation does nothing.</p>
*/
@Override public void enterInitList(KickCParser.InitListContext ctx) { }
/**
* {@inheritDoc}
*
* <p>The default implementation does nothing.</p>
*/
@Override public void exitInitList(KickCParser.InitListContext ctx) { }
/**
* {@inheritDoc}
*
@ -1213,18 +1153,6 @@ public class KickCParserBaseListener implements KickCParserListener {
* <p>The default implementation does nothing.</p>
*/
@Override public void exitExprCast(KickCParser.ExprCastContext ctx) { }
/**
* {@inheritDoc}
*
* <p>The default implementation does nothing.</p>
*/
@Override public void enterExprCall(KickCParser.ExprCallContext ctx) { }
/**
* {@inheritDoc}
*
* <p>The default implementation does nothing.</p>
*/
@Override public void exitExprCall(KickCParser.ExprCallContext ctx) { }
/**
* {@inheritDoc}
*
@ -1237,6 +1165,138 @@ public class KickCParserBaseListener implements KickCParserListener {
* <p>The default implementation does nothing.</p>
*/
@Override public void exitExprPar(KickCParser.ExprParContext ctx) { }
/**
* {@inheritDoc}
*
* <p>The default implementation does nothing.</p>
*/
@Override public void enterExprId(KickCParser.ExprIdContext ctx) { }
/**
* {@inheritDoc}
*
* <p>The default implementation does nothing.</p>
*/
@Override public void exitExprId(KickCParser.ExprIdContext ctx) { }
/**
* {@inheritDoc}
*
* <p>The default implementation does nothing.</p>
*/
@Override public void enterExprTernary(KickCParser.ExprTernaryContext ctx) { }
/**
* {@inheritDoc}
*
* <p>The default implementation does nothing.</p>
*/
@Override public void exitExprTernary(KickCParser.ExprTernaryContext ctx) { }
/**
* {@inheritDoc}
*
* <p>The default implementation does nothing.</p>
*/
@Override public void enterExprAssignment(KickCParser.ExprAssignmentContext ctx) { }
/**
* {@inheritDoc}
*
* <p>The default implementation does nothing.</p>
*/
@Override public void exitExprAssignment(KickCParser.ExprAssignmentContext ctx) { }
/**
* {@inheritDoc}
*
* <p>The default implementation does nothing.</p>
*/
@Override public void enterExprPreMod(KickCParser.ExprPreModContext ctx) { }
/**
* {@inheritDoc}
*
* <p>The default implementation does nothing.</p>
*/
@Override public void exitExprPreMod(KickCParser.ExprPreModContext ctx) { }
/**
* {@inheritDoc}
*
* <p>The default implementation does nothing.</p>
*/
@Override public void enterExprBinary(KickCParser.ExprBinaryContext ctx) { }
/**
* {@inheritDoc}
*
* <p>The default implementation does nothing.</p>
*/
@Override public void exitExprBinary(KickCParser.ExprBinaryContext ctx) { }
/**
* {@inheritDoc}
*
* <p>The default implementation does nothing.</p>
*/
@Override public void enterExprTypeIdType(KickCParser.ExprTypeIdTypeContext ctx) { }
/**
* {@inheritDoc}
*
* <p>The default implementation does nothing.</p>
*/
@Override public void exitExprTypeIdType(KickCParser.ExprTypeIdTypeContext ctx) { }
/**
* {@inheritDoc}
*
* <p>The default implementation does nothing.</p>
*/
@Override public void enterExprChar(KickCParser.ExprCharContext ctx) { }
/**
* {@inheritDoc}
*
* <p>The default implementation does nothing.</p>
*/
@Override public void exitExprChar(KickCParser.ExprCharContext ctx) { }
/**
* {@inheritDoc}
*
* <p>The default implementation does nothing.</p>
*/
@Override public void enterExprDot(KickCParser.ExprDotContext ctx) { }
/**
* {@inheritDoc}
*
* <p>The default implementation does nothing.</p>
*/
@Override public void exitExprDot(KickCParser.ExprDotContext ctx) { }
/**
* {@inheritDoc}
*
* <p>The default implementation does nothing.</p>
*/
@Override public void enterExprSizeOfType(KickCParser.ExprSizeOfTypeContext ctx) { }
/**
* {@inheritDoc}
*
* <p>The default implementation does nothing.</p>
*/
@Override public void exitExprSizeOfType(KickCParser.ExprSizeOfTypeContext ctx) { }
/**
* {@inheritDoc}
*
* <p>The default implementation does nothing.</p>
*/
@Override public void enterInitList(KickCParser.InitListContext ctx) { }
/**
* {@inheritDoc}
*
* <p>The default implementation does nothing.</p>
*/
@Override public void exitInitList(KickCParser.InitListContext ctx) { }
/**
* {@inheritDoc}
*
* <p>The default implementation does nothing.</p>
*/
@Override public void enterExprCall(KickCParser.ExprCallContext ctx) { }
/**
* {@inheritDoc}
*
* <p>The default implementation does nothing.</p>
*/
@Override public void exitExprCall(KickCParser.ExprCallContext ctx) { }
/**
* {@inheritDoc}
*
@ -1285,18 +1345,6 @@ public class KickCParserBaseListener implements KickCParserListener {
* <p>The default implementation does nothing.</p>
*/
@Override public void exitExprBool(KickCParser.ExprBoolContext ctx) { }
/**
* {@inheritDoc}
*
* <p>The default implementation does nothing.</p>
*/
@Override public void enterExprId(KickCParser.ExprIdContext ctx) { }
/**
* {@inheritDoc}
*
* <p>The default implementation does nothing.</p>
*/
@Override public void exitExprId(KickCParser.ExprIdContext ctx) { }
/**
* {@inheritDoc}
*
@ -1309,30 +1357,6 @@ public class KickCParserBaseListener implements KickCParserListener {
* <p>The default implementation does nothing.</p>
*/
@Override public void exitExprDefined(KickCParser.ExprDefinedContext ctx) { }
/**
* {@inheritDoc}
*
* <p>The default implementation does nothing.</p>
*/
@Override public void enterExprTernary(KickCParser.ExprTernaryContext ctx) { }
/**
* {@inheritDoc}
*
* <p>The default implementation does nothing.</p>
*/
@Override public void exitExprTernary(KickCParser.ExprTernaryContext ctx) { }
/**
* {@inheritDoc}
*
* <p>The default implementation does nothing.</p>
*/
@Override public void enterExprAssignment(KickCParser.ExprAssignmentContext ctx) { }
/**
* {@inheritDoc}
*
* <p>The default implementation does nothing.</p>
*/
@Override public void exitExprAssignment(KickCParser.ExprAssignmentContext ctx) { }
/**
* {@inheritDoc}
*
@ -1477,6 +1501,18 @@ public class KickCParserBaseListener implements KickCParserListener {
* <p>The default implementation does nothing.</p>
*/
@Override public void exitAsmLabelName(KickCParser.AsmLabelNameContext ctx) { }
/**
* {@inheritDoc}
*
* <p>The default implementation does nothing.</p>
*/
@Override public void enterAsmLabelReplace(KickCParser.AsmLabelReplaceContext ctx) { }
/**
* {@inheritDoc}
*
* <p>The default implementation does nothing.</p>
*/
@Override public void exitAsmLabelReplace(KickCParser.AsmLabelReplaceContext ctx) { }
/**
* {@inheritDoc}
*

137
src/main/java/dk/camelot64/kickc/parser/KickCParserBaseVisitor.java
View File

@ -636,20 +636,6 @@ public class KickCParserBaseVisitor<T> extends AbstractParseTreeVisitor<T> imple
* {@link #visitChildren} on {@code ctx}.</p>
*/
@Override public T visitExprPtr(KickCParser.ExprPtrContext ctx) { return visitChildren(ctx); }
/**
* {@inheritDoc}
*
* <p>The default implementation returns the result of calling
* {@link #visitChildren} on {@code ctx}.</p>
*/
@Override public T visitExprPreMod(KickCParser.ExprPreModContext ctx) { return visitChildren(ctx); }
/**
* {@inheritDoc}
*
* <p>The default implementation returns the result of calling
* {@link #visitChildren} on {@code ctx}.</p>
*/
@Override public T visitExprBinary(KickCParser.ExprBinaryContext ctx) { return visitChildren(ctx); }
/**
* {@inheritDoc}
*
@ -678,13 +664,6 @@ public class KickCParserBaseVisitor<T> extends AbstractParseTreeVisitor<T> imple
* {@link #visitChildren} on {@code ctx}.</p>
*/
@Override public T visitExprNumber(KickCParser.ExprNumberContext ctx) { return visitChildren(ctx); }
/**
* {@inheritDoc}
*
* <p>The default implementation returns the result of calling
* {@link #visitChildren} on {@code ctx}.</p>
*/
@Override public T visitExprChar(KickCParser.ExprCharContext ctx) { return visitChildren(ctx); }
/**
* {@inheritDoc}
*
@ -692,20 +671,6 @@ public class KickCParserBaseVisitor<T> extends AbstractParseTreeVisitor<T> imple
* {@link #visitChildren} on {@code ctx}.</p>
*/
@Override public T visitExprArrow(KickCParser.ExprArrowContext ctx) { return visitChildren(ctx); }
/**
* {@inheritDoc}
*
* <p>The default implementation returns the result of calling
* {@link #visitChildren} on {@code ctx}.</p>
*/
@Override public T visitExprDot(KickCParser.ExprDotContext ctx) { return visitChildren(ctx); }
/**
* {@inheritDoc}
*
* <p>The default implementation returns the result of calling
* {@link #visitChildren} on {@code ctx}.</p>
*/
@Override public T visitInitList(KickCParser.InitListContext ctx) { return visitChildren(ctx); }
/**
* {@inheritDoc}
*
@ -719,14 +684,84 @@ public class KickCParserBaseVisitor<T> extends AbstractParseTreeVisitor<T> imple
* <p>The default implementation returns the result of calling
* {@link #visitChildren} on {@code ctx}.</p>
*/
@Override public T visitExprCall(KickCParser.ExprCallContext ctx) { return visitChildren(ctx); }
@Override public T visitExprPar(KickCParser.ExprParContext ctx) { return visitChildren(ctx); }
/**
* {@inheritDoc}
*
* <p>The default implementation returns the result of calling
* {@link #visitChildren} on {@code ctx}.</p>
*/
@Override public T visitExprPar(KickCParser.ExprParContext ctx) { return visitChildren(ctx); }
@Override public T visitExprId(KickCParser.ExprIdContext ctx) { return visitChildren(ctx); }
/**
* {@inheritDoc}
*
* <p>The default implementation returns the result of calling
* {@link #visitChildren} on {@code ctx}.</p>
*/
@Override public T visitExprTernary(KickCParser.ExprTernaryContext ctx) { return visitChildren(ctx); }
/**
* {@inheritDoc}
*
* <p>The default implementation returns the result of calling
* {@link #visitChildren} on {@code ctx}.</p>
*/
@Override public T visitExprAssignment(KickCParser.ExprAssignmentContext ctx) { return visitChildren(ctx); }
/**
* {@inheritDoc}
*
* <p>The default implementation returns the result of calling
* {@link #visitChildren} on {@code ctx}.</p>
*/
@Override public T visitExprPreMod(KickCParser.ExprPreModContext ctx) { return visitChildren(ctx); }
/**
* {@inheritDoc}
*
* <p>The default implementation returns the result of calling
* {@link #visitChildren} on {@code ctx}.</p>
*/
@Override public T visitExprBinary(KickCParser.ExprBinaryContext ctx) { return visitChildren(ctx); }
/**
* {@inheritDoc}
*
* <p>The default implementation returns the result of calling
* {@link #visitChildren} on {@code ctx}.</p>
*/
@Override public T visitExprTypeIdType(KickCParser.ExprTypeIdTypeContext ctx) { return visitChildren(ctx); }
/**
* {@inheritDoc}
*
* <p>The default implementation returns the result of calling
* {@link #visitChildren} on {@code ctx}.</p>
*/
@Override public T visitExprChar(KickCParser.ExprCharContext ctx) { return visitChildren(ctx); }
/**
* {@inheritDoc}
*
* <p>The default implementation returns the result of calling
* {@link #visitChildren} on {@code ctx}.</p>
*/
@Override public T visitExprDot(KickCParser.ExprDotContext ctx) { return visitChildren(ctx); }
/**
* {@inheritDoc}
*
* <p>The default implementation returns the result of calling
* {@link #visitChildren} on {@code ctx}.</p>
*/
@Override public T visitExprSizeOfType(KickCParser.ExprSizeOfTypeContext ctx) { return visitChildren(ctx); }
/**
* {@inheritDoc}
*
* <p>The default implementation returns the result of calling
* {@link #visitChildren} on {@code ctx}.</p>
*/
@Override public T visitInitList(KickCParser.InitListContext ctx) { return visitChildren(ctx); }
/**
* {@inheritDoc}
*
* <p>The default implementation returns the result of calling
* {@link #visitChildren} on {@code ctx}.</p>
*/
@Override public T visitExprCall(KickCParser.ExprCallContext ctx) { return visitChildren(ctx); }
/**
* {@inheritDoc}
*
@ -755,13 +790,6 @@ public class KickCParserBaseVisitor<T> extends AbstractParseTreeVisitor<T> imple
* {@link #visitChildren} on {@code ctx}.</p>
*/
@Override public T visitExprBool(KickCParser.ExprBoolContext ctx) { return visitChildren(ctx); }
/**
* {@inheritDoc}
*
* <p>The default implementation returns the result of calling
* {@link #visitChildren} on {@code ctx}.</p>
*/
@Override public T visitExprId(KickCParser.ExprIdContext ctx) { return visitChildren(ctx); }
/**
* {@inheritDoc}
*
@ -769,20 +797,6 @@ public class KickCParserBaseVisitor<T> extends AbstractParseTreeVisitor<T> imple
* {@link #visitChildren} on {@code ctx}.</p>
*/
@Override public T visitExprDefined(KickCParser.ExprDefinedContext ctx) { return visitChildren(ctx); }
/**
* {@inheritDoc}
*
* <p>The default implementation returns the result of calling
* {@link #visitChildren} on {@code ctx}.</p>
*/
@Override public T visitExprTernary(KickCParser.ExprTernaryContext ctx) { return visitChildren(ctx); }
/**
* {@inheritDoc}
*
* <p>The default implementation returns the result of calling
* {@link #visitChildren} on {@code ctx}.</p>
*/
@Override public T visitExprAssignment(KickCParser.ExprAssignmentContext ctx) { return visitChildren(ctx); }
/**
* {@inheritDoc}
*
@ -867,6 +881,13 @@ public class KickCParserBaseVisitor<T> extends AbstractParseTreeVisitor<T> imple
* {@link #visitChildren} on {@code ctx}.</p>
*/
@Override public T visitAsmLabelName(KickCParser.AsmLabelNameContext ctx) { return visitChildren(ctx); }
/**
* {@inheritDoc}
*
* <p>The default implementation returns the result of calling
* {@link #visitChildren} on {@code ctx}.</p>
*/
@Override public T visitAsmLabelReplace(KickCParser.AsmLabelReplaceContext ctx) { return visitChildren(ctx); }
/**
* {@inheritDoc}
*

252
src/main/java/dk/camelot64/kickc/parser/KickCParserListener.java
View File

@ -1031,30 +1031,6 @@ public interface KickCParserListener extends ParseTreeListener {
* @param ctx the parse tree
*/
void exitExprPtr(KickCParser.ExprPtrContext ctx);
/**
* Enter a parse tree produced by the {@code exprPreMod}
* labeled alternative in {@link KickCParser#expr}.
* @param ctx the parse tree
*/
void enterExprPreMod(KickCParser.ExprPreModContext ctx);
/**
* Exit a parse tree produced by the {@code exprPreMod}
* labeled alternative in {@link KickCParser#expr}.
* @param ctx the parse tree
*/
void exitExprPreMod(KickCParser.ExprPreModContext ctx);
/**
* Enter a parse tree produced by the {@code exprBinary}
* labeled alternative in {@link KickCParser#expr}.
* @param ctx the parse tree
*/
void enterExprBinary(KickCParser.ExprBinaryContext ctx);
/**
* Exit a parse tree produced by the {@code exprBinary}
* labeled alternative in {@link KickCParser#expr}.
* @param ctx the parse tree
*/
void exitExprBinary(KickCParser.ExprBinaryContext ctx);
/**
* Enter a parse tree produced by the {@code exprTypeId}
* labeled alternative in {@link KickCParser#expr}.
@ -1103,18 +1079,6 @@ public interface KickCParserListener extends ParseTreeListener {
* @param ctx the parse tree
*/
void exitExprNumber(KickCParser.ExprNumberContext ctx);
/**
* Enter a parse tree produced by the {@code exprChar}
* labeled alternative in {@link KickCParser#expr}.
* @param ctx the parse tree
*/
void enterExprChar(KickCParser.ExprCharContext ctx);
/**
* Exit a parse tree produced by the {@code exprChar}
* labeled alternative in {@link KickCParser#expr}.
* @param ctx the parse tree
*/
void exitExprChar(KickCParser.ExprCharContext ctx);
/**
* Enter a parse tree produced by the {@code exprArrow}
* labeled alternative in {@link KickCParser#expr}.
@ -1127,30 +1091,6 @@ public interface KickCParserListener extends ParseTreeListener {
* @param ctx the parse tree
*/
void exitExprArrow(KickCParser.ExprArrowContext ctx);
/**
* Enter a parse tree produced by the {@code exprDot}
* labeled alternative in {@link KickCParser#expr}.
* @param ctx the parse tree
*/
void enterExprDot(KickCParser.ExprDotContext ctx);
/**
* Exit a parse tree produced by the {@code exprDot}
* labeled alternative in {@link KickCParser#expr}.
* @param ctx the parse tree
*/
void exitExprDot(KickCParser.ExprDotContext ctx);
/**
* Enter a parse tree produced by the {@code initList}
* labeled alternative in {@link KickCParser#expr}.
* @param ctx the parse tree
*/
void enterInitList(KickCParser.InitListContext ctx);
/**
* Exit a parse tree produced by the {@code initList}
* labeled alternative in {@link KickCParser#expr}.
* @param ctx the parse tree
*/
void exitInitList(KickCParser.InitListContext ctx);
/**
* Enter a parse tree produced by the {@code exprCast}
* labeled alternative in {@link KickCParser#expr}.
@ -1163,18 +1103,6 @@ public interface KickCParserListener extends ParseTreeListener {
* @param ctx the parse tree
*/
void exitExprCast(KickCParser.ExprCastContext ctx);
/**
* Enter a parse tree produced by the {@code exprCall}
* labeled alternative in {@link KickCParser#expr}.
* @param ctx the parse tree
*/
void enterExprCall(KickCParser.ExprCallContext ctx);
/**
* Exit a parse tree produced by the {@code exprCall}
* labeled alternative in {@link KickCParser#expr}.
* @param ctx the parse tree
*/
void exitExprCall(KickCParser.ExprCallContext ctx);
/**
* Enter a parse tree produced by the {@code exprPar}
* labeled alternative in {@link KickCParser#expr}.
@ -1187,6 +1115,138 @@ public interface KickCParserListener extends ParseTreeListener {
* @param ctx the parse tree
*/
void exitExprPar(KickCParser.ExprParContext ctx);
/**
* Enter a parse tree produced by the {@code exprId}
* labeled alternative in {@link KickCParser#expr}.
* @param ctx the parse tree
*/
void enterExprId(KickCParser.ExprIdContext ctx);
/**
* Exit a parse tree produced by the {@code exprId}
* labeled alternative in {@link KickCParser#expr}.
* @param ctx the parse tree
*/
void exitExprId(KickCParser.ExprIdContext ctx);
/**
* Enter a parse tree produced by the {@code exprTernary}
* labeled alternative in {@link KickCParser#expr}.
* @param ctx the parse tree
*/
void enterExprTernary(KickCParser.ExprTernaryContext ctx);
/**
* Exit a parse tree produced by the {@code exprTernary}
* labeled alternative in {@link KickCParser#expr}.
* @param ctx the parse tree
*/
void exitExprTernary(KickCParser.ExprTernaryContext ctx);
/**
* Enter a parse tree produced by the {@code exprAssignment}
* labeled alternative in {@link KickCParser#expr}.
* @param ctx the parse tree
*/
void enterExprAssignment(KickCParser.ExprAssignmentContext ctx);
/**
* Exit a parse tree produced by the {@code exprAssignment}
* labeled alternative in {@link KickCParser#expr}.
* @param ctx the parse tree
*/
void exitExprAssignment(KickCParser.ExprAssignmentContext ctx);
/**
* Enter a parse tree produced by the {@code exprPreMod}
* labeled alternative in {@link KickCParser#expr}.
* @param ctx the parse tree
*/
void enterExprPreMod(KickCParser.ExprPreModContext ctx);
/**
* Exit a parse tree produced by the {@code exprPreMod}
* labeled alternative in {@link KickCParser#expr}.
* @param ctx the parse tree
*/
void exitExprPreMod(KickCParser.ExprPreModContext ctx);
/**
* Enter a parse tree produced by the {@code exprBinary}
* labeled alternative in {@link KickCParser#expr}.
* @param ctx the parse tree
*/
void enterExprBinary(KickCParser.ExprBinaryContext ctx);
/**
* Exit a parse tree produced by the {@code exprBinary}
* labeled alternative in {@link KickCParser#expr}.
* @param ctx the parse tree
*/
void exitExprBinary(KickCParser.ExprBinaryContext ctx);
/**
* Enter a parse tree produced by the {@code exprTypeIdType}
* labeled alternative in {@link KickCParser#expr}.
* @param ctx the parse tree
*/
void enterExprTypeIdType(KickCParser.ExprTypeIdTypeContext ctx);
/**
* Exit a parse tree produced by the {@code exprTypeIdType}
* labeled alternative in {@link KickCParser#expr}.
* @param ctx the parse tree
*/
void exitExprTypeIdType(KickCParser.ExprTypeIdTypeContext ctx);
/**
* Enter a parse tree produced by the {@code exprChar}
* labeled alternative in {@link KickCParser#expr}.
* @param ctx the parse tree
*/
void enterExprChar(KickCParser.ExprCharContext ctx);
/**
* Exit a parse tree produced by the {@code exprChar}
* labeled alternative in {@link KickCParser#expr}.
* @param ctx the parse tree
*/
void exitExprChar(KickCParser.ExprCharContext ctx);
/**
* Enter a parse tree produced by the {@code exprDot}
* labeled alternative in {@link KickCParser#expr}.
* @param ctx the parse tree
*/
void enterExprDot(KickCParser.ExprDotContext ctx);
/**
* Exit a parse tree produced by the {@code exprDot}
* labeled alternative in {@link KickCParser#expr}.
* @param ctx the parse tree
*/
void exitExprDot(KickCParser.ExprDotContext ctx);
/**
* Enter a parse tree produced by the {@code exprSizeOfType}
* labeled alternative in {@link KickCParser#expr}.
* @param ctx the parse tree
*/
void enterExprSizeOfType(KickCParser.ExprSizeOfTypeContext ctx);
/**
* Exit a parse tree produced by the {@code exprSizeOfType}
* labeled alternative in {@link KickCParser#expr}.
* @param ctx the parse tree
*/
void exitExprSizeOfType(KickCParser.ExprSizeOfTypeContext ctx);
/**
* Enter a parse tree produced by the {@code initList}
* labeled alternative in {@link KickCParser#expr}.
* @param ctx the parse tree
*/
void enterInitList(KickCParser.InitListContext ctx);
/**
* Exit a parse tree produced by the {@code initList}
* labeled alternative in {@link KickCParser#expr}.
* @param ctx the parse tree
*/
void exitInitList(KickCParser.InitListContext ctx);
/**
* Enter a parse tree produced by the {@code exprCall}
* labeled alternative in {@link KickCParser#expr}.
* @param ctx the parse tree
*/
void enterExprCall(KickCParser.ExprCallContext ctx);
/**
* Exit a parse tree produced by the {@code exprCall}
* labeled alternative in {@link KickCParser#expr}.
* @param ctx the parse tree
*/
void exitExprCall(KickCParser.ExprCallContext ctx);
/**
* Enter a parse tree produced by the {@code exprSizeOf}
* labeled alternative in {@link KickCParser#expr}.
@ -1235,18 +1295,6 @@ public interface KickCParserListener extends ParseTreeListener {
* @param ctx the parse tree
*/
void exitExprBool(KickCParser.ExprBoolContext ctx);
/**
* Enter a parse tree produced by the {@code exprId}
* labeled alternative in {@link KickCParser#expr}.
* @param ctx the parse tree
*/
void enterExprId(KickCParser.ExprIdContext ctx);
/**
* Exit a parse tree produced by the {@code exprId}
* labeled alternative in {@link KickCParser#expr}.
* @param ctx the parse tree
*/
void exitExprId(KickCParser.ExprIdContext ctx);
/**
* Enter a parse tree produced by the {@code exprDefined}
* labeled alternative in {@link KickCParser#expr}.
@ -1259,30 +1307,6 @@ public interface KickCParserListener extends ParseTreeListener {
* @param ctx the parse tree
*/
void exitExprDefined(KickCParser.ExprDefinedContext ctx);
/**
* Enter a parse tree produced by the {@code exprTernary}
* labeled alternative in {@link KickCParser#expr}.
* @param ctx the parse tree
*/
void enterExprTernary(KickCParser.ExprTernaryContext ctx);
/**
* Exit a parse tree produced by the {@code exprTernary}
* labeled alternative in {@link KickCParser#expr}.
* @param ctx the parse tree
*/
void exitExprTernary(KickCParser.ExprTernaryContext ctx);
/**
* Enter a parse tree produced by the {@code exprAssignment}
* labeled alternative in {@link KickCParser#expr}.
* @param ctx the parse tree
*/
void enterExprAssignment(KickCParser.ExprAssignmentContext ctx);
/**
* Exit a parse tree produced by the {@code exprAssignment}
* labeled alternative in {@link KickCParser#expr}.
* @param ctx the parse tree
*/
void exitExprAssignment(KickCParser.ExprAssignmentContext ctx);
/**
* Enter a parse tree produced by the {@code exprArray}
* labeled alternative in {@link KickCParser#expr}.
@ -1417,6 +1441,18 @@ public interface KickCParserListener extends ParseTreeListener {
* @param ctx the parse tree
*/
void exitAsmLabelName(KickCParser.AsmLabelNameContext ctx);
/**
* Enter a parse tree produced by the {@code asmLabelReplace}
* labeled alternative in {@link KickCParser#asmLabel}.
* @param ctx the parse tree
*/
void enterAsmLabelReplace(KickCParser.AsmLabelReplaceContext ctx);
/**
* Exit a parse tree produced by the {@code asmLabelReplace}
* labeled alternative in {@link KickCParser#asmLabel}.
* @param ctx the parse tree
*/
void exitAsmLabelReplace(KickCParser.AsmLabelReplaceContext ctx);
/**
* Enter a parse tree produced by the {@code asmLabelMulti}
* labeled alternative in {@link KickCParser#asmLabel}.

147
src/main/java/dk/camelot64/kickc/parser/KickCParserVisitor.java
View File

@ -612,20 +612,6 @@ public interface KickCParserVisitor<T> extends ParseTreeVisitor<T> {
* @return the visitor result
*/
T visitExprPtr(KickCParser.ExprPtrContext ctx);
/**
* Visit a parse tree produced by the {@code exprPreMod}
* labeled alternative in {@link KickCParser#expr}.
* @param ctx the parse tree
* @return the visitor result
*/
T visitExprPreMod(KickCParser.ExprPreModContext ctx);
/**
* Visit a parse tree produced by the {@code exprBinary}
* labeled alternative in {@link KickCParser#expr}.
* @param ctx the parse tree
* @return the visitor result
*/
T visitExprBinary(KickCParser.ExprBinaryContext ctx);
/**
* Visit a parse tree produced by the {@code exprTypeId}
* labeled alternative in {@link KickCParser#expr}.
@ -654,13 +640,6 @@ public interface KickCParserVisitor<T> extends ParseTreeVisitor<T> {
* @return the visitor result
*/
T visitExprNumber(KickCParser.ExprNumberContext ctx);
/**
* Visit a parse tree produced by the {@code exprChar}
* labeled alternative in {@link KickCParser#expr}.
* @param ctx the parse tree
* @return the visitor result
*/
T visitExprChar(KickCParser.ExprCharContext ctx);
/**
* Visit a parse tree produced by the {@code exprArrow}
* labeled alternative in {@link KickCParser#expr}.
@ -668,20 +647,6 @@ public interface KickCParserVisitor<T> extends ParseTreeVisitor<T> {
* @return the visitor result
*/
T visitExprArrow(KickCParser.ExprArrowContext ctx);
/**
* Visit a parse tree produced by the {@code exprDot}
* labeled alternative in {@link KickCParser#expr}.
* @param ctx the parse tree
* @return the visitor result
*/
T visitExprDot(KickCParser.ExprDotContext ctx);
/**
* Visit a parse tree produced by the {@code initList}
* labeled alternative in {@link KickCParser#expr}.
* @param ctx the parse tree
* @return the visitor result
*/
T visitInitList(KickCParser.InitListContext ctx);
/**
* Visit a parse tree produced by the {@code exprCast}
* labeled alternative in {@link KickCParser#expr}.
@ -689,13 +654,6 @@ public interface KickCParserVisitor<T> extends ParseTreeVisitor<T> {
* @return the visitor result
*/
T visitExprCast(KickCParser.ExprCastContext ctx);
/**
* Visit a parse tree produced by the {@code exprCall}
* labeled alternative in {@link KickCParser#expr}.
* @param ctx the parse tree
* @return the visitor result
*/
T visitExprCall(KickCParser.ExprCallContext ctx);
/**
* Visit a parse tree produced by the {@code exprPar}
* labeled alternative in {@link KickCParser#expr}.
@ -703,6 +661,83 @@ public interface KickCParserVisitor<T> extends ParseTreeVisitor<T> {
* @return the visitor result
*/
T visitExprPar(KickCParser.ExprParContext ctx);
/**
* Visit a parse tree produced by the {@code exprId}
* labeled alternative in {@link KickCParser#expr}.
* @param ctx the parse tree
* @return the visitor result
*/
T visitExprId(KickCParser.ExprIdContext ctx);
/**
* Visit a parse tree produced by the {@code exprTernary}
* labeled alternative in {@link KickCParser#expr}.
* @param ctx the parse tree
* @return the visitor result
*/
T visitExprTernary(KickCParser.ExprTernaryContext ctx);
/**
* Visit a parse tree produced by the {@code exprAssignment}
* labeled alternative in {@link KickCParser#expr}.
* @param ctx the parse tree
* @return the visitor result
*/
T visitExprAssignment(KickCParser.ExprAssignmentContext ctx);
/**
* Visit a parse tree produced by the {@code exprPreMod}
* labeled alternative in {@link KickCParser#expr}.
* @param ctx the parse tree
* @return the visitor result
*/
T visitExprPreMod(KickCParser.ExprPreModContext ctx);
/**
* Visit a parse tree produced by the {@code exprBinary}
* labeled alternative in {@link KickCParser#expr}.
* @param ctx the parse tree
* @return the visitor result
*/
T visitExprBinary(KickCParser.ExprBinaryContext ctx);
/**
* Visit a parse tree produced by the {@code exprTypeIdType}
* labeled alternative in {@link KickCParser#expr}.
* @param ctx the parse tree
* @return the visitor result
*/
T visitExprTypeIdType(KickCParser.ExprTypeIdTypeContext ctx);
/**
* Visit a parse tree produced by the {@code exprChar}
* labeled alternative in {@link KickCParser#expr}.
* @param ctx the parse tree
* @return the visitor result
*/
T visitExprChar(KickCParser.ExprCharContext ctx);
/**
* Visit a parse tree produced by the {@code exprDot}
* labeled alternative in {@link KickCParser#expr}.
* @param ctx the parse tree
* @return the visitor result
*/
T visitExprDot(KickCParser.ExprDotContext ctx);
/**
* Visit a parse tree produced by the {@code exprSizeOfType}
* labeled alternative in {@link KickCParser#expr}.
* @param ctx the parse tree
* @return the visitor result
*/
T visitExprSizeOfType(KickCParser.ExprSizeOfTypeContext ctx);
/**
* Visit a parse tree produced by the {@code initList}
* labeled alternative in {@link KickCParser#expr}.
* @param ctx the parse tree
* @return the visitor result
*/
T visitInitList(KickCParser.InitListContext ctx);
/**
* Visit a parse tree produced by the {@code exprCall}
* labeled alternative in {@link KickCParser#expr}.
* @param ctx the parse tree
* @return the visitor result
*/
T visitExprCall(KickCParser.ExprCallContext ctx);
/**
* Visit a parse tree produced by the {@code exprSizeOf}
* labeled alternative in {@link KickCParser#expr}.
@ -731,13 +766,6 @@ public interface KickCParserVisitor<T> extends ParseTreeVisitor<T> {
* @return the visitor result
*/
T visitExprBool(KickCParser.ExprBoolContext ctx);
/**
* Visit a parse tree produced by the {@code exprId}
* labeled alternative in {@link KickCParser#expr}.
* @param ctx the parse tree
* @return the visitor result
*/
T visitExprId(KickCParser.ExprIdContext ctx);
/**
* Visit a parse tree produced by the {@code exprDefined}
* labeled alternative in {@link KickCParser#expr}.
@ -745,20 +773,6 @@ public interface KickCParserVisitor<T> extends ParseTreeVisitor<T> {
* @return the visitor result
*/
T visitExprDefined(KickCParser.ExprDefinedContext ctx);
/**
* Visit a parse tree produced by the {@code exprTernary}
* labeled alternative in {@link KickCParser#expr}.
* @param ctx the parse tree
* @return the visitor result
*/
T visitExprTernary(KickCParser.ExprTernaryContext ctx);
/**
* Visit a parse tree produced by the {@code exprAssignment}
* labeled alternative in {@link KickCParser#expr}.
* @param ctx the parse tree
* @return the visitor result
*/
T visitExprAssignment(KickCParser.ExprAssignmentContext ctx);
/**
* Visit a parse tree produced by the {@code exprArray}
* labeled alternative in {@link KickCParser#expr}.
@ -838,6 +852,13 @@ public interface KickCParserVisitor<T> extends ParseTreeVisitor<T> {
* @return the visitor result
*/
T visitAsmLabelName(KickCParser.AsmLabelNameContext ctx);
/**
* Visit a parse tree produced by the {@code asmLabelReplace}
* labeled alternative in {@link KickCParser#asmLabel}.
* @param ctx the parse tree
* @return the visitor result
*/
T visitAsmLabelReplace(KickCParser.AsmLabelReplaceContext ctx);
/**
* Visit a parse tree produced by the {@code asmLabelMulti}
* labeled alternative in {@link KickCParser#asmLabel}.

58
src/main/java/dk/camelot64/kickc/passes/Pass0GenerateStatementSequence.java
View File

@ -2381,38 +2381,40 @@ public class Pass0GenerateStatementSequence extends KickCParserBaseVisitor<Objec
@Override
public Object visitExprSizeOf(KickCParser.ExprSizeOfContext ctx) {
if(ctx.typeName() != null) {
// sizeof(type) - add directly
SymbolType type = (SymbolType) this.visit(ctx.typeName());
return SizeOfConstants.getSizeOfConstantVar(program.getScope(), type);
} else {
// sizeof(expression) - add a unary expression to be resolved later
RValue child = (RValue) this.visit(ctx.expr());
Variable tmpVar = addIntermediateVar();
SymbolVariableRef tmpVarRef = tmpVar.getRef();
Statement stmt = new StatementAssignment((LValue) tmpVarRef, Operators.SIZEOF, child, true, new StatementSource(ctx), ensureUnusedComments(getCommentsSymbol(ctx)));
addStatement(stmt);
consumeExpr(child);
return tmpVarRef;
}
// sizeof(expression) - add a unary expression to be resolved later
RValue child = (RValue) this.visit(ctx.expr());
Variable tmpVar = addIntermediateVar();
SymbolVariableRef tmpVarRef = tmpVar.getRef();
Statement stmt = new StatementAssignment((LValue) tmpVarRef, Operators.SIZEOF, child, true, new StatementSource(ctx), ensureUnusedComments(getCommentsSymbol(ctx)));
addStatement(stmt);
consumeExpr(child);
return tmpVarRef;
}
@Override
public Object visitExprSizeOfType(KickCParser.ExprSizeOfTypeContext ctx) {
// sizeof(type) - add directly
SymbolType type = (SymbolType) this.visit(ctx.typeName());
return SizeOfConstants.getSizeOfConstantVar(program.getScope(), type);
}
@Override
public Object visitExprTypeId(KickCParser.ExprTypeIdContext ctx) {
if(ctx.typeName() != null) {
// typeid(type) - add directly
SymbolType type = (SymbolType) this.visit(ctx.typeName());
return OperatorTypeId.getTypeIdConstantVar(program.getScope(), type);
} else {
// typeid(expression) - add a unary expression to be resolved later
RValue child = (RValue) this.visit(ctx.expr());
Variable tmpVar = addIntermediateVar();
SymbolVariableRef tmpVarRef = tmpVar.getRef();
Statement stmt = new StatementAssignment((LValue) tmpVarRef, Operators.TYPEID, child, true, new StatementSource(ctx), ensureUnusedComments(getCommentsSymbol(ctx)));
addStatement(stmt);
consumeExpr(child);
return tmpVarRef;
}
// typeid(expression) - add a unary expression to be resolved later
RValue child = (RValue) this.visit(ctx.expr());
Variable tmpVar = addIntermediateVar();
SymbolVariableRef tmpVarRef = tmpVar.getRef();
Statement stmt = new StatementAssignment((LValue) tmpVarRef, Operators.TYPEID, child, true, new StatementSource(ctx), ensureUnusedComments(getCommentsSymbol(ctx)));
addStatement(stmt);
consumeExpr(child);
return tmpVarRef;
}
@Override
public Object visitExprTypeIdType(KickCParser.ExprTypeIdTypeContext ctx) {
// typeid(type) - add directly
SymbolType type = (SymbolType) this.visit(ctx.typeName());
return OperatorTypeId.getTypeIdConstantVar(program.getScope(), type);
}
@Override

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

@ -192,11 +192,8 @@ public class Pass4CodeGeneration {
}
}
/**
* ASM names of variables being used for indirect calls in the current scope (procedure).
* These will all be added as indirect JMP's at the end of the procedure scope.
*/
private List<String> indirectCallAsmNames = new ArrayList<>();
/** Counter used to separate indirect calls */
private int indirectCallCount = 1;
/**
* Generate the end of a scope
@ -206,30 +203,15 @@ public class Pass4CodeGeneration {
*/
private void generateScopeEnding(AsmProgram asm, ScopeRef currentScope) {
if(!ScopeRef.ROOT.equals(currentScope)) {
// Generate any indirect calls pending
for(String indirectCallAsmName : indirectCallAsmNames) {
asm.addLabel("bi_" + indirectCallAsmName);
asm.addInstruction("jmp", CpuAddressingMode.IND, indirectCallAsmName, false);
}
indirectCallAsmNames = new ArrayList<>();
if(asm.hasStash())
asm.startChunk(currentScope, null, "Outside Flow");
// Generate all stashed ASM lines
asm.addStash();
addData(asm, currentScope);
asm.addScopeEnd();
}
}
/**
* Add an indirect call to the assembler program. Also queues ASM for the indirect jump to be added at the end of the block.
*
* @param asm The ASM program being built
* @param procedureVariable The variable containing the function pointer
* @param codeScopeRef The scope containing the code being generated. Used for adding scope to the name when needed (eg. line.x1 when referencing x1 variable inside line scope from outside line scope).
*/
private void generateIndirectCall(AsmProgram asm, Variable procedureVariable, ScopeRef codeScopeRef) {
String varAsmName = AsmFormat.getAsmSymbolName(program, procedureVariable, codeScopeRef);
indirectCallAsmNames.add(varAsmName);
asm.addInstruction("jsr", CpuAddressingMode.ABS, "bi_" + varAsmName, false);
}
/**
* Generate a comment that describes the procedure signature and parameter transfer
*
@ -913,52 +895,12 @@ public class Pass4CodeGeneration {
} else if(statement instanceof StatementCallExecute) {
StatementCallExecute call = (StatementCallExecute) statement;
RValue procedureRVal = call.getProcedureRVal();
boolean supported = false;
if(procedureRVal instanceof ProcedureRef) {
asm.getCurrentChunk().setFragment("jsr");
asm.addInstruction("jsr", CpuAddressingMode.ABS, call.getProcedure().getFullName(), false);
supported = true;
} else if(procedureRVal instanceof PointerDereferenceSimple) {
RValue pointer = ((PointerDereferenceSimple) procedureRVal).getPointer();
while(pointer instanceof CastValue)
pointer = ((CastValue) pointer).getValue();
if(pointer instanceof VariableRef) {
Variable variable = getScope().getVariable((VariableRef) pointer);
generateIndirectCall(asm, variable, block.getScope());
asm.getCurrentChunk().setClobberOverwrite(CpuClobber.CLOBBER_ALL);
supported = true;
} else {
// Generate ASM for an indirect call
AsmFragmentInstanceSpecBuilder asmFragmentInstanceSpecBuilder = AsmFragmentInstanceSpecBuilder.call(call, program);
ensureEncoding(asm, asmFragmentInstanceSpecBuilder);
generateAsm(asm, asmFragmentInstanceSpecBuilder.getAsmFragmentInstanceSpec());
asm.getCurrentChunk().setClobberOverwrite(CpuClobber.CLOBBER_ALL);
supported = true;
}
} else if(procedureRVal instanceof VariableRef) {
Variable procedureVariable = getScope().getVariable((VariableRef) procedureRVal);
SymbolType procedureVariableType = procedureVariable.getType();
if(procedureVariableType instanceof SymbolTypePointer) {
if(((SymbolTypePointer) procedureVariableType).getElementType() instanceof SymbolTypeProcedure) {
generateIndirectCall(asm, procedureVariable, block.getScope());
supported = true;
asm.getCurrentChunk().setClobberOverwrite(CpuClobber.CLOBBER_ALL);
}
}
} else if(procedureRVal instanceof ConstantRef) {
Variable procedureVariable = getScope().getConstant((ConstantRef) procedureRVal);
SymbolType procedureVariableType = procedureVariable.getType();
if(procedureVariableType instanceof SymbolTypePointer) {
if(((SymbolTypePointer) procedureVariableType).getElementType() instanceof SymbolTypeProcedure) {
String varAsmName = AsmFormat.getAsmSymbolName(program, procedureVariable, block.getScope());
asm.addInstruction("jsr", CpuAddressingMode.ABS, varAsmName, false);
asm.getCurrentChunk().setClobberOverwrite(CpuClobber.CLOBBER_ALL);
supported = true;
}
}
}
if(!supported) {
throw new InternalError("Call Pointer not supported " + statement);
// Generate ASM for a call
AsmFragmentInstanceSpecBuilder asmFragmentInstanceSpecBuilder = AsmFragmentInstanceSpecBuilder.call(call, indirectCallCount++, program);
ensureEncoding(asm, asmFragmentInstanceSpecBuilder);
generateAsm(asm, asmFragmentInstanceSpecBuilder.getAsmFragmentInstanceSpec());
if(!(procedureRVal instanceof ProcedureRef)) {
asm.getCurrentChunk().setClobberOverwrite(CpuClobber.CLOBBER_ALL);
}
} else if(statement instanceof StatementExprSideEffect) {
AsmFragmentInstanceSpecBuilder asmFragmentInstanceSpecBuilder = AsmFragmentInstanceSpecBuilder.exprSideEffect((StatementExprSideEffect) statement, program);

42
src/test/ref/examples/rom/rom.log
View File

@ -68,7 +68,7 @@ main: scope:[main] from __start
*main::ptr = main::$1
call2::param1#0 = 1
call2::param2#0 = 2
call call2
call call2
call2::return = call2::return
to:main::@1
main::@1: scope:[main] from main
@ -76,7 +76,7 @@ main::@1: scope:[main] from main
*main::ptr = main::$2
call2::param1#1 = 3
call2::param2#1 = 4
call call2
call call2
call2::return = call2::return
to:main::@2
main::@2: scope:[main] from main::@1
@ -84,7 +84,7 @@ main::@2: scope:[main] from main::@1
*main::ptr = main::$3
call3::param1#0 = 1
call3::param2#0 = 2
call call3
call call3
call3::return#2 = call3::return#1
to:main::@3
main::@3: scope:[main] from main::@2
@ -93,7 +93,7 @@ main::@3: scope:[main] from main::@2
*main::ptr = main::$4
call3::param1#1 = 3
call3::param2#1 = 4
call call3
call call3
call3::return#3 = call3::return#1
to:main::@4
main::@4: scope:[main] from main::@3
@ -107,7 +107,7 @@ main::@return: scope:[main] from main::@4
void __start()
__start: scope:[__start] from
call main
call main
to:__start::@1
__start::@1: scope:[__start] from __start
to:__start::@return
@ -289,25 +289,25 @@ main: scope:[main] from
sideeffect stackpullbytes(1)
[10] main::$1 = stackpull(byte)
[11] *main::ptr = main::$1
[12] call call2
[12] call call2
[13] call2::return = call2::return
to:main::@1
main::@1: scope:[main] from main
[14] main::$2 = call2::return
[15] *main::ptr = main::$2
[16] call call2
[16] call call2
[17] call2::return = call2::return
to:main::@2
main::@2: scope:[main] from main::@1
[18] main::$3 = call2::return
[19] *main::ptr = main::$3
[20] call call3
[20] call call3
[21] call3::return#2 = call3::return#0
to:main::@3
main::@3: scope:[main] from main::@2
[22] main::$4 = call3::return#2
[23] *main::ptr = main::$4
[24] call call3
[24] call call3
[25] call3::return#3 = call3::return#0
to:main::@4
main::@4: scope:[main] from main::@3
@ -540,7 +540,7 @@ main: {
// [1] stackpush(byte) = 2 -- _stackpushbyte_=vbuc1
lda #2
pha
// [2] callexecute call1 -- jsr
// [2] callexecute call1 -- call_vprc1
jsr call1
// sideeffect stackpullbytes(1) -- _stackpullbyte_1
pla
@ -554,7 +554,7 @@ main: {
// [7] stackpush(byte) = 4 -- _stackpushbyte_=vbuc1
lda #4
pha
// [8] callexecute call1 -- jsr
// [8] callexecute call1 -- call_vprc1
jsr call1
// sideeffect stackpullbytes(1) -- _stackpullbyte_1
pla
@ -562,7 +562,7 @@ main: {
pla
// [11] *main::ptr = main::$1 -- _deref_pbuc1=vbuaa
sta ptr
// [12] call call2
// [12] call call2
// [34] phi from main to call2 [phi:main->call2]
call2_from_main:
// [34] phi call2::param2#2 = 2 [phi:main->call2#0] -- vbuaa=vbuc1
@ -578,7 +578,7 @@ main: {
lda.z call2.return
// [15] *main::ptr = main::$2 -- _deref_pbuc1=vbuaa
sta ptr
// [16] call call2
// [16] call call2
// [34] phi from main::@1 to call2 [phi:main::@1->call2]
call2_from___b1:
// [34] phi call2::param2#2 = 4 [phi:main::@1->call2#0] -- vbuaa=vbuc1
@ -594,7 +594,7 @@ main: {
lda.z call2.return
// [19] *main::ptr = main::$3 -- _deref_pbuc1=vbuaa
sta ptr
// [20] call call3
// [20] call call3
// [38] phi from main::@2 to call3 [phi:main::@2->call3]
call3_from___b2:
// [38] phi call3::param2#2 = 2 [phi:main::@2->call3#0] -- vbuaa=vbuc1
@ -609,7 +609,7 @@ main: {
// [22] main::$4 = call3::return#2
// [23] *main::ptr = main::$4 -- _deref_pbuc1=vbuaa
sta ptr
// [24] call call3
// [24] call call3
// [38] phi from main::@3 to call3 [phi:main::@3->call3]
call3_from___b3:
// [38] phi call3::param2#2 = 4 [phi:main::@3->call3#0] -- vbuaa=vbuc1
@ -798,7 +798,7 @@ main: {
// [1] stackpush(byte) = 2 -- _stackpushbyte_=vbuc1
lda #2
pha
// [2] callexecute call1 -- jsr
// [2] callexecute call1 -- call_vprc1
jsr call1
// sideeffect stackpullbytes(1) -- _stackpullbyte_1
pla
@ -814,7 +814,7 @@ main: {
// [7] stackpush(byte) = 4 -- _stackpushbyte_=vbuc1
lda #4
pha
// [8] callexecute call1 -- jsr
// [8] callexecute call1 -- call_vprc1
jsr call1
// sideeffect stackpullbytes(1) -- _stackpullbyte_1
pla
@ -824,7 +824,7 @@ main: {
// [11] *main::ptr = main::$1 -- _deref_pbuc1=vbuaa
sta ptr
// call2(1,2)
// [12] call call2
// [12] call call2
// [34] phi from main to call2 [phi:main->call2]
// [34] phi call2::param2#2 = 2 [phi:main->call2#0] -- vbuaa=vbuc1
lda #2
@ -840,7 +840,7 @@ main: {
// [15] *main::ptr = main::$2 -- _deref_pbuc1=vbuaa
sta ptr
// call2(3,4)
// [16] call call2
// [16] call call2
// [34] phi from main::@1 to call2 [phi:main::@1->call2]
// [34] phi call2::param2#2 = 4 [phi:main::@1->call2#0] -- vbuaa=vbuc1
lda #4
@ -856,7 +856,7 @@ main: {
// [19] *main::ptr = main::$3 -- _deref_pbuc1=vbuaa
sta ptr
// call3(1,2)
// [20] call call3
// [20] call call3
// [38] phi from main::@2 to call3 [phi:main::@2->call3]
// [38] phi call3::param2#2 = 2 [phi:main::@2->call3#0] -- vbuaa=vbuc1
lda #2
@ -871,7 +871,7 @@ main: {
// [23] *main::ptr = main::$4 -- _deref_pbuc1=vbuaa
sta ptr
// call3(3,4)
// [24] call call3
// [24] call call3
// [38] phi from main::@3 to call3 [phi:main::@3->call3]
// [38] phi call3::param2#2 = 4 [phi:main::@3->call3#0] -- vbuaa=vbuc1
lda #4

4
src/test/ref/function-pointer-advanced-1.asm
View File

@ -212,7 +212,7 @@ exec: {
ldy.z i
lda INPUT,y
pha
jsr bi_collect
jsr icall1
pla
// out = (*collect)(out,INPUT[i])
pla
@ -225,7 +225,7 @@ exec: {
// for(char i=1;i<sizeof(INPUT);i++)
inc.z i
jmp __b1
bi_collect:
icall1:
jmp (collect)
}
// print(byte zp(6) i)

160
src/test/ref/function-pointer-advanced-1.log
View File

@ -13,7 +13,7 @@ Adding parameter assignment in __stackcall procedure min::b = param(min::b)
Adding parameter assignment in __stackcall procedure min::a = param(min::a)
Adding parameter assignment in __stackcall procedure xor::b = param(xor::b)
Adding parameter assignment in __stackcall procedure xor::a = param(xor::a)
Inlined call call __init
Inlined call call __init
Calling convention STACK_CALL adding prepare/execute/finalize for exec::$5 = call *exec::collect exec::out INPUT[exec::i]
Calling convention STACK_CALL replacing param(sum::a) with stackidx(byte,sum::OFFSET_STACK_A)
Calling convention STACK_CALL replacing param(sum::b) with stackidx(byte,sum::OFFSET_STACK_B)
@ -77,7 +77,7 @@ print: scope:[print] from exec::@3 main::@2
print::i#2 = phi( exec::@3/print::i#1, main::@2/print::i#0 )
print::$0 = print::i#2 >> 4
cout::c#0 = HEX[print::$0]
call cout
call cout
to:print::@1
print::@1: scope:[print] from print
print::i#3 = phi( print/print::i#2 )
@ -85,7 +85,7 @@ print::@1: scope:[print] from print
idx#4 = idx#30
print::$2 = print::i#3 & $f
cout::c#1 = HEX[print::$2]
call cout
call cout
to:print::@2
print::@2: scope:[print] from print::@1
idx#31 = phi( print::@1/idx#1 )
@ -113,14 +113,14 @@ main::@2: scope:[main] from main::@1
idx#54 = phi( main::@1/idx#59 )
main::i#3 = phi( main::@1/main::i#2 )
print::i#0 = INPUT[main::i#3]
call print
call print
to:main::@4
main::@4: scope:[main] from main::@2
main::i#5 = phi( main::@2/main::i#3 )
idx#33 = phi( main::@2/idx#6 )
idx#7 = idx#33
cout::c#2 = ' '
call cout
call cout
to:main::@5
main::@5: scope:[main] from main::@4
main::i#4 = phi( main::@4/main::i#5 )
@ -130,46 +130,46 @@ main::@5: scope:[main] from main::@4
to:main::@1
main::@3: scope:[main] from main::@1
idx#55 = phi( main::@1/idx#59 )
call ln
call ln
to:main::@6
main::@6: scope:[main] from main::@3
idx#35 = phi( main::@3/idx#3 )
idx#9 = idx#35
exec::collect#0 = &sum
call exec
call exec
to:main::@7
main::@7: scope:[main] from main::@6
idx#36 = phi( main::@6/idx#23 )
idx#10 = idx#36
call ln
call ln
to:main::@8
main::@8: scope:[main] from main::@7
idx#37 = phi( main::@7/idx#3 )
idx#11 = idx#37
exec::collect#1 = &min
call exec
call exec
to:main::@9
main::@9: scope:[main] from main::@8
idx#38 = phi( main::@8/idx#23 )
idx#12 = idx#38
call ln
call ln
to:main::@10
main::@10: scope:[main] from main::@9
idx#39 = phi( main::@9/idx#3 )
idx#13 = idx#39
exec::collect#2 = &max
call exec
call exec
to:main::@11
main::@11: scope:[main] from main::@10
idx#40 = phi( main::@10/idx#23 )
idx#14 = idx#40
call ln
call ln
to:main::@12
main::@12: scope:[main] from main::@11
idx#41 = phi( main::@11/idx#3 )
idx#15 = idx#41
exec::collect#3 = &xor
call exec
call exec
to:main::@13
main::@13: scope:[main] from main::@12
idx#42 = phi( main::@12/idx#23 )
@ -186,21 +186,21 @@ exec: scope:[exec] from main::@10 main::@12 main::@6 main::@8
exec::collect#12 = phi( main::@10/exec::collect#2, main::@12/exec::collect#3, main::@6/exec::collect#0, main::@8/exec::collect#1 )
idx#52 = phi( main::@10/idx#13, main::@12/idx#15, main::@6/idx#9, main::@8/idx#11 )
cout::c#3 = ' '
call cout
call cout
to:exec::@4
exec::@4: scope:[exec] from exec
exec::collect#10 = phi( exec/exec::collect#12 )
idx#44 = phi( exec/idx#1 )
idx#18 = idx#44
cout::c#4 = ' '
call cout
call cout
to:exec::@5
exec::@5: scope:[exec] from exec::@4
exec::collect#8 = phi( exec::@4/exec::collect#10 )
idx#45 = phi( exec::@4/idx#1 )
idx#19 = idx#45
cout::c#5 = ' '
call cout
call cout
to:exec::@6
exec::@6: scope:[exec] from exec::@5
exec::collect#6 = phi( exec::@5/exec::collect#8 )
@ -235,7 +235,7 @@ exec::@3: scope:[exec] from exec::@2
idx#56 = phi( exec::@2/idx#60 )
exec::out#1 = exec::$5
print::i#1 = exec::out#1
call print
call print
to:exec::@7
exec::@7: scope:[exec] from exec::@3
exec::collect#9 = phi( exec::@3/exec::collect#11 )
@ -244,7 +244,7 @@ exec::@7: scope:[exec] from exec::@3
idx#47 = phi( exec::@3/idx#6 )
idx#21 = idx#47
cout::c#6 = ' '
call cout
call cout
to:exec::@8
exec::@8: scope:[exec] from exec::@7
exec::collect#7 = phi( exec::@7/exec::collect#9 )
@ -327,7 +327,7 @@ __start::__init1: scope:[__start] from __start
to:__start::@1
__start::@1: scope:[__start] from __start::__init1
idx#58 = phi( __start::__init1/idx#24 )
call main
call main
to:__start::@2
__start::@2: scope:[__start] from __start::@1
idx#50 = phi( __start::@1/idx#17 )
@ -759,7 +759,7 @@ __start::__init1: scope:[__start] from __start
to:__start::@1
__start::@1: scope:[__start] from __start::__init1
[2] phi()
[3] call main
[3] call main
to:__start::@return
__start::@return: scope:[__start] from __start::@1
[4] return
@ -828,46 +828,46 @@ main::@1: scope:[main] from main main::@5
to:main::@3
main::@3: scope:[main] from main::@1
[32] phi()
[33] call ln
[33] call ln
to:main::@6
main::@6: scope:[main] from main::@3
[34] phi()
[35] call exec
[35] call exec
to:main::@7
main::@7: scope:[main] from main::@6
[36] phi()
[37] call ln
[37] call ln
to:main::@8
main::@8: scope:[main] from main::@7
[38] phi()
[39] call exec
[39] call exec
to:main::@9
main::@9: scope:[main] from main::@8
[40] phi()
[41] call ln
[41] call ln
to:main::@10
main::@10: scope:[main] from main::@9
[42] phi()
[43] call exec
[43] call exec
to:main::@11
main::@11: scope:[main] from main::@10
[44] phi()
[45] call ln
[45] call ln
to:main::@12
main::@12: scope:[main] from main::@11
[46] phi()
[47] call exec
[47] call exec
to:main::@return
main::@return: scope:[main] from main::@12
[48] return
to:@return
main::@2: scope:[main] from main::@1
[49] print::i#0 = INPUT[main::i#2]
[50] call print
[50] call print
to:main::@4
main::@4: scope:[main] from main::@2
[51] phi()
[52] call cout
[52] call cout
to:main::@5
main::@5: scope:[main] from main::@4
[53] main::i#1 = ++ main::i#2
@ -884,15 +884,15 @@ ln::@return: scope:[ln] from ln
void exec(byte(byte,byte)* exec::collect)
exec: scope:[exec] from main::@10 main::@12 main::@6 main::@8
[56] exec::collect#10 = phi( main::@10/&max, main::@12/&xor, main::@6/&sum, main::@8/&min )
[57] call cout
[57] call cout
to:exec::@4
exec::@4: scope:[exec] from exec
[58] phi()
[59] call cout
[59] call cout
to:exec::@5
exec::@5: scope:[exec] from exec::@4
[60] phi()
[61] call cout
[61] call cout
to:exec::@6
exec::@6: scope:[exec] from exec::@5
[62] exec::out#0 = *INPUT
@ -914,11 +914,11 @@ exec::@2: scope:[exec] from exec::@1
to:exec::@3
exec::@3: scope:[exec] from exec::@2
[71] print::i#1 = exec::out#1
[72] call print
[72] call print
to:exec::@7
exec::@7: scope:[exec] from exec::@3
[73] phi()
[74] call cout
[74] call cout
to:exec::@8
exec::@8: scope:[exec] from exec::@7
[75] exec::i#1 = ++ exec::i#2
@ -930,12 +930,12 @@ print: scope:[print] from exec::@3 main::@2
[76] print::i#2 = phi( exec::@3/print::i#1, main::@2/print::i#0 )
[77] print::$0 = print::i#2 >> 4
[78] cout::c#0 = HEX[print::$0]
[79] call cout
[79] call cout
to:print::@1
print::@1: scope:[print] from print
[80] print::$2 = print::i#2 & $f
[81] cout::c#1 = HEX[print::$2]
[82] call cout
[82] call cout
to:print::@return
print::@return: scope:[print] from print::@1
[83] return
@ -1255,7 +1255,7 @@ __start: {
jmp __b1
// __start::@1
__b1:
// [3] call main
// [3] call main
// [29] phi from __start::@1 to main [phi:__start::@1->main]
main_from___b1:
jsr main
@ -1409,14 +1409,14 @@ main: {
jmp __b3
// main::@3
__b3:
// [33] call ln
// [33] call ln
jsr ln
// [34] phi from main::@3 to main::@6 [phi:main::@3->main::@6]
__b6_from___b3:
jmp __b6
// main::@6
__b6:
// [35] call exec
// [35] call exec
// [56] phi from main::@6 to exec [phi:main::@6->exec]
exec_from___b6:
// [56] phi exec::collect#10 = &sum [phi:main::@6->exec#0] -- pprz1=pprc1
@ -1430,14 +1430,14 @@ main: {
jmp __b7
// main::@7
__b7:
// [37] call ln
// [37] call ln
jsr ln
// [38] phi from main::@7 to main::@8 [phi:main::@7->main::@8]
__b8_from___b7:
jmp __b8
// main::@8
__b8:
// [39] call exec
// [39] call exec
// [56] phi from main::@8 to exec [phi:main::@8->exec]
exec_from___b8:
// [56] phi exec::collect#10 = &min [phi:main::@8->exec#0] -- pprz1=pprc1
@ -1451,14 +1451,14 @@ main: {
jmp __b9
// main::@9
__b9:
// [41] call ln
// [41] call ln
jsr ln
// [42] phi from main::@9 to main::@10 [phi:main::@9->main::@10]
__b10_from___b9:
jmp __b10
// main::@10
__b10:
// [43] call exec
// [43] call exec
// [56] phi from main::@10 to exec [phi:main::@10->exec]
exec_from___b10:
// [56] phi exec::collect#10 = &max [phi:main::@10->exec#0] -- pprz1=pprc1
@ -1472,14 +1472,14 @@ main: {
jmp __b11
// main::@11
__b11:
// [45] call ln
// [45] call ln
jsr ln
// [46] phi from main::@11 to main::@12 [phi:main::@11->main::@12]
__b12_from___b11:
jmp __b12
// main::@12
__b12:
// [47] call exec
// [47] call exec
// [56] phi from main::@12 to exec [phi:main::@12->exec]
exec_from___b12:
// [56] phi exec::collect#10 = &xor [phi:main::@12->exec#0] -- pprz1=pprc1
@ -1499,7 +1499,7 @@ main: {
ldy.z i
lda INPUT,y
sta.z print.i
// [50] call print
// [50] call print
// [76] phi from main::@2 to print [phi:main::@2->print]
print_from___b2:
// [76] phi idx#53 = idx#54 [phi:main::@2->print#0] -- register_copy
@ -1510,7 +1510,7 @@ main: {
jmp __b4
// main::@4
__b4:
// [52] call cout
// [52] call cout
// [84] phi from main::@4 to cout [phi:main::@4->cout]
cout_from___b4:
// [84] phi idx#27 = idx#0 [phi:main::@4->cout#0] -- register_copy
@ -1550,7 +1550,7 @@ exec: {
.label out = 6
.label i = 5
.label collect = 3
// [57] call cout
// [57] call cout
// [84] phi from exec to cout [phi:exec->cout]
cout_from_exec:
// [84] phi idx#27 = 0 [phi:exec->cout#0] -- vbuz1=vbuc1
@ -1564,7 +1564,7 @@ exec: {
jmp __b4
// exec::@4
__b4:
// [59] call cout
// [59] call cout
// [84] phi from exec::@4 to cout [phi:exec::@4->cout]
cout_from___b4:
// [84] phi idx#27 = idx#0 [phi:exec::@4->cout#0] -- register_copy
@ -1576,7 +1576,7 @@ exec: {
jmp __b5
// exec::@5
__b5:
// [61] call cout
// [61] call cout
// [84] phi from exec::@5 to cout [phi:exec::@5->cout]
cout_from___b5:
// [84] phi idx#27 = idx#0 [phi:exec::@5->cout#0] -- register_copy
@ -1616,8 +1616,8 @@ exec: {
ldy.z i
lda INPUT,y
pha
// [68] callexecute *exec::collect#10
jsr bi_collect
// [68] callexecute *exec::collect#10 -- call__deref_pprz1
jsr icall1
// sideeffect stackpullbytes(1) -- _stackpullbyte_1
pla
// [70] exec::out#1 = stackpull(byte) -- vbuz1=_stackpullbyte_
@ -1627,7 +1627,7 @@ exec: {
// exec::@3
__b3:
// [71] print::i#1 = exec::out#1
// [72] call print
// [72] call print
// [76] phi from exec::@3 to print [phi:exec::@3->print]
print_from___b3:
// [76] phi idx#53 = idx#0 [phi:exec::@3->print#0] -- register_copy
@ -1638,7 +1638,7 @@ exec: {
jmp __b7
// exec::@7
__b7:
// [74] call cout
// [74] call cout
// [84] phi from exec::@7 to cout [phi:exec::@7->cout]
cout_from___b7:
// [84] phi idx#27 = idx#0 [phi:exec::@7->cout#0] -- register_copy
@ -1655,7 +1655,8 @@ exec: {
// [63] phi exec::out#2 = exec::out#1 [phi:exec::@8->exec::@1#0] -- register_copy
// [63] phi exec::i#2 = exec::i#1 [phi:exec::@8->exec::@1#1] -- register_copy
jmp __b1
bi_collect:
// Outside Flow
icall1:
jmp (collect)
}
// print
@ -1671,7 +1672,7 @@ print: {
// [78] cout::c#0 = HEX[print::$0] -- vbuxx=pbuc1_derefidx_vbuaa
tay
ldx HEX,y
// [79] call cout
// [79] call cout
// [84] phi from print to cout [phi:print->cout]
cout_from_print:
// [84] phi idx#27 = idx#53 [phi:print->cout#0] -- register_copy
@ -1686,7 +1687,7 @@ print: {
// [81] cout::c#1 = HEX[print::$2] -- vbuxx=pbuc1_derefidx_vbuaa
tay
ldx HEX,y
// [82] call cout
// [82] call cout
// [84] phi from print::@1 to cout [phi:print::@1->cout]
cout_from___b1:
// [84] phi idx#27 = idx#0 [phi:print::@1->cout#0] -- register_copy
@ -1963,7 +1964,7 @@ __start: {
sta.z line+1
// [2] phi from __start::__init1 to __start::@1 [phi:__start::__init1->__start::@1]
// __start::@1
// [3] call main
// [3] call main
// [29] phi from __start::@1 to main [phi:__start::@1->main]
jsr main
// __start::@return
@ -2112,12 +2113,12 @@ main: {
// [32] phi from main::@1 to main::@3 [phi:main::@1->main::@3]
// main::@3
// ln()
// [33] call ln
// [33] call ln
jsr ln
// [34] phi from main::@3 to main::@6 [phi:main::@3->main::@6]
// main::@6
// exec(&sum)
// [35] call exec
// [35] call exec
// [56] phi from main::@6 to exec [phi:main::@6->exec]
// [56] phi exec::collect#10 = &sum [phi:main::@6->exec#0] -- pprz1=pprc1
lda #<sum
@ -2128,12 +2129,12 @@ main: {
// [36] phi from main::@6 to main::@7 [phi:main::@6->main::@7]
// main::@7
// ln()
// [37] call ln
// [37] call ln
jsr ln
// [38] phi from main::@7 to main::@8 [phi:main::@7->main::@8]
// main::@8
// exec(&min)
// [39] call exec
// [39] call exec
// [56] phi from main::@8 to exec [phi:main::@8->exec]
// [56] phi exec::collect#10 = &min [phi:main::@8->exec#0] -- pprz1=pprc1
lda #<min
@ -2144,12 +2145,12 @@ main: {
// [40] phi from main::@8 to main::@9 [phi:main::@8->main::@9]
// main::@9
// ln()
// [41] call ln
// [41] call ln
jsr ln
// [42] phi from main::@9 to main::@10 [phi:main::@9->main::@10]
// main::@10
// exec(&max)
// [43] call exec
// [43] call exec
// [56] phi from main::@10 to exec [phi:main::@10->exec]
// [56] phi exec::collect#10 = &max [phi:main::@10->exec#0] -- pprz1=pprc1
lda #<max
@ -2160,12 +2161,12 @@ main: {
// [44] phi from main::@10 to main::@11 [phi:main::@10->main::@11]
// main::@11
// ln()
// [45] call ln
// [45] call ln
jsr ln
// [46] phi from main::@11 to main::@12 [phi:main::@11->main::@12]
// main::@12
// exec(&xor)
// [47] call exec
// [47] call exec
// [56] phi from main::@12 to exec [phi:main::@12->exec]
// [56] phi exec::collect#10 = &xor [phi:main::@12->exec#0] -- pprz1=pprc1
lda #<xor
@ -2184,7 +2185,7 @@ main: {
ldy.z i
lda INPUT,y
sta.z print.i
// [50] call print
// [50] call print
// [76] phi from main::@2 to print [phi:main::@2->print]
// [76] phi idx#53 = idx#54 [phi:main::@2->print#0] -- register_copy
// [76] phi print::i#2 = print::i#0 [phi:main::@2->print#1] -- register_copy
@ -2192,7 +2193,7 @@ main: {
// [51] phi from main::@2 to main::@4 [phi:main::@2->main::@4]
// main::@4
// cout(' ')
// [52] call cout
// [52] call cout
// [84] phi from main::@4 to cout [phi:main::@4->cout]
// [84] phi idx#27 = idx#0 [phi:main::@4->cout#0] -- register_copy
// [84] phi cout::c#7 = ' ' [phi:main::@4->cout#1] -- vbuxx=vbuc1
@ -2230,7 +2231,7 @@ exec: {
.label i = 5
.label collect = 3
// cout(' ')
// [57] call cout
// [57] call cout
// [84] phi from exec to cout [phi:exec->cout]
// [84] phi idx#27 = 0 [phi:exec->cout#0] -- vbuz1=vbuc1
lda #0
@ -2241,7 +2242,7 @@ exec: {
// [58] phi from exec to exec::@4 [phi:exec->exec::@4]
// exec::@4
// cout(' ')
// [59] call cout
// [59] call cout
// [84] phi from exec::@4 to cout [phi:exec::@4->cout]
// [84] phi idx#27 = idx#0 [phi:exec::@4->cout#0] -- register_copy
// [84] phi cout::c#7 = ' ' [phi:exec::@4->cout#1] -- vbuxx=vbuc1
@ -2250,7 +2251,7 @@ exec: {
// [60] phi from exec::@4 to exec::@5 [phi:exec::@4->exec::@5]
// exec::@5
// cout(' ')
// [61] call cout
// [61] call cout
// [84] phi from exec::@5 to cout [phi:exec::@5->cout]
// [84] phi idx#27 = idx#0 [phi:exec::@5->cout#0] -- register_copy
// [84] phi cout::c#7 = ' ' [phi:exec::@5->cout#1] -- vbuxx=vbuc1
@ -2287,8 +2288,8 @@ exec: {
ldy.z i
lda INPUT,y
pha
// [68] callexecute *exec::collect#10
jsr bi_collect
// [68] callexecute *exec::collect#10 -- call__deref_pprz1
jsr icall1
// sideeffect stackpullbytes(1) -- _stackpullbyte_1
pla
// out = (*collect)(out,INPUT[i])
@ -2298,7 +2299,7 @@ exec: {
// exec::@3
// print(out)
// [71] print::i#1 = exec::out#1
// [72] call print
// [72] call print
// [76] phi from exec::@3 to print [phi:exec::@3->print]
// [76] phi idx#53 = idx#0 [phi:exec::@3->print#0] -- register_copy
// [76] phi print::i#2 = print::i#1 [phi:exec::@3->print#1] -- register_copy
@ -2306,7 +2307,7 @@ exec: {
// [73] phi from exec::@3 to exec::@7 [phi:exec::@3->exec::@7]
// exec::@7
// cout(' ')
// [74] call cout
// [74] call cout
// [84] phi from exec::@7 to cout [phi:exec::@7->cout]
// [84] phi idx#27 = idx#0 [phi:exec::@7->cout#0] -- register_copy
// [84] phi cout::c#7 = ' ' [phi:exec::@7->cout#1] -- vbuxx=vbuc1
@ -2320,7 +2321,8 @@ exec: {
// [63] phi exec::out#2 = exec::out#1 [phi:exec::@8->exec::@1#0] -- register_copy
// [63] phi exec::i#2 = exec::i#1 [phi:exec::@8->exec::@1#1] -- register_copy
jmp __b1
bi_collect:
// Outside Flow
icall1:
jmp (collect)
}
// print
@ -2338,7 +2340,7 @@ print: {
// [78] cout::c#0 = HEX[print::$0] -- vbuxx=pbuc1_derefidx_vbuaa
tay
ldx HEX,y
// [79] call cout
// [79] call cout
// [84] phi from print to cout [phi:print->cout]
// [84] phi idx#27 = idx#53 [phi:print->cout#0] -- register_copy
// [84] phi cout::c#7 = cout::c#0 [phi:print->cout#1] -- register_copy
@ -2352,7 +2354,7 @@ print: {
// [81] cout::c#1 = HEX[print::$2] -- vbuxx=pbuc1_derefidx_vbuaa
tay
ldx HEX,y
// [82] call cout
// [82] call cout
// [84] phi from print::@1 to cout [phi:print::@1->cout]
// [84] phi idx#27 = idx#0 [phi:print::@1->cout#0] -- register_copy
// [84] phi cout::c#7 = cout::c#1 [phi:print::@1->cout#1] -- register_copy

4
src/test/ref/function-pointer-noarg-call-10.asm
View File

@ -88,7 +88,7 @@ do10: {
sta.z i
__b1:
// (*fn)()
jsr bi_fn
jsr icall1
// for( byte i: 0..9)
inc.z i
lda #$a
@ -96,6 +96,6 @@ do10: {
bne __b1
// }
rts
bi_fn:
icall1:
jmp (fn)
}

76
src/test/ref/function-pointer-noarg-call-10.log
View File

@ -1,4 +1,4 @@
Inlined call call __init
Inlined call call __init
Calling convention STACK_CALL adding prepare/execute/finalize for call *do10::fn
CONTROL FLOW GRAPH SSA
@ -27,7 +27,7 @@ do10::@return: scope:[do10] from do10::@2
void hello()
hello: scope:[hello] from
print::msg#0 = hello::msg
call print
call print
to:hello::@1
hello::@1: scope:[hello] from hello
to:hello::@return
@ -38,7 +38,7 @@ hello::@return: scope:[hello] from hello::@1
void world()
world: scope:[world] from
print::msg#1 = world::msg
call print
call print
to:world::@1
world::@1: scope:[world] from world
to:world::@return
@ -49,11 +49,11 @@ world::@return: scope:[world] from world::@1
void main()
main: scope:[main] from __start::@1
do10::fn#0 = &hello
call do10
call do10
to:main::@1
main::@1: scope:[main] from main
do10::fn#1 = &world
call do10
call do10
to:main::@2
main::@2: scope:[main] from main::@1
to:main::@return
@ -86,7 +86,7 @@ __start::__init1: scope:[__start] from __start
idx = 0
to:__start::@1
__start::@1: scope:[__start] from __start::__init1
call main
call main
to:__start::@2
__start::@2: scope:[__start] from __start::@1
to:__start::@return
@ -219,7 +219,7 @@ __start::__init1: scope:[__start] from __start
to:__start::@1
__start::@1: scope:[__start] from __start::__init1
[2] phi()
[3] call main
[3] call main
to:__start::@return
__start::@return: scope:[__start] from __start::@1
[4] return
@ -228,7 +228,7 @@ __start::@return: scope:[__start] from __start::@1
void world()
world: scope:[world] from
[5] phi()
[6] call print
[6] call print
to:world::@return
world::@return: scope:[world] from world
[7] return
@ -237,7 +237,7 @@ world::@return: scope:[world] from world
void hello()
hello: scope:[hello] from
[8] phi()
[9] call print
[9] call print
to:hello::@return
hello::@return: scope:[hello] from hello
[10] return
@ -246,11 +246,11 @@ hello::@return: scope:[hello] from hello
void main()
main: scope:[main] from __start::@1
[11] phi()
[12] call do10
[12] call do10
to:main::@1
main::@1: scope:[main] from main
[13] phi()
[14] call do10
[14] call do10
to:main::@return
main::@return: scope:[main] from main::@1
[15] return
@ -355,17 +355,17 @@ Uplift Scope [world]
Uplift Scope [main]
Uplift Scope [__start]
Uplifting [do10] best 1054 combination zp[1]:7 [ do10::i#2 do10::i#1 ] zp[2]:5 [ do10::fn#3 ]
Uplifting [print] best 934 combination reg byte y [ print::i#2 print::i#1 ] zp[2]:2 [ print::msg#3 ]
Uplifting [] best 934 combination zp[1]:8 [ idx ]
Uplifting [hello] best 934 combination
Uplifting [world] best 934 combination
Uplifting [main] best 934 combination
Uplifting [__start] best 934 combination
Uplifting [do10] best 1099 combination zp[1]:7 [ do10::i#2 do10::i#1 ] zp[2]:5 [ do10::fn#3 ]
Uplifting [print] best 979 combination reg byte y [ print::i#2 print::i#1 ] zp[2]:2 [ print::msg#3 ]
Uplifting [] best 979 combination zp[1]:8 [ idx ]
Uplifting [hello] best 979 combination
Uplifting [world] best 979 combination
Uplifting [main] best 979 combination
Uplifting [__start] best 979 combination
Attempting to uplift remaining variables inzp[1]:7 [ do10::i#2 do10::i#1 ]
Uplifting [do10] best 934 combination zp[1]:7 [ do10::i#2 do10::i#1 ]
Uplifting [do10] best 979 combination zp[1]:7 [ do10::i#2 do10::i#1 ]
Attempting to uplift remaining variables inzp[1]:8 [ idx ]
Uplifting [] best 934 combination zp[1]:8 [ idx ]
Uplifting [] best 979 combination zp[1]:8 [ idx ]
Allocated (was zp[2]:5) zp[2]:4 [ do10::fn#3 ]
Allocated (was zp[1]:7) zp[1]:6 [ do10::i#2 do10::i#1 ]
Allocated (was zp[1]:8) zp[1]:7 [ idx ]
@ -399,7 +399,7 @@ __start: {
jmp __b1
// __start::@1
__b1:
// [3] call main
// [3] call main
// [11] phi from __start::@1 to main [phi:__start::@1->main]
main_from___b1:
jsr main
@ -411,7 +411,7 @@ __start: {
}
// world
world: {
// [6] call print
// [6] call print
// [16] phi from world to print [phi:world->print]
print_from_world:
// [16] phi print::msg#3 = world::msg [phi:world->print#0] -- pbuz1=pbuc1
@ -432,7 +432,7 @@ world: {
.segment Code
// hello
hello: {
// [9] call print
// [9] call print
// [16] phi from hello to print [phi:hello->print]
print_from_hello:
// [16] phi print::msg#3 = hello::msg [phi:hello->print#0] -- pbuz1=pbuc1
@ -453,7 +453,7 @@ hello: {
.segment Code
// main
main: {
// [12] call do10
// [12] call do10
// [23] phi from main to do10 [phi:main->do10]
do10_from_main:
// [23] phi do10::fn#3 = &hello [phi:main->do10#0] -- pprz1=pprc1
@ -467,7 +467,7 @@ main: {
jmp __b1
// main::@1
__b1:
// [14] call do10
// [14] call do10
// [23] phi from main::@1 to do10 [phi:main::@1->do10]
do10_from___b1:
// [23] phi do10::fn#3 = &world [phi:main::@1->do10#0] -- pprz1=pprc1
@ -532,8 +532,8 @@ do10: {
jmp __b1
// do10::@1
__b1:
// [25] callexecute *do10::fn#3
jsr bi_fn
// [25] callexecute *do10::fn#3 -- call__deref_pprz1
jsr icall1
jmp __b2
// do10::@2
__b2:
@ -548,7 +548,8 @@ do10: {
__breturn:
// [28] return
rts
bi_fn:
// Outside Flow
icall1:
jmp (fn)
}
// File Data
@ -626,7 +627,7 @@ zp[1]:7 [ idx ]
FINAL ASSEMBLER
Score: 676
Score: 721
// File Comments
// Tests calling into different function pointers which call a common sub-method
@ -652,7 +653,7 @@ __start: {
sta.z idx
// [2] phi from __start::__init1 to __start::@1 [phi:__start::__init1->__start::@1]
// __start::@1
// [3] call main
// [3] call main
// [11] phi from __start::@1 to main [phi:__start::@1->main]
jsr main
// __start::@return
@ -662,7 +663,7 @@ __start: {
// world
world: {
// print("world ")
// [6] call print
// [6] call print
// [16] phi from world to print [phi:world->print]
// [16] phi print::msg#3 = world::msg [phi:world->print#0] -- pbuz1=pbuc1
lda #<msg
@ -682,7 +683,7 @@ world: {
// hello
hello: {
// print("hello ")
// [9] call print
// [9] call print
// [16] phi from hello to print [phi:hello->print]
// [16] phi print::msg#3 = hello::msg [phi:hello->print#0] -- pbuz1=pbuc1
lda #<msg
@ -702,7 +703,7 @@ hello: {
// main
main: {
// do10(&hello)
// [12] call do10
// [12] call do10
// [23] phi from main to do10 [phi:main->do10]
// [23] phi do10::fn#3 = &hello [phi:main->do10#0] -- pprz1=pprc1
lda #<hello
@ -713,7 +714,7 @@ main: {
// [13] phi from main to main::@1 [phi:main->main::@1]
// main::@1
// do10(&world)
// [14] call do10
// [14] call do10
// [23] phi from main::@1 to do10 [phi:main::@1->do10]
// [23] phi do10::fn#3 = &world [phi:main::@1->do10#0] -- pprz1=pprc1
lda #<world
@ -771,8 +772,8 @@ do10: {
// do10::@1
__b1:
// (*fn)()
// [25] callexecute *do10::fn#3
jsr bi_fn
// [25] callexecute *do10::fn#3 -- call__deref_pprz1
jsr icall1
// do10::@2
// for( byte i: 0..9)
// [26] do10::i#1 = ++ do10::i#2 -- vbuz1=_inc_vbuz1
@ -785,7 +786,8 @@ do10: {
// }
// [28] return
rts
bi_fn:
// Outside Flow
icall1:
jmp (fn)
}
// File Data

12
src/test/ref/function-pointer-noarg-call-11.log
View File

@ -1,4 +1,4 @@
Inlined call call __init
Inlined call call __init
Calling convention STACK_CALL adding prepare/execute/finalize for call *funcPointer
Calling convention STACK_CALL adding prepare/execute/finalize for call *funcPointer
@ -43,7 +43,7 @@ __start::__init1: scope:[__start] from __start
to:__start::@1
__start::@1: scope:[__start] from __start::__init1
funcPointer#9 = phi( __start::__init1/funcPointer#3 )
call main
call main
to:__start::@2
__start::@2: scope:[__start] from __start::@1
funcPointer#7 = phi( __start::@1/funcPointer#2 )
@ -180,14 +180,14 @@ ASSEMBLER BEFORE OPTIMIZATION
.segment Code
// main
main: {
// [1] callexecute myFunc -- jsr
// [1] callexecute myFunc -- call_vprc1
jsr myFunc
// [2] phi from main to main::@1 [phi:main->main::@1]
__b1_from_main:
jmp __b1
// main::@1
__b1:
// [3] callexecute myFunc2 -- jsr
// [3] callexecute myFunc2 -- call_vprc1
jsr myFunc2
jmp __breturn
// main::@return
@ -262,12 +262,12 @@ Score: 42
// main
main: {
// (*funcPointer)()
// [1] callexecute myFunc -- jsr
// [1] callexecute myFunc -- call_vprc1
jsr myFunc
// [2] phi from main to main::@1 [phi:main->main::@1]
// main::@1
// (*funcPointer)()
// [3] callexecute myFunc2 -- jsr
// [3] callexecute myFunc2 -- call_vprc1
jsr myFunc2
// main::@return
// }

8
src/test/ref/function-pointer-noarg-call-12.asm
View File

@ -28,19 +28,19 @@ main: {
lda addrtable+1
sta.z fn+1
// (*fn)()
jsr bi_fn
jsr icall1
// fn = addrtable[1]
lda addrtable+1*SIZEOF_POINTER
sta.z fn_1
lda addrtable+1*SIZEOF_POINTER+1
sta.z fn_1+1
// (*fn)()
jsr bi_fn_1
jsr icall2
// }
rts
bi_fn:
icall1:
jmp (fn)
bi_fn_1:
icall2:
jmp (fn_1)
}
myFunc2: {

38
src/test/ref/function-pointer-noarg-call-12.log
View File

@ -40,7 +40,7 @@ main::@return: scope:[main] from main::@1
void __start()
__start: scope:[__start] from
call main
call main
to:__start::@1
__start::@1: scope:[__start] from __start
to:__start::@return
@ -195,10 +195,10 @@ Uplift Scope [myFunc]
Uplift Scope [myFunc2]
Uplift Scope []
Uplifting [main] best 116 combination zp[2]:2 [ main::fn#0 ] zp[2]:4 [ main::fn#1 ]
Uplifting [myFunc] best 116 combination
Uplifting [myFunc2] best 116 combination
Uplifting [] best 116 combination
Uplifting [main] best 206 combination zp[2]:2 [ main::fn#0 ] zp[2]:4 [ main::fn#1 ]
Uplifting [myFunc] best 206 combination
Uplifting [myFunc2] best 206 combination
Uplifting [] best 206 combination
ASSEMBLER BEFORE OPTIMIZATION
// File Comments
@ -234,8 +234,8 @@ main: {
sta.z fn
lda addrtable+1
sta.z fn+1
// [3] callexecute *main::fn#0
jsr bi_fn
// [3] callexecute *main::fn#0 -- call__deref_pprz1
jsr icall1
jmp __b1
// main::@1
__b1:
@ -244,16 +244,17 @@ main: {
sta.z fn_1
lda addrtable+1*SIZEOF_POINTER+1
sta.z fn_1+1
// [5] callexecute *main::fn#1
jsr bi_fn_1
// [5] callexecute *main::fn#1 -- call__deref_pprz1
jsr icall2
jmp __breturn
// main::@return
__breturn:
// [6] return
rts
bi_fn:
// Outside Flow
icall1:
jmp (fn)
bi_fn_1:
icall2:
jmp (fn_1)
}
// myFunc2
@ -311,7 +312,7 @@ zp[2]:4 [ main::fn#1 ]
FINAL ASSEMBLER
Score: 104
Score: 194
// File Comments
// Tests calling through pointers to non-args no-return functions
@ -350,8 +351,8 @@ main: {
lda addrtable+1
sta.z fn+1
// (*fn)()
// [3] callexecute *main::fn#0
jsr bi_fn
// [3] callexecute *main::fn#0 -- call__deref_pprz1
jsr icall1
// main::@1
// fn = addrtable[1]
// [4] main::fn#1 = *(addrtable+1*SIZEOF_POINTER) -- pprz1=_deref_qprc1
@ -360,15 +361,16 @@ main: {
lda addrtable+1*SIZEOF_POINTER+1
sta.z fn_1+1
// (*fn)()
// [5] callexecute *main::fn#1
jsr bi_fn_1
// [5] callexecute *main::fn#1 -- call__deref_pprz1
jsr icall2
// main::@return
// }
// [6] return
rts
bi_fn:
// Outside Flow
icall1:
jmp (fn)
bi_fn_1:
icall2:
jmp (fn_1)
}
// myFunc2

4
src/test/ref/function-pointer-noarg-call-14.asm
View File

@ -203,10 +203,10 @@ gotoxy: {
f1: {
.label fn = 4
// (*fn)()
jsr bi_fn
jsr icall1
// }
rts
bi_fn:
icall1:
jmp (fn)
}
// Output one character at the current cursor position

186
src/test/ref/function-pointer-noarg-call-14.log
View File

@ -4,7 +4,7 @@ Fixing struct type size struct printf_buffer_number to 12
Fixing struct type SIZE_OF struct printf_buffer_number to 12
Fixing struct type SIZE_OF struct printf_buffer_number to 12
Inlined call vicSelectGfxBank::$0 = call toDd00(vicSelectGfxBank::gfx)
Inlined call call __init
Inlined call call __init
Eliminating unused variable with no statement memcpy::$0
Eliminating unused variable with no statement memset::$2
Eliminating unused variable with no statement gotoxy::$4
@ -142,7 +142,7 @@ cputc: scope:[cputc] from cputs::@2
if(cputc::$0) goto cputc::@1
to:cputc::@2
cputc::@1: scope:[cputc] from cputc
call cputln
call cputln
to:cputc::@4
cputc::@4: scope:[cputc] from cputc::@1
to:cputc::@return
@ -156,7 +156,7 @@ cputc::@2: scope:[cputc] from cputc
if(cputc::$2) goto cputc::@return
to:cputc::@3
cputc::@3: scope:[cputc] from cputc::@2
call cputln
call cputln
to:cputc::@5
cputc::@5: scope:[cputc] from cputc::@3
to:cputc::@return
@ -170,7 +170,7 @@ cputln: scope:[cputln] from cputc::@1 cputc::@3
conio_line_color = conio_line_color + $28
conio_cursor_x = 0
conio_cursor_y = ++ conio_cursor_y
call cscroll
call cscroll
to:cputln::@1
cputln::@1: scope:[cputln] from cputln
to:cputln::@return
@ -195,7 +195,7 @@ cputs::@2: scope:[cputs] from cputs::@1
cputs::s#6 = phi( cputs::@1/cputs::s#0 )
cputs::c#2 = phi( cputs::@1/cputs::c#1 )
cputc::c#0 = cputs::c#2
call cputc
call cputc
to:cputs::@3
cputs::@3: scope:[cputs] from cputs::@2
cputs::s#5 = phi( cputs::@2/cputs::s#6 )
@ -218,28 +218,28 @@ cscroll::@3: scope:[cscroll] from cscroll::@1
memcpy::destination#0 = (void*)CONIO_SCREEN_TEXT
memcpy::source#0 = (void*)CONIO_SCREEN_TEXT+$28
memcpy::num#0 = $19*$28-$28
call memcpy
call memcpy
memcpy::return#2 = memcpy::return#1
to:cscroll::@4
cscroll::@4: scope:[cscroll] from cscroll::@3
memcpy::destination#1 = (void*)CONIO_SCREEN_COLORS
memcpy::source#1 = (void*)CONIO_SCREEN_COLORS+$28
memcpy::num#1 = $19*$28-$28
call memcpy
call memcpy
memcpy::return#3 = memcpy::return#1
to:cscroll::@5
cscroll::@5: scope:[cscroll] from cscroll::@4
memset::str#0 = (void*)CONIO_SCREEN_TEXT+$19*$28-$28
memset::c#0 = ' '
memset::num#0 = $28
call memset
call memset
memset::return#2 = memset::return#1
to:cscroll::@6
cscroll::@6: scope:[cscroll] from cscroll::@5
memset::str#1 = (void*)CONIO_SCREEN_COLORS+$19*$28-$28
memset::c#1 = conio_textcolor
memset::num#1 = $28
call memset
call memset
memset::return#3 = memset::return#1
to:cscroll::@7
cscroll::@7: scope:[cscroll] from cscroll::@6
@ -250,7 +250,7 @@ cscroll::@7: scope:[cscroll] from cscroll::@6
cscroll::@2: scope:[cscroll] from cscroll::@1
gotoxy::x#1 = 0
gotoxy::y#1 = 0
call gotoxy
call gotoxy
to:cscroll::@8
cscroll::@8: scope:[cscroll] from cscroll::@2
to:cscroll::@return
@ -269,7 +269,7 @@ conio_c64_init::@1: scope:[conio_c64_init] from conio_c64_init conio_c64_init::
conio_c64_init::line#2 = phi( conio_c64_init/conio_c64_init::line#0, conio_c64_init::@2/conio_c64_init::line#1 )
gotoxy::x#2 = 0
gotoxy::y#2 = conio_c64_init::line#2
call gotoxy
call gotoxy
to:conio_c64_init::@3
conio_c64_init::@3: scope:[conio_c64_init] from conio_c64_init::@1
to:conio_c64_init::@return
@ -292,7 +292,7 @@ f1::@return: scope:[f1] from f1
void hello()
hello: scope:[hello] from
cputs::s#1 = hello::s
call cputs
call cputs
to:hello::@1
hello::@1: scope:[hello] from hello
to:hello::@return
@ -303,7 +303,7 @@ hello::@return: scope:[hello] from hello::@1
void world()
world: scope:[world] from
cputs::s#2 = world::s
call cputs
call cputs
to:world::@1
world::@1: scope:[world] from world
to:world::@return
@ -314,11 +314,11 @@ world::@return: scope:[world] from world::@1
void main()
main: scope:[main] from __start::@1
f1::fn#0 = &hello
call f1
call f1
to:main::@1
main::@1: scope:[main] from main
f1::fn#1 = &world
call f1
call f1
to:main::@2
main::@2: scope:[main] from main::@1
to:main::@return
@ -336,12 +336,12 @@ __start::__init1: scope:[__start] from __start
conio_line_color = CONIO_SCREEN_COLORS
conio_textcolor = CONIO_TEXTCOLOR_DEFAULT
conio_scroll_enable = 1
call conio_c64_init
call conio_c64_init
to:__start::@2
__start::@2: scope:[__start] from __start::__init1
to:__start::@1
__start::@1: scope:[__start] from __start::@2
call main
call main
to:__start::@3
__start::@3: scope:[__start] from __start::@1
to:__start::@return
@ -932,11 +932,11 @@ __start::__init1: scope:[__start] from __start
[2] conio_cursor_y = 0
[3] conio_line_text = DEFAULT_SCREEN
[4] conio_line_color = COLORRAM
[5] call conio_c64_init
[5] call conio_c64_init
to:__start::@1
__start::@1: scope:[__start] from __start::__init1
[6] phi()
[7] call main
[7] call main
to:__start::@return
__start::@return: scope:[__start] from __start::@1
[8] return
@ -945,7 +945,7 @@ __start::@return: scope:[__start] from __start::@1
void world()
world: scope:[world] from
[9] phi()
[10] call cputs
[10] call cputs
to:world::@return
world::@return: scope:[world] from world
[11] return
@ -954,7 +954,7 @@ world::@return: scope:[world] from world
void hello()
hello: scope:[hello] from
[12] phi()
[13] call cputs
[13] call cputs
to:hello::@return
hello::@return: scope:[hello] from hello
[14] return
@ -971,7 +971,7 @@ conio_c64_init::@2: scope:[conio_c64_init] from conio_c64_init
conio_c64_init::@1: scope:[conio_c64_init] from conio_c64_init conio_c64_init::@2
[18] conio_c64_init::line#2 = phi( conio_c64_init::@2/conio_c64_init::line#0, conio_c64_init/$19-1 )
[19] gotoxy::y#2 = conio_c64_init::line#2
[20] call gotoxy
[20] call gotoxy
to:conio_c64_init::@return
conio_c64_init::@return: scope:[conio_c64_init] from conio_c64_init::@1
[21] return
@ -980,11 +980,11 @@ conio_c64_init::@return: scope:[conio_c64_init] from conio_c64_init::@1
void main()
main: scope:[main] from __start::@1
[22] phi()
[23] call f1
[23] call f1
to:main::@1
main::@1: scope:[main] from main
[24] phi()
[25] call f1
[25] call f1
to:main::@return
main::@return: scope:[main] from main::@1
[26] return
@ -1005,7 +1005,7 @@ cputs::@return: scope:[cputs] from cputs::@1
to:@return
cputs::@2: scope:[cputs] from cputs::@1
[33] cputc::c#0 = cputs::c#1
[34] call cputc
[34] call cputc
to:cputs::@1
void gotoxy(byte gotoxy::x , byte gotoxy::y)
@ -1056,14 +1056,14 @@ cputc::@2: scope:[cputc] from cputc
to:cputc::@3
cputc::@3: scope:[cputc] from cputc::@2
[57] phi()
[58] call cputln
[58] call cputln
to:cputc::@return
cputc::@return: scope:[cputc] from cputc::@1 cputc::@2 cputc::@3
[59] return
to:@return
cputc::@1: scope:[cputc] from cputc
[60] phi()
[61] call cputln
[61] call cputln
to:cputc::@return
void cputln()
@ -1072,7 +1072,7 @@ cputln: scope:[cputln] from cputc::@1 cputc::@3
[63] conio_line_color = conio_line_color + $28
[64] conio_cursor_x = 0
[65] conio_cursor_y = ++ conio_cursor_y
[66] call cscroll
[66] call cscroll
to:cputln::@return
cputln::@return: scope:[cputln] from cputln
[67] return
@ -1084,19 +1084,19 @@ cscroll: scope:[cscroll] from cputln
to:cscroll::@1
cscroll::@1: scope:[cscroll] from cscroll
[69] phi()
[70] call memcpy
[70] call memcpy
to:cscroll::@2
cscroll::@2: scope:[cscroll] from cscroll::@1
[71] phi()
[72] call memcpy
[72] call memcpy
to:cscroll::@3
cscroll::@3: scope:[cscroll] from cscroll::@2
[73] phi()
[74] call memset
[74] call memset
to:cscroll::@4
cscroll::@4: scope:[cscroll] from cscroll::@3
[75] phi()
[76] call memset
[76] call memset
to:cscroll::@5
cscroll::@5: scope:[cscroll] from cscroll::@4
[77] conio_line_text = conio_line_text - $28
@ -1418,31 +1418,31 @@ Uplift Scope [world]
Uplift Scope [main]
Uplift Scope [__start]
Uplifting [memcpy] best 12986 combination zp[2]:12 [ memcpy::src#2 memcpy::src#4 memcpy::src#1 ] zp[2]:14 [ memcpy::dst#2 memcpy::dst#4 memcpy::dst#1 ] zp[2]:41 [ memcpy::src_end#0 ] zp[2]:8 [ memcpy::source#2 ] zp[2]:10 [ memcpy::destination#2 ]
Uplifting [memset] best 12880 combination zp[2]:19 [ memset::dst#2 memset::dst#4 memset::dst#1 ] zp[2]:43 [ memset::end#0 ] reg byte x [ memset::c#4 ] zp[2]:16 [ memset::str#3 ]
Uplifting [] best 12880 combination zp[1]:22 [ conio_cursor_y ] zp[2]:23 [ conio_line_text ] zp[2]:25 [ conio_line_color ] zp[1]:21 [ conio_cursor_x ]
Uplifting [gotoxy] best 12867 combination zp[2]:31 [ gotoxy::$8 ] zp[2]:33 [ gotoxy::$9 ] zp[2]:37 [ gotoxy::$5 ] zp[2]:39 [ gotoxy::$6 ] zp[2]:29 [ gotoxy::$7 ] reg byte x [ gotoxy::y#4 gotoxy::y#2 ] zp[2]:35 [ gotoxy::line_offset#0 ]
Uplifting [cputc] best 12831 combination reg byte a [ cputc::c#0 ]
Uplifting [cputs] best 12761 combination zp[2]:3 [ cputs::s#3 cputs::s#4 cputs::s#0 ] reg byte a [ cputs::c#1 ]
Uplifting [conio_c64_init] best 12749 combination reg byte x [ conio_c64_init::line#2 conio_c64_init::line#0 ]
Uplifting [RADIX] best 12749 combination
Uplifting [cputln] best 12749 combination
Uplifting [MOS6526_CIA] best 12749 combination
Uplifting [MOS6569_VICII] best 12749 combination
Uplifting [MOS6581_SID] best 12749 combination
Uplifting [cscroll] best 12749 combination
Uplifting [printf_format_number] best 12749 combination
Uplifting [printf_buffer_number] best 12749 combination
Uplifting [printf_format_string] best 12749 combination
Uplifting [f1] best 12749 combination zp[2]:6 [ f1::fn#2 ]
Uplifting [hello] best 12749 combination
Uplifting [world] best 12749 combination
Uplifting [main] best 12749 combination
Uplifting [__start] best 12749 combination
Uplifting [memcpy] best 13031 combination zp[2]:12 [ memcpy::src#2 memcpy::src#4 memcpy::src#1 ] zp[2]:14 [ memcpy::dst#2 memcpy::dst#4 memcpy::dst#1 ] zp[2]:41 [ memcpy::src_end#0 ] zp[2]:8 [ memcpy::source#2 ] zp[2]:10 [ memcpy::destination#2 ]
Uplifting [memset] best 12925 combination zp[2]:19 [ memset::dst#2 memset::dst#4 memset::dst#1 ] zp[2]:43 [ memset::end#0 ] reg byte x [ memset::c#4 ] zp[2]:16 [ memset::str#3 ]
Uplifting [] best 12925 combination zp[1]:22 [ conio_cursor_y ] zp[2]:23 [ conio_line_text ] zp[2]:25 [ conio_line_color ] zp[1]:21 [ conio_cursor_x ]
Uplifting [gotoxy] best 12912 combination zp[2]:31 [ gotoxy::$8 ] zp[2]:33 [ gotoxy::$9 ] zp[2]:37 [ gotoxy::$5 ] zp[2]:39 [ gotoxy::$6 ] zp[2]:29 [ gotoxy::$7 ] reg byte x [ gotoxy::y#4 gotoxy::y#2 ] zp[2]:35 [ gotoxy::line_offset#0 ]
Uplifting [cputc] best 12876 combination reg byte a [ cputc::c#0 ]
Uplifting [cputs] best 12806 combination zp[2]:3 [ cputs::s#3 cputs::s#4 cputs::s#0 ] reg byte a [ cputs::c#1 ]
Uplifting [conio_c64_init] best 12794 combination reg byte x [ conio_c64_init::line#2 conio_c64_init::line#0 ]
Uplifting [RADIX] best 12794 combination
Uplifting [cputln] best 12794 combination
Uplifting [MOS6526_CIA] best 12794 combination
Uplifting [MOS6569_VICII] best 12794 combination
Uplifting [MOS6581_SID] best 12794 combination
Uplifting [cscroll] best 12794 combination
Uplifting [printf_format_number] best 12794 combination
Uplifting [printf_buffer_number] best 12794 combination
Uplifting [printf_format_string] best 12794 combination
Uplifting [f1] best 12794 combination zp[2]:6 [ f1::fn#2 ]
Uplifting [hello] best 12794 combination
Uplifting [world] best 12794 combination
Uplifting [main] best 12794 combination
Uplifting [__start] best 12794 combination
Attempting to uplift remaining variables inzp[1]:22 [ conio_cursor_y ]
Uplifting [] best 12749 combination zp[1]:22 [ conio_cursor_y ]
Uplifting [] best 12794 combination zp[1]:22 [ conio_cursor_y ]
Attempting to uplift remaining variables inzp[1]:21 [ conio_cursor_x ]
Uplifting [] best 12749 combination zp[1]:21 [ conio_cursor_x ]
Uplifting [] best 12794 combination zp[1]:21 [ conio_cursor_x ]
Coalescing zero page register [ zp[2]:8 [ memcpy::source#2 ] ] with [ zp[2]:12 [ memcpy::src#2 memcpy::src#4 memcpy::src#1 ] ] - score: 1
Coalescing zero page register [ zp[2]:10 [ memcpy::destination#2 ] ] with [ zp[2]:14 [ memcpy::dst#2 memcpy::dst#4 memcpy::dst#1 ] ] - score: 1
Coalescing zero page register [ zp[2]:16 [ memset::str#3 ] ] with [ zp[2]:19 [ memset::dst#2 memset::dst#4 memset::dst#1 ] ] - score: 1
@ -1513,14 +1513,14 @@ __start: {
sta.z conio_line_color
lda #>COLORRAM
sta.z conio_line_color+1
// [5] call conio_c64_init
// [5] call conio_c64_init
jsr conio_c64_init
// [6] phi from __start::__init1 to __start::@1 [phi:__start::__init1->__start::@1]
__b1_from___init1:
jmp __b1
// __start::@1
__b1:
// [7] call main
// [7] call main
// [22] phi from __start::@1 to main [phi:__start::@1->main]
main_from___b1:
jsr main
@ -1532,7 +1532,7 @@ __start: {
}
// world
world: {
// [10] call cputs
// [10] call cputs
// [27] phi from world to cputs [phi:world->cputs]
cputs_from_world:
// [27] phi cputs::s#4 = world::s [phi:world->cputs#0] -- pbuz1=pbuc1
@ -1553,7 +1553,7 @@ world: {
.segment Code
// hello
hello: {
// [13] call cputs
// [13] call cputs
// [27] phi from hello to cputs [phi:hello->cputs]
cputs_from_hello:
// [27] phi cputs::s#4 = hello::s [phi:hello->cputs#0] -- pbuz1=pbuc1
@ -1599,7 +1599,7 @@ conio_c64_init: {
// conio_c64_init::@1
__b1:
// [19] gotoxy::y#2 = conio_c64_init::line#2
// [20] call gotoxy
// [20] call gotoxy
jsr gotoxy
jmp __breturn
// conio_c64_init::@return
@ -1609,7 +1609,7 @@ conio_c64_init: {
}
// main
main: {
// [23] call f1
// [23] call f1
// [49] phi from main to f1 [phi:main->f1]
f1_from_main:
// [49] phi f1::fn#2 = &hello [phi:main->f1#0] -- pprz1=pprc1
@ -1623,7 +1623,7 @@ main: {
jmp __b1
// main::@1
__b1:
// [25] call f1
// [25] call f1
// [49] phi from main::@1 to f1 [phi:main::@1->f1]
f1_from___b1:
// [49] phi f1::fn#2 = &world [phi:main::@1->f1#0] -- pprz1=pprc1
@ -1669,7 +1669,7 @@ cputs: {
// cputs::@2
__b2:
// [33] cputc::c#0 = cputs::c#1
// [34] call cputc
// [34] call cputc
jsr cputc
jmp __b1_from___b2
}
@ -1776,14 +1776,15 @@ gotoxy: {
// f1(void()* zp(4) fn)
f1: {
.label fn = 4
// [50] callexecute *f1::fn#2
jsr bi_fn
// [50] callexecute *f1::fn#2 -- call__deref_pprz1
jsr icall1
jmp __breturn
// f1::@return
__breturn:
// [51] return
rts
bi_fn:
// Outside Flow
icall1:
jmp (fn)
}
// cputc
@ -1815,7 +1816,7 @@ cputc: {
jmp __b3
// cputc::@3
__b3:
// [58] call cputln
// [58] call cputln
jsr cputln
jmp __breturn
// cputc::@return
@ -1827,7 +1828,7 @@ cputc: {
jmp __b1
// cputc::@1
__b1:
// [61] call cputln
// [61] call cputln
jsr cputln
jmp __breturn
}
@ -1855,7 +1856,7 @@ cputln: {
sta.z conio_cursor_x
// [65] conio_cursor_y = ++ conio_cursor_y -- vbuz1=_inc_vbuz1
inc.z conio_cursor_y
// [66] call cscroll
// [66] call cscroll
jsr cscroll
jmp __breturn
// cputln::@return
@ -1875,7 +1876,7 @@ cscroll: {
jmp __b1
// cscroll::@1
__b1:
// [70] call memcpy
// [70] call memcpy
// [81] phi from cscroll::@1 to memcpy [phi:cscroll::@1->memcpy]
memcpy_from___b1:
// [81] phi memcpy::destination#2 = (void*)DEFAULT_SCREEN [phi:cscroll::@1->memcpy#0] -- pvoz1=pvoc1
@ -1894,7 +1895,7 @@ cscroll: {
jmp __b2
// cscroll::@2
__b2:
// [72] call memcpy
// [72] call memcpy
// [81] phi from cscroll::@2 to memcpy [phi:cscroll::@2->memcpy]
memcpy_from___b2:
// [81] phi memcpy::destination#2 = (void*)COLORRAM [phi:cscroll::@2->memcpy#0] -- pvoz1=pvoc1
@ -1913,7 +1914,7 @@ cscroll: {
jmp __b3
// cscroll::@3
__b3:
// [74] call memset
// [74] call memset
// [91] phi from cscroll::@3 to memset [phi:cscroll::@3->memset]
memset_from___b3:
// [91] phi memset::c#4 = ' ' [phi:cscroll::@3->memset#0] -- vbuxx=vbuc1
@ -1929,7 +1930,7 @@ cscroll: {
jmp __b4
// cscroll::@4
__b4:
// [76] call memset
// [76] call memset
// [91] phi from cscroll::@4 to memset [phi:cscroll::@4->memset]
memset_from___b4:
// [91] phi memset::c#4 = LIGHT_BLUE [phi:cscroll::@4->memset#0] -- vbuxx=vbuc1
@ -2289,7 +2290,7 @@ zp[2]:22 [ memset::end#0 memcpy::destination#2 memcpy::dst#2 memcpy::dst#4 memcp
FINAL ASSEMBLER
Score: 11077
Score: 11122
// File Comments
// Tests trouble passing a function pointer
@ -2341,11 +2342,11 @@ __start: {
lda #>COLORRAM
sta.z conio_line_color+1
// #pragma constructor_for(conio_c64_init, cputc, clrscr, cscroll)
// [5] call conio_c64_init
// [5] call conio_c64_init
jsr conio_c64_init
// [6] phi from __start::__init1 to __start::@1 [phi:__start::__init1->__start::@1]
// __start::@1
// [7] call main
// [7] call main
// [22] phi from __start::@1 to main [phi:__start::@1->main]
jsr main
// __start::@return
@ -2355,7 +2356,7 @@ __start: {
// world
world: {
// printf("world!")
// [10] call cputs
// [10] call cputs
// [27] phi from world to cputs [phi:world->cputs]
// [27] phi cputs::s#4 = world::s [phi:world->cputs#0] -- pbuz1=pbuc1
lda #<s
@ -2375,7 +2376,7 @@ world: {
// hello
hello: {
// printf("hello ")
// [13] call cputs
// [13] call cputs
// [27] phi from hello to cputs [phi:hello->cputs]
// [27] phi cputs::s#4 = hello::s [phi:hello->cputs#0] -- pbuz1=pbuc1
lda #<s
@ -2415,7 +2416,7 @@ conio_c64_init: {
__b1:
// gotoxy(0, line)
// [19] gotoxy::y#2 = conio_c64_init::line#2
// [20] call gotoxy
// [20] call gotoxy
jsr gotoxy
// conio_c64_init::@return
// }
@ -2425,7 +2426,7 @@ conio_c64_init: {
// main
main: {
// f1(&hello)
// [23] call f1
// [23] call f1
// [49] phi from main to f1 [phi:main->f1]
// [49] phi f1::fn#2 = &hello [phi:main->f1#0] -- pprz1=pprc1
lda #<hello
@ -2436,7 +2437,7 @@ main: {
// [24] phi from main to main::@1 [phi:main->main::@1]
// main::@1
// f1(&world)
// [25] call f1
// [25] call f1
// [49] phi from main::@1 to f1 [phi:main::@1->f1]
// [49] phi f1::fn#2 = &world [phi:main::@1->f1#0] -- pprz1=pprc1
lda #<world
@ -2478,7 +2479,7 @@ cputs: {
__b2:
// cputc(c)
// [33] cputc::c#0 = cputs::c#1
// [34] call cputc
// [34] call cputc
jsr cputc
jmp __b1
}
@ -2584,13 +2585,14 @@ gotoxy: {
f1: {
.label fn = 4
// (*fn)()
// [50] callexecute *f1::fn#2
jsr bi_fn
// [50] callexecute *f1::fn#2 -- call__deref_pprz1
jsr icall1
// f1::@return
// }
// [51] return
rts
bi_fn:
// Outside Flow
icall1:
jmp (fn)
}
// cputc
@ -2621,7 +2623,7 @@ cputc: {
// [57] phi from cputc::@2 to cputc::@3 [phi:cputc::@2->cputc::@3]
// cputc::@3
// cputln()
// [58] call cputln
// [58] call cputln
jsr cputln
// cputc::@return
__breturn:
@ -2632,7 +2634,7 @@ cputc: {
// cputc::@1
__b1:
// cputln()
// [61] call cputln
// [61] call cputln
jsr cputln
rts
}
@ -2665,7 +2667,7 @@ cputln: {
// [65] conio_cursor_y = ++ conio_cursor_y -- vbuz1=_inc_vbuz1
inc.z conio_cursor_y
// cscroll()
// [66] call cscroll
// [66] call cscroll
jsr cscroll
// cputln::@return
// }
@ -2683,7 +2685,7 @@ cscroll: {
// [69] phi from cscroll to cscroll::@1 [phi:cscroll->cscroll::@1]
// cscroll::@1
// memcpy(CONIO_SCREEN_TEXT, CONIO_SCREEN_TEXT+CONIO_WIDTH, CONIO_BYTES-CONIO_WIDTH)
// [70] call memcpy
// [70] call memcpy
// [81] phi from cscroll::@1 to memcpy [phi:cscroll::@1->memcpy]
// [81] phi memcpy::destination#2 = (void*)DEFAULT_SCREEN [phi:cscroll::@1->memcpy#0] -- pvoz1=pvoc1
lda #<DEFAULT_SCREEN
@ -2699,7 +2701,7 @@ cscroll: {
// [71] phi from cscroll::@1 to cscroll::@2 [phi:cscroll::@1->cscroll::@2]
// cscroll::@2
// memcpy(CONIO_SCREEN_COLORS, CONIO_SCREEN_COLORS+CONIO_WIDTH, CONIO_BYTES-CONIO_WIDTH)
// [72] call memcpy
// [72] call memcpy
// [81] phi from cscroll::@2 to memcpy [phi:cscroll::@2->memcpy]
// [81] phi memcpy::destination#2 = (void*)COLORRAM [phi:cscroll::@2->memcpy#0] -- pvoz1=pvoc1
lda #<COLORRAM
@ -2715,7 +2717,7 @@ cscroll: {
// [73] phi from cscroll::@2 to cscroll::@3 [phi:cscroll::@2->cscroll::@3]
// cscroll::@3
// memset(CONIO_SCREEN_TEXT+CONIO_BYTES-CONIO_WIDTH, ' ', CONIO_WIDTH)
// [74] call memset
// [74] call memset
// [91] phi from cscroll::@3 to memset [phi:cscroll::@3->memset]
// [91] phi memset::c#4 = ' ' [phi:cscroll::@3->memset#0] -- vbuxx=vbuc1
ldx #' '
@ -2728,7 +2730,7 @@ cscroll: {
// [75] phi from cscroll::@3 to cscroll::@4 [phi:cscroll::@3->cscroll::@4]
// cscroll::@4
// memset(CONIO_SCREEN_COLORS+CONIO_BYTES-CONIO_WIDTH, conio_textcolor, CONIO_WIDTH)
// [76] call memset
// [76] call memset
// [91] phi from cscroll::@4 to memset [phi:cscroll::@4->memset]
// [91] phi memset::c#4 = LIGHT_BLUE [phi:cscroll::@4->memset#0] -- vbuxx=vbuc1
ldx #LIGHT_BLUE

4
src/test/ref/function-pointer-noarg-call-2.asm
View File

@ -48,8 +48,8 @@ main: {
sta.z f+1
__b4:
// (*f)()
jsr bi_f
jsr icall1
jmp __b2
bi_f:
icall1:
jmp (f)
}

16
src/test/ref/function-pointer-noarg-call-2.log
View File

@ -55,7 +55,7 @@ fn2::@return: scope:[fn2] from fn2
void __start()
__start: scope:[__start] from
call main
call main
to:__start::@1
__start::@1: scope:[__start] from __start
to:__start::@return
@ -309,13 +309,14 @@ main: {
jmp __b4
// main::@4
__b4:
// [11] callexecute *main::f#3
jsr bi_f
// [11] callexecute *main::f#3 -- call__deref_pprz1
jsr icall1
// [5] phi from main::@4 to main::@1 [phi:main::@4->main::@1]
__b1_from___b4:
// [5] phi main::i#2 = main::i#1 [phi:main::@4->main::@1#0] -- register_copy
jmp __b1
bi_f:
// Outside Flow
icall1:
jmp (f)
}
// File Data
@ -438,12 +439,13 @@ main: {
// main::@4
__b4:
// (*f)()
// [11] callexecute *main::f#3
jsr bi_f
// [11] callexecute *main::f#3 -- call__deref_pprz1
jsr icall1
// [5] phi from main::@4 to main::@1 [phi:main::@4->main::@1]
// [5] phi main::i#2 = main::i#1 [phi:main::@4->main::@1#0] -- register_copy
jmp __b2
bi_f:
// Outside Flow
icall1:
jmp (f)
}
// File Data

4
src/test/ref/function-pointer-noarg-call-3.asm
View File

@ -34,9 +34,9 @@ main: {
lda.z i
jsr getfn
// (*getfn(++i))()
jsr bi___0
jsr icall1
jmp __b2
bi___0:
icall1:
jmp (__0)
}
// declare getfn as function (char b) returning pointer to function (void) returning void

24
src/test/ref/function-pointer-noarg-call-3.log
View File

@ -16,7 +16,7 @@ main::@2: scope:[main] from main::@1
main::i#2 = phi( main::@1/main::i#3 )
main::i#1 = ++ main::i#2
getfn::b#0 = main::i#1
call getfn
call getfn
getfn::return#0 = getfn::return#3
to:main::@3
main::@3: scope:[main] from main::@2
@ -66,7 +66,7 @@ fn2::@return: scope:[fn2] from fn2
void __start()
__start: scope:[__start] from
call main
call main
to:__start::@1
__start::@1: scope:[__start] from __start
to:__start::@return
@ -185,7 +185,7 @@ main::@1: scope:[main] from main main::@3
main::@2: scope:[main] from main::@1
[6] main::i#1 = ++ main::i#2
[7] getfn::b#0 = main::i#1
[8] call getfn
[8] call getfn
[9] getfn::return#0 = getfn::return#3
to:main::@3
main::@3: scope:[main] from main::@2
@ -332,20 +332,21 @@ main: {
inc.z i
// [7] getfn::b#0 = main::i#1 -- vbuaa=vbuz1
lda.z i
// [8] call getfn
// [8] call getfn
jsr getfn
// [9] getfn::return#0 = getfn::return#3
jmp __b3
// main::@3
__b3:
// [10] main::$0 = getfn::return#0
// [11] callexecute *main::$0
jsr bi___0
// [11] callexecute *main::$0 -- call__deref_pprz1
jsr icall1
// [5] phi from main::@3 to main::@1 [phi:main::@3->main::@1]
__b1_from___b3:
// [5] phi main::i#2 = main::i#1 [phi:main::@3->main::@1#0] -- register_copy
jmp __b1
bi___0:
// Outside Flow
icall1:
jmp (__0)
}
// getfn
@ -492,18 +493,19 @@ main: {
// getfn(++i)
// [7] getfn::b#0 = main::i#1 -- vbuaa=vbuz1
lda.z i
// [8] call getfn
// [8] call getfn
jsr getfn
// [9] getfn::return#0 = getfn::return#3
// main::@3
// [10] main::$0 = getfn::return#0
// (*getfn(++i))()
// [11] callexecute *main::$0
jsr bi___0
// [11] callexecute *main::$0 -- call__deref_pprz1
jsr icall1
// [5] phi from main::@3 to main::@1 [phi:main::@3->main::@1]
// [5] phi main::i#2 = main::i#1 [phi:main::@3->main::@1#0] -- register_copy
jmp __b2
bi___0:
// Outside Flow
icall1:
jmp (__0)
}
// getfn

10
src/test/ref/function-pointer-noarg-call-4.log
View File

@ -15,7 +15,7 @@ main::@2: scope:[main] from main::@1
main::i#2 = phi( main::@1/main::i#3 )
main::i#1 = ++ main::i#2
getfn::b#0 = main::i#1
call getfn
call getfn
getfn::return#0 = getfn::return#2
to:main::@3
main::@3: scope:[main] from main::@2
@ -48,7 +48,7 @@ fn1::@return: scope:[fn1] from fn1
void __start()
__start: scope:[__start] from
call main
call main
to:__start::@1
__start::@1: scope:[__start] from __start
to:__start::@return
@ -105,7 +105,7 @@ Eliminating unused constant getfn::return#0
Successful SSA optimization PassNEliminateUnusedVars
Eliminating unused constant getfn::return#1
Successful SSA optimization PassNEliminateUnusedVars
Removing call to empty/unused procedure [2] call getfn
Removing call to empty/unused procedure [2] call getfn
Removing unused procedure getfn
Removing unused procedure block getfn
Removing unused procedure block getfn::@return
@ -224,7 +224,7 @@ main: {
jmp __b3
// main::@3
__b3:
// [6] callexecute fn1 -- jsr
// [6] callexecute fn1 -- call_vprc1
jsr fn1
// [3] phi from main::@3 to main::@1 [phi:main::@3->main::@1]
__b1_from___b3:
@ -301,7 +301,7 @@ main: {
// [5] phi from main::@2 to main::@3 [phi:main::@2->main::@3]
// main::@3
// (*getfn(++i))()
// [6] callexecute fn1 -- jsr
// [6] callexecute fn1 -- call_vprc1
jsr fn1
// [3] phi from main::@3 to main::@1 [phi:main::@3->main::@1]
// [3] phi main::i#2 = main::i#1 [phi:main::@3->main::@1#0] -- register_copy

4
src/test/ref/function-pointer-noarg-call-5.asm
View File

@ -27,9 +27,9 @@ main: {
lda fns+1,y
sta.z f+1
// (*f)()
jsr bi_f
jsr icall1
jmp __b2
bi_f:
icall1:
jmp (f)
}
fn2: {

16
src/test/ref/function-pointer-noarg-call-5.log
View File

@ -40,7 +40,7 @@ main::@return: scope:[main] from main::@1
void __start()
__start: scope:[__start] from
call main
call main
to:__start::@1
__start::@1: scope:[__start] from __start
to:__start::@return
@ -242,13 +242,14 @@ main: {
sta.z f
lda fns+1,y
sta.z f+1
// [6] callexecute *main::f#0
jsr bi_f
// [6] callexecute *main::f#0 -- call__deref_pprz1
jsr icall1
// [1] phi from main::@2 to main::@1 [phi:main::@2->main::@1]
__b1_from___b2:
// [1] phi main::i#2 = main::i#1 [phi:main::@2->main::@1#0] -- register_copy
jmp __b1
bi_f:
// Outside Flow
icall1:
jmp (f)
}
// fn2
@ -358,12 +359,13 @@ main: {
lda fns+1,y
sta.z f+1
// (*f)()
// [6] callexecute *main::f#0
jsr bi_f
// [6] callexecute *main::f#0 -- call__deref_pprz1
jsr icall1
// [1] phi from main::@2 to main::@1 [phi:main::@2->main::@1]
// [1] phi main::i#2 = main::i#1 [phi:main::@2->main::@1#0] -- register_copy
jmp __b2
bi_f:
// Outside Flow
icall1:
jmp (f)
}
// fn2

6
src/test/ref/function-pointer-noarg-call-6.log
View File

@ -44,7 +44,7 @@ main::@return: scope:[main] from main::@1
void __start()
__start: scope:[__start] from
call main
call main
to:__start::@1
__start::@1: scope:[__start] from __start
to:__start::@return
@ -242,7 +242,7 @@ main: {
jmp __b2
// main::@2
__b2:
// [5] callexecute fn1 -- jsr
// [5] callexecute fn1 -- call_vprc1
jsr fn1
jmp __b3
// main::@3
@ -395,7 +395,7 @@ main: {
// main::@2
__b2:
// (*cls)()
// [5] callexecute fn1 -- jsr
// [5] callexecute fn1 -- call_vprc1
jsr fn1
// main::@3
// (*cols)++;

22
src/test/ref/function-pointer-noarg-call-7.log
View File

@ -1,4 +1,4 @@
Inlined call call __init
Inlined call call __init
Calling convention STACK_CALL adding prepare/execute/finalize for call *do10::fn
CONTROL FLOW GRAPH SSA
@ -43,7 +43,7 @@ hello::@return: scope:[hello] from hello::@1
void main()
main: scope:[main] from __start::@1
do10::fn#0 = main::f
call do10
call do10
to:main::@1
main::@1: scope:[main] from main
to:main::@return
@ -58,7 +58,7 @@ __start::__init1: scope:[__start] from __start
idx = 0
to:__start::@1
__start::@1: scope:[__start] from __start::__init1
call main
call main
to:__start::@2
__start::@2: scope:[__start] from __start::@1
to:__start::@return
@ -170,7 +170,7 @@ __start::__init1: scope:[__start] from __start
to:__start::@1
__start::@1: scope:[__start] from __start::__init1
[2] phi()
[3] call main
[3] call main
to:__start::@return
__start::@return: scope:[__start] from __start::@1
[4] return
@ -194,7 +194,7 @@ hello::@return: scope:[hello] from hello::@1
void main()
main: scope:[main] from __start::@1
[12] phi()
[13] call do10
[13] call do10
to:main::@return
main::@return: scope:[main] from main
[14] return
@ -306,7 +306,7 @@ __start: {
jmp __b1
// __start::@1
__b1:
// [3] call main
// [3] call main
// [12] phi from __start::@1 to main [phi:__start::@1->main]
main_from___b1:
jsr main
@ -349,7 +349,7 @@ hello: {
}
// main
main: {
// [13] call do10
// [13] call do10
// [15] phi from main to do10 [phi:main->do10]
do10_from_main:
jsr do10
@ -374,7 +374,7 @@ do10: {
jmp __b1
// do10::@1
__b1:
// [17] callexecute hello -- jsr
// [17] callexecute hello -- call_vprc1
jsr hello
jmp __b2
// do10::@2
@ -477,7 +477,7 @@ __start: {
sta.z idx
// [2] phi from __start::__init1 to __start::@1 [phi:__start::__init1->__start::@1]
// __start::@1
// [3] call main
// [3] call main
// [12] phi from __start::@1 to main [phi:__start::@1->main]
jsr main
// __start::@return
@ -516,7 +516,7 @@ hello: {
// main
main: {
// do10(f)
// [13] call do10
// [13] call do10
// [15] phi from main to do10 [phi:main->do10]
jsr do10
// main::@return
@ -536,7 +536,7 @@ do10: {
// do10::@1
__b1:
// (*fn)()
// [17] callexecute hello -- jsr
// [17] callexecute hello -- call_vprc1
jsr hello
// do10::@2
// for( byte i: 0..9)

30
src/test/ref/function-pointer-noarg-call-8.log
View File

@ -1,4 +1,4 @@
Inlined call call __init
Inlined call call __init
Calling convention STACK_CALL adding prepare/execute/finalize for call *do10::fn
CONTROL FLOW GRAPH SSA
@ -44,12 +44,12 @@ void main()
main: scope:[main] from __start::@1
msg = msg1
do10::fn#0 = main::f
call do10
call do10
to:main::@1
main::@1: scope:[main] from main
msg = msg2
do10::fn#1 = main::f
call do10
call do10
to:main::@2
main::@2: scope:[main] from main::@1
to:main::@return
@ -65,7 +65,7 @@ __start::__init1: scope:[__start] from __start
idx = 0
to:__start::@1
__start::@1: scope:[__start] from __start::__init1
call main
call main
to:__start::@2
__start::@2: scope:[__start] from __start::@1
to:__start::@return
@ -183,7 +183,7 @@ __start::__init1: scope:[__start] from __start
to:__start::@1
__start::@1: scope:[__start] from __start::__init1
[3] phi()
[4] call main
[4] call main
to:__start::@return
__start::@return: scope:[__start] from __start::@1
[5] return
@ -207,11 +207,11 @@ hello::@return: scope:[hello] from hello::@1
void main()
main: scope:[main] from __start::@1
[13] msg = msg1
[14] call do10
[14] call do10
to:main::@1
main::@1: scope:[main] from main
[15] msg = msg2
[16] call do10
[16] call do10
to:main::@return
main::@return: scope:[main] from main::@1
[17] return
@ -341,7 +341,7 @@ __start: {
jmp __b1
// __start::@1
__b1:
// [4] call main
// [4] call main
jsr main
jmp __breturn
// __start::@return
@ -387,7 +387,7 @@ main: {
sta.z msg
lda #>msg1
sta.z msg+1
// [14] call do10
// [14] call do10
// [18] phi from main to do10 [phi:main->do10]
do10_from_main:
jsr do10
@ -399,7 +399,7 @@ main: {
sta.z msg
lda #>msg2
sta.z msg+1
// [16] call do10
// [16] call do10
// [18] phi from main::@1 to do10 [phi:main::@1->do10]
do10_from___b1:
jsr do10
@ -424,7 +424,7 @@ do10: {
jmp __b1
// do10::@1
__b1:
// [20] callexecute hello -- jsr
// [20] callexecute hello -- call_vprc1
jsr hello
jmp __b2
// do10::@2
@ -542,7 +542,7 @@ __start: {
sta.z idx
// [3] phi from __start::__init1 to __start::@1 [phi:__start::__init1->__start::@1]
// __start::@1
// [4] call main
// [4] call main
jsr main
// __start::@return
// [5] return
@ -586,7 +586,7 @@ main: {
lda #>msg1
sta.z msg+1
// do10(f)
// [14] call do10
// [14] call do10
// [18] phi from main to do10 [phi:main->do10]
jsr do10
// main::@1
@ -597,7 +597,7 @@ main: {
lda #>msg2
sta.z msg+1
// do10(f)
// [16] call do10
// [16] call do10
// [18] phi from main::@1 to do10 [phi:main::@1->do10]
jsr do10
// main::@return
@ -617,7 +617,7 @@ do10: {
// do10::@1
__b1:
// (*fn)()
// [20] callexecute hello -- jsr
// [20] callexecute hello -- call_vprc1
jsr hello
// do10::@2
// for( byte i: 0..9)

18
src/test/ref/function-pointer-noarg-call-9.log
View File

@ -1,4 +1,4 @@
Inlined call call __init
Inlined call call __init
Calling convention STACK_CALL adding prepare/execute/finalize for call *main::f
Calling convention STACK_CALL adding prepare/execute/finalize for call *main::f
@ -34,7 +34,7 @@ __start::__init1: scope:[__start] from __start
idx = 0
to:__start::@1
__start::@1: scope:[__start] from __start::__init1
call main
call main
to:__start::@2
__start::@2: scope:[__start] from __start::@1
to:__start::@return
@ -83,7 +83,7 @@ __start::__init1: scope:[__start] from __start
to:__start::@1
__start::@1: scope:[__start] from __start::__init1
[2] phi()
[3] call main
[3] call main
to:__start::@return
__start::@return: scope:[__start] from __start::@1
[4] return
@ -173,7 +173,7 @@ __start: {
jmp __b1
// __start::@1
__b1:
// [3] call main
// [3] call main
// [7] phi from __start::@1 to main [phi:__start::@1->main]
main_from___b1:
jsr main
@ -195,7 +195,7 @@ fn1: {
}
// main
main: {
// [8] callexecute fn1 -- jsr
// [8] callexecute fn1 -- call_vprc1
jsr fn1
jmp __b1
// main::@1
@ -204,7 +204,7 @@ main: {
lda #'a'
ldy.z idx
sta SCREEN,y
// [10] callexecute fn1 -- jsr
// [10] callexecute fn1 -- call_vprc1
jsr fn1
jmp __b2
// main::@2
@ -279,7 +279,7 @@ __start: {
sta.z idx
// [2] phi from __start::__init1 to __start::@1 [phi:__start::__init1->__start::@1]
// __start::@1
// [3] call main
// [3] call main
// [7] phi from __start::@1 to main [phi:__start::@1->main]
jsr main
// __start::@return
@ -299,7 +299,7 @@ fn1: {
// main
main: {
// (*f)()
// [8] callexecute fn1 -- jsr
// [8] callexecute fn1 -- call_vprc1
jsr fn1
// main::@1
// SCREEN[idx] = 'a'
@ -308,7 +308,7 @@ main: {
ldy.z idx
sta SCREEN,y
// (*f)()
// [10] callexecute fn1 -- jsr
// [10] callexecute fn1 -- call_vprc1
jsr fn1
// main::@2
// SCREEN[idx] = 'a'

6
src/test/ref/function-pointer-noarg-call.log
View File

@ -20,7 +20,7 @@ main::@return: scope:[main] from main
void __start()
__start: scope:[__start] from
call main
call main
to:__start::@1
__start::@1: scope:[__start] from __start
to:__start::@return
@ -107,7 +107,7 @@ ASSEMBLER BEFORE OPTIMIZATION
.segment Code
// main
main: {
// [1] callexecute fn1 -- jsr
// [1] callexecute fn1 -- call_vprc1
jsr fn1
jmp __breturn
// main::@return
@ -162,7 +162,7 @@ Score: 24
// main
main: {
// (*f)()
// [1] callexecute fn1 -- jsr
// [1] callexecute fn1 -- call_vprc1
jsr fn1
// main::@return
// }

4
src/test/ref/function-pointer-param-0.asm
View File

@ -97,9 +97,9 @@ main: {
// (*f)(i)
lda.z i
pha
jsr bi_f
jsr icall2
pla
jmp __b4
bi_f:
icall2:
jmp (f)
}

20
src/test/ref/function-pointer-param-0.log
View File

@ -96,7 +96,7 @@ fn3::@return: scope:[fn3] from fn3
void __start()
__start: scope:[__start] from
call main
call main
to:__start::@1
__start::@1: scope:[__start] from __start
to:__start::@return
@ -482,7 +482,7 @@ main: {
// [15] stackpush(byte) = main::i#2 -- _stackpushbyte_=vbuz1
lda.z i
pha
// [16] callexecute fn3 -- jsr
// [16] callexecute fn3 -- call_vprc1
jsr fn3
// sideeffect stackpullbytes(1) -- _stackpullbyte_1
pla
@ -529,12 +529,13 @@ main: {
// [23] stackpush(byte) = main::i#2 -- _stackpushbyte_=vbuz1
lda.z i
pha
// [24] callexecute *main::f#3
jsr bi_f
// [24] callexecute *main::f#3 -- call__deref_pprz1
jsr icall2
// sideeffect stackpullbytes(1) -- _stackpullbyte_1
pla
jmp __b4
bi_f:
// Outside Flow
icall2:
jmp (f)
}
// File Data
@ -702,7 +703,7 @@ main: {
// [15] stackpush(byte) = main::i#2 -- _stackpushbyte_=vbuz1
lda.z i
pha
// [16] callexecute fn3 -- jsr
// [16] callexecute fn3 -- call_vprc1
jsr fn3
// sideeffect stackpullbytes(1) -- _stackpullbyte_1
pla
@ -746,12 +747,13 @@ main: {
// [23] stackpush(byte) = main::i#2 -- _stackpushbyte_=vbuz1
lda.z i
pha
// [24] callexecute *main::f#3
jsr bi_f
// [24] callexecute *main::f#3 -- call__deref_pprz1
jsr icall2
// sideeffect stackpullbytes(1) -- _stackpullbyte_1
pla
jmp __b4
bi_f:
// Outside Flow
icall2:
jmp (f)
}
// File Data

4
src/test/ref/function-pointer-param-workaround.asm
View File

@ -151,11 +151,11 @@ main: {
lda fns+1,y
sta.z f+1
// (*f)()
jsr bi_f
jsr icall1
// for(char j=0;j<2;j++)
inc.z j
jmp __b2
bi_f:
icall1:
jmp (f)
.segment Data
fns: .word fn1, fn2

50
src/test/ref/function-pointer-param-workaround.log
View File

@ -1,7 +1,7 @@
Setting inferred volatile on symbol affected by address-of: fn1::param_char in asm { pla staparam_char }
Setting inferred volatile on symbol affected by address-of: fn2::param_char in asm { pla staparam_char }
Setting inferred volatile on symbol affected by address-of: main::param_char in asm { ldaparam_char pha }
Inlined call call __init
Inlined call call __init
Calling convention STACK_CALL adding prepare/execute/finalize for call *main::f
CONTROL FLOW GRAPH SSA
@ -96,7 +96,7 @@ __start::__init1: scope:[__start] from __start
idx2 = 0
to:__start::@1
__start::@1: scope:[__start] from __start::__init1
call main
call main
to:__start::@2
__start::@2: scope:[__start] from __start::@1
to:__start::@return
@ -240,7 +240,7 @@ __start::__init1: scope:[__start] from __start
to:__start::@1
__start::@1: scope:[__start] from __start::__init1
[3] phi()
[4] call main
[4] call main
to:__start::@return
__start::@return: scope:[__start] from __start::@1
[5] return
@ -482,25 +482,25 @@ Uplift Scope [fn2] 1.2: zp[1]:8 [ fn2::param_char ] 1: zp[1]:9 [ fn2::b#0 ] 1: z
Uplift Scope [] 1.27: zp[1]:4 [ idx1 ] 1.27: zp[1]:5 [ idx2 ]
Uplift Scope [__start]
Uplifting [main] best 9907 combination zp[2]:18 [ main::f#0 ] zp[1]:3 [ main::j#2 main::j#1 ] reg byte a [ main::$3 ] zp[1]:16 [ main::param_char ] zp[1]:2 [ main::i#2 main::i#1 ]
Uplifting [fn1] best 9899 combination zp[1]:13 [ fn1::param_char ] reg byte y [ fn1::b#0 ] reg byte x [ fn1::c#0 ] zp[2]:11 [ fn1::ret_addr ]
Uplifting [fn2] best 9891 combination zp[1]:8 [ fn2::param_char ] reg byte y [ fn2::b#0 ] reg byte x [ fn2::c#0 ] zp[2]:6 [ fn2::ret_addr ]
Uplifting [] best 9891 combination zp[1]:4 [ idx1 ] zp[1]:5 [ idx2 ]
Uplifting [__start] best 9891 combination
Uplifting [main] best 9457 combination zp[2]:18 [ main::f#0 ] zp[1]:3 [ main::j#2 main::j#1 ] reg byte a [ main::$3 ] zp[1]:16 [ main::param_char ] zp[1]:2 [ main::i#2 main::i#1 ]
Uplifting [fn1] best 9449 combination zp[1]:13 [ fn1::param_char ] reg byte y [ fn1::b#0 ] reg byte x [ fn1::c#0 ] zp[2]:11 [ fn1::ret_addr ]
Uplifting [fn2] best 9441 combination zp[1]:8 [ fn2::param_char ] reg byte y [ fn2::b#0 ] reg byte x [ fn2::c#0 ] zp[2]:6 [ fn2::ret_addr ]
Uplifting [] best 9441 combination zp[1]:4 [ idx1 ] zp[1]:5 [ idx2 ]
Uplifting [__start] best 9441 combination
Attempting to uplift remaining variables inzp[1]:3 [ main::j#2 main::j#1 ]
Uplifting [main] best 9891 combination zp[1]:3 [ main::j#2 main::j#1 ]
Uplifting [main] best 9441 combination zp[1]:3 [ main::j#2 main::j#1 ]
Attempting to uplift remaining variables inzp[1]:16 [ main::param_char ]
Uplifting [main] best 9891 combination zp[1]:16 [ main::param_char ]
Uplifting [main] best 9441 combination zp[1]:16 [ main::param_char ]
Attempting to uplift remaining variables inzp[1]:2 [ main::i#2 main::i#1 ]
Uplifting [main] best 9891 combination zp[1]:2 [ main::i#2 main::i#1 ]
Uplifting [main] best 9441 combination zp[1]:2 [ main::i#2 main::i#1 ]
Attempting to uplift remaining variables inzp[1]:4 [ idx1 ]
Uplifting [] best 9891 combination zp[1]:4 [ idx1 ]
Uplifting [] best 9441 combination zp[1]:4 [ idx1 ]
Attempting to uplift remaining variables inzp[1]:5 [ idx2 ]
Uplifting [] best 9891 combination zp[1]:5 [ idx2 ]
Uplifting [] best 9441 combination zp[1]:5 [ idx2 ]
Attempting to uplift remaining variables inzp[1]:8 [ fn2::param_char ]
Uplifting [fn2] best 9891 combination zp[1]:8 [ fn2::param_char ]
Uplifting [fn2] best 9441 combination zp[1]:8 [ fn2::param_char ]
Attempting to uplift remaining variables inzp[1]:13 [ fn1::param_char ]
Uplifting [fn1] best 9891 combination zp[1]:13 [ fn1::param_char ]
Uplifting [fn1] best 9441 combination zp[1]:13 [ fn1::param_char ]
Allocated (was zp[2]:11) zp[2]:9 [ fn1::ret_addr ]
Allocated (was zp[1]:13) zp[1]:11 [ fn1::param_char ]
Allocated (was zp[1]:16) zp[1]:12 [ main::param_char ]
@ -545,7 +545,7 @@ __start: {
jmp __b1
// __start::@1
__b1:
// [4] call main
// [4] call main
// [32] phi from __start::@1 to main [phi:__start::@1->main]
main_from___b1:
jsr main
@ -727,8 +727,8 @@ main: {
sta.z f
lda fns+1,y
sta.z f+1
// [46] callexecute *main::f#0
jsr bi_f
// [46] callexecute *main::f#0 -- call__deref_pprz1
jsr icall1
jmp __b5
// main::@5
__b5:
@ -738,7 +738,8 @@ main: {
__b2_from___b5:
// [36] phi main::j#2 = main::j#1 [phi:main::@5->main::@2#0] -- register_copy
jmp __b2
bi_f:
// Outside Flow
icall1:
jmp (f)
.segment Data
fns: .word fn1, fn2
@ -838,7 +839,7 @@ zp[2]:13 [ main::f#0 ]
FINAL ASSEMBLER
Score: 8075
Score: 7625
// File Comments
// Demonstrates work-around for passing parameters to function pointers
@ -874,7 +875,7 @@ __start: {
sta.z idx2
// [3] phi from __start::__init1 to __start::@1 [phi:__start::__init1->__start::@1]
// __start::@1
// [4] call main
// [4] call main
// [32] phi from __start::@1 to main [phi:__start::@1->main]
jsr main
// __start::@return
@ -1059,8 +1060,8 @@ main: {
lda fns+1,y
sta.z f+1
// (*f)()
// [46] callexecute *main::f#0
jsr bi_f
// [46] callexecute *main::f#0 -- call__deref_pprz1
jsr icall1
// main::@5
// for(char j=0;j<2;j++)
// [47] main::j#1 = ++ main::j#2 -- vbuz1=_inc_vbuz1
@ -1068,7 +1069,8 @@ main: {
// [36] phi from main::@5 to main::@2 [phi:main::@5->main::@2]
// [36] phi main::j#2 = main::j#1 [phi:main::@5->main::@2#0] -- register_copy
jmp __b2
bi_f:
// Outside Flow
icall1:
jmp (f)
.segment Data
fns: .word fn1, fn2

4
src/test/ref/function-pointer-return-1.asm
View File

@ -61,12 +61,12 @@ main: {
__b3:
// (*f)()
pha
jsr bi_f
jsr icall1
// char v = (*f)()
pla
// SCREEN[0] = v
sta SCREEN
jmp __b1
bi_f:
icall1:
jmp (f)
}

16
src/test/ref/function-pointer-return-1.log
View File

@ -71,7 +71,7 @@ fn2::@return: scope:[fn2] from fn2
void __start()
__start: scope:[__start] from
call main
call main
to:__start::@1
__start::@1: scope:[__start] from __start
to:__start::@return
@ -393,8 +393,8 @@ main: {
__b3:
// sideeffect stackpushbytes(1) -- _stackpushbyte_1
pha
// [16] callexecute *main::f#3
jsr bi_f
// [16] callexecute *main::f#3 -- call__deref_pprz1
jsr icall1
// [17] main::v#0 = stackpull(byte) -- vbuaa=_stackpullbyte_
pla
jmp __b4
@ -406,7 +406,8 @@ main: {
__b1_from___b4:
// [9] phi main::i#2 = main::i#1 [phi:main::@4->main::@1#0] -- register_copy
jmp __b1
bi_f:
// Outside Flow
icall1:
jmp (f)
}
// File Data
@ -558,8 +559,8 @@ main: {
// (*f)()
// sideeffect stackpushbytes(1) -- _stackpushbyte_1
pha
// [16] callexecute *main::f#3
jsr bi_f
// [16] callexecute *main::f#3 -- call__deref_pprz1
jsr icall1
// char v = (*f)()
// [17] main::v#0 = stackpull(byte) -- vbuaa=_stackpullbyte_
pla
@ -570,7 +571,8 @@ main: {
// [9] phi from main::@4 to main::@1 [phi:main::@4->main::@1]
// [9] phi main::i#2 = main::i#1 [phi:main::@4->main::@1#0] -- register_copy
jmp __b1
bi_f:
// Outside Flow
icall1:
jmp (f)
}
// File Data

4
src/test/ref/function-pointer-return-2.asm
View File

@ -52,13 +52,13 @@ set_border: {
.label fn = 2
// fn()
pha
jsr bi_fn
jsr icall1
pla
// *BORDER = fn()
// Call pointer to a function without *
sta BORDER
// }
rts
bi_fn:
icall1:
jmp (fn)
}

26
src/test/ref/function-pointer-return-2.log
View File

@ -230,11 +230,11 @@ Uplift Scope [fn2]
Uplift Scope [main]
Uplift Scope []
Uplifting [set_border] best 200 combination reg byte a [ set_border::$0 ] zp[2]:2 [ set_border::fn#2 ]
Uplifting [fn1] best 194 combination reg byte a [ fn1::return#0 ]
Uplifting [fn2] best 194 combination
Uplifting [main] best 194 combination
Uplifting [] best 194 combination
Uplifting [set_border] best 245 combination reg byte a [ set_border::$0 ] zp[2]:2 [ set_border::fn#2 ]
Uplifting [fn1] best 239 combination reg byte a [ fn1::return#0 ]
Uplifting [fn2] best 239 combination
Uplifting [main] best 239 combination
Uplifting [] best 239 combination
ASSEMBLER BEFORE OPTIMIZATION
// File Comments
@ -322,8 +322,8 @@ set_border: {
.label fn = 2
// sideeffect stackpushbytes(1) -- _stackpushbyte_1
pha
// [13] callexecute *set_border::fn#2
jsr bi_fn
// [13] callexecute *set_border::fn#2 -- call__deref_pprz1
jsr icall1
// [14] set_border::$0 = stackpull(byte) -- vbuaa=_stackpullbyte_
pla
jmp __b1
@ -337,7 +337,8 @@ set_border: {
__breturn:
// [16] return
rts
bi_fn:
// Outside Flow
icall1:
jmp (fn)
}
// File Data
@ -388,7 +389,7 @@ reg byte a [ set_border::$0 ]
FINAL ASSEMBLER
Score: 95
Score: 140
// File Comments
// Calling a function pointer with return value
@ -469,8 +470,8 @@ set_border: {
// fn()
// sideeffect stackpushbytes(1) -- _stackpushbyte_1
pha
// [13] callexecute *set_border::fn#2
jsr bi_fn
// [13] callexecute *set_border::fn#2 -- call__deref_pprz1
jsr icall1
// [14] set_border::$0 = stackpull(byte) -- vbuaa=_stackpullbyte_
pla
// set_border::@1
@ -482,7 +483,8 @@ set_border: {
// }
// [16] return
rts
bi_fn:
// Outside Flow
icall1:
jmp (fn)
}
// File Data

6
src/test/ref/procedure-callingconvention-stack-0.log
View File

@ -38,7 +38,7 @@ plus::@return: scope:[plus] from plus
void __start()
__start: scope:[__start] from
call main
call main
to:__start::@1
__start::@1: scope:[__start] from __start
to:__start::@return
@ -231,7 +231,7 @@ main: {
// [6] stackpush(byte) = 7 -- _stackpushbyte_=vbuc1
lda #7
pha
// [7] callexecute plus -- jsr
// [7] callexecute plus -- call_vprc1
jsr plus
// sideeffect stackpullbytes(1) -- _stackpullbyte_1
pla
@ -330,7 +330,7 @@ main: {
// [6] stackpush(byte) = 7 -- _stackpushbyte_=vbuc1
lda #7
pha
// [7] callexecute plus -- jsr
// [7] callexecute plus -- call_vprc1
jsr plus
// sideeffect stackpullbytes(1) -- _stackpullbyte_1
pla

6
src/test/ref/procedure-callingconvention-stack-1.log
View File

@ -38,7 +38,7 @@ plus::@return: scope:[plus] from plus
void __start()
__start: scope:[__start] from
call main
call main
to:__start::@1
__start::@1: scope:[__start] from __start
to:__start::@return
@ -231,7 +231,7 @@ main: {
// [6] stackpush(byte) = 7 -- _stackpushbyte_=vbuc1
lda #7
pha
// [7] callexecute plus -- jsr
// [7] callexecute plus -- call_vprc1
jsr plus
// sideeffect stackpullbytes(1) -- _stackpullbyte_1
pla
@ -330,7 +330,7 @@ main: {
// [6] stackpush(byte) = 7 -- _stackpushbyte_=vbuc1
lda #7
pha
// [7] callexecute plus -- jsr
// [7] callexecute plus -- call_vprc1
jsr plus
// sideeffect stackpullbytes(1) -- _stackpullbyte_1
pla

16
src/test/ref/procedure-callingconvention-stack-10.log
View File

@ -1,11 +1,11 @@
Converting variable modified inside __stackcall procedure main() to load/store idx
Adding parameter assignment in __stackcall procedure get::i = param(get::i)
Adding parameter assignment in __stackcall procedure print::p = param(print::p)
Inlined call call __init
Inlined call call __init
Eliminating unused variable with no statement main::$1
Calling convention __stackcall adding prepare/execute/finalize for main::p = call get(main::i)
Calling convention __stackcall adding prepare/execute/finalize for call print(main::p)
Calling convention __stackcall adding prepare/execute/finalize for call main
Calling convention __stackcall adding prepare/execute/finalize for call main
Calling convention STACK_CALL replacing param(get::i) with stackidx(byte,get::OFFSET_STACK_I)
Calling convention STACK_CALL replacing param(print::p) with stackidx(struct Point,print::OFFSET_STACK_P)
Calling convention STACK_CALL adding stack return stackidx(struct Point,get::OFFSET_STACK_RETURN_0) = get::return
@ -358,7 +358,7 @@ __start: {
jmp __b1
// __start::@1
__b1:
// [3] callexecute main -- jsr
// [3] callexecute main -- call_vprc1
jsr main
jmp __breturn
// __start::@return
@ -460,7 +460,7 @@ main: {
pha
// sideeffect stackpushbytes(1) -- _stackpushbyte_1
pha
// [24] callexecute get -- jsr
// [24] callexecute get -- call_vprc1
jsr get
// [25] main::p = stackpull(struct Point) -- vssz1=_stackpullstruct_2_
pla
@ -472,7 +472,7 @@ main: {
pha
lda.z p
pha
// [27] callexecute print -- jsr
// [27] callexecute print -- call_vprc1
jsr print
// sideeffect stackpullbytes(2) -- _stackpullbyte_2
pla
@ -573,7 +573,7 @@ __start: {
sta.z idx
// [2] phi from __start::__init1 to __start::@1 [phi:__start::__init1->__start::@1]
// __start::@1
// [3] callexecute main -- jsr
// [3] callexecute main -- call_vprc1
jsr main
// __start::@return
// [4] return
@ -677,7 +677,7 @@ main: {
pha
// sideeffect stackpushbytes(1) -- _stackpushbyte_1
pha
// [24] callexecute get -- jsr
// [24] callexecute get -- call_vprc1
jsr get
// [25] main::p = stackpull(struct Point) -- vssz1=_stackpullstruct_2_
pla
@ -689,7 +689,7 @@ main: {
pha
lda.z p
pha
// [27] callexecute print -- jsr
// [27] callexecute print -- call_vprc1
jsr print
// sideeffect stackpullbytes(2) -- _stackpullbyte_2
pla

16
src/test/ref/procedure-callingconvention-stack-11.log
View File

@ -1,11 +1,11 @@
Converting variable modified inside __stackcall procedure main() to load/store idx
Adding parameter assignment in __stackcall procedure get::i = param(get::i)
Adding parameter assignment in __stackcall procedure print::v = param(print::v)
Inlined call call __init
Inlined call call __init
Eliminating unused variable with no statement main::$1
Calling convention __stackcall adding prepare/execute/finalize for main::v = call get(main::i)
Calling convention __stackcall adding prepare/execute/finalize for call print(main::v)
Calling convention __stackcall adding prepare/execute/finalize for call main
Calling convention __stackcall adding prepare/execute/finalize for call main
Calling convention STACK_CALL replacing param(get::i) with stackidx(byte,get::OFFSET_STACK_I)
Calling convention STACK_CALL replacing param(print::v) with stackidx(struct Vector,print::OFFSET_STACK_V)
Calling convention STACK_CALL adding stack return stackidx(struct Vector,get::OFFSET_STACK_RETURN_0) = get::return
@ -430,7 +430,7 @@ __start: {
jmp __b1
// __start::@1
__b1:
// [3] callexecute main -- jsr
// [3] callexecute main -- call_vprc1
jsr main
jmp __breturn
// __start::@return
@ -577,7 +577,7 @@ main: {
pha
pha
pha
// [34] callexecute get -- jsr
// [34] callexecute get -- call_vprc1
jsr get
// [35] main::v = stackpull(struct Vector) -- vssz1=_stackpullstruct_4_
pla
@ -597,7 +597,7 @@ main: {
pha
lda.z v
pha
// [37] callexecute print -- jsr
// [37] callexecute print -- call_vprc1
jsr print
// sideeffect stackpullbytes(4) -- _stackpullbyte_4
tsx
@ -706,7 +706,7 @@ __start: {
sta.z idx
// [2] phi from __start::__init1 to __start::@1 [phi:__start::__init1->__start::@1]
// __start::@1
// [3] callexecute main -- jsr
// [3] callexecute main -- call_vprc1
jsr main
// __start::@return
// [4] return
@ -863,7 +863,7 @@ main: {
pha
pha
pha
// [34] callexecute get -- jsr
// [34] callexecute get -- call_vprc1
jsr get
// [35] main::v = stackpull(struct Vector) -- vssz1=_stackpullstruct_4_
pla
@ -883,7 +883,7 @@ main: {
pha
lda.z v
pha
// [37] callexecute print -- jsr
// [37] callexecute print -- call_vprc1
jsr print
// sideeffect stackpullbytes(4) -- _stackpullbyte_4
tsx

16
src/test/ref/procedure-callingconvention-stack-12.log
View File

@ -1,10 +1,10 @@
Converting variable modified inside __stackcall procedure main() to load/store idx
Adding parameter assignment in __stackcall procedure print::spacing = param(print::spacing)
Adding parameter assignment in __stackcall procedure print::str = param(print::str)
Inlined call call __init
Inlined call call __init
Calling convention __stackcall adding prepare/execute/finalize for call print(main::str, 1)
Calling convention __stackcall adding prepare/execute/finalize for call print(main::str1, 2)
Calling convention __stackcall adding prepare/execute/finalize for call main
Calling convention __stackcall adding prepare/execute/finalize for call main
Calling convention STACK_CALL replacing param(print::str) with stackidx(byte*,print::OFFSET_STACK_STR)
Calling convention STACK_CALL replacing param(print::spacing) with stackidx(byte,print::OFFSET_STACK_SPACING)
Calling convention STACK_CALL adding stack push stackpush(byte*) = main::str
@ -337,7 +337,7 @@ __start: {
jmp __b1
// __start::@1
__b1:
// [3] callexecute main -- jsr
// [3] callexecute main -- call_vprc1
jsr main
jmp __breturn
// __start::@return
@ -430,7 +430,7 @@ main: {
// [19] stackpush(byte) = 1 -- _stackpushbyte_=vbuc1
lda #1
pha
// [20] callexecute print -- jsr
// [20] callexecute print -- call_vprc1
jsr print
// sideeffect stackpullbytes(3) -- _stackpullbyte_3
tsx
@ -446,7 +446,7 @@ main: {
// [23] stackpush(byte) = 2 -- _stackpushbyte_=vbuc1
lda #2
pha
// [24] callexecute print -- jsr
// [24] callexecute print -- call_vprc1
jsr print
// sideeffect stackpullbytes(3) -- _stackpullbyte_3
tsx
@ -545,7 +545,7 @@ __start: {
sta.z idx
// [2] phi from __start::__init1 to __start::@1 [phi:__start::__init1->__start::@1]
// __start::@1
// [3] callexecute main -- jsr
// [3] callexecute main -- call_vprc1
jsr main
// __start::@return
// [4] return
@ -637,7 +637,7 @@ main: {
// [19] stackpush(byte) = 1 -- _stackpushbyte_=vbuc1
lda #1
pha
// [20] callexecute print -- jsr
// [20] callexecute print -- call_vprc1
jsr print
// sideeffect stackpullbytes(3) -- _stackpullbyte_3
tsx
@ -654,7 +654,7 @@ main: {
// [23] stackpush(byte) = 2 -- _stackpushbyte_=vbuc1
lda #2
pha
// [24] callexecute print -- jsr
// [24] callexecute print -- call_vprc1
jsr print
// sideeffect stackpullbytes(3) -- _stackpullbyte_3
tsx

10
src/test/ref/procedure-callingconvention-stack-13.log
View File

@ -48,7 +48,7 @@ pow2::@return: scope:[pow2] from pow2::@1 pow2::@2
void __start()
__start: scope:[__start] from
call main
call main
to:__start::@1
__start::@1: scope:[__start] from __start
to:__start::@return
@ -246,7 +246,7 @@ pow2: {
sbc #1
// [3] stackpush(byte) = pow2::$1 -- _stackpushbyte_=vbuaa
pha
// [4] callexecute pow2 -- jsr
// [4] callexecute pow2 -- call_vprc1
jsr pow2
// [5] pow2::c#0 = stackpull(byte) -- vbuaa=_stackpullbyte_
pla
@ -274,7 +274,7 @@ main: {
// [10] stackpush(byte) = 6 -- _stackpushbyte_=vbuc1
lda #6
pha
// [11] callexecute pow2 -- jsr
// [11] callexecute pow2 -- call_vprc1
jsr pow2
// [12] main::$0 = stackpull(byte) -- vbuaa=_stackpullbyte_
pla
@ -363,7 +363,7 @@ pow2: {
// char c = pow2(n-1)
// [3] stackpush(byte) = pow2::$1 -- _stackpushbyte_=vbuaa
pha
// [4] callexecute pow2 -- jsr
// [4] callexecute pow2 -- call_vprc1
jsr pow2
// [5] pow2::c#0 = stackpull(byte) -- vbuaa=_stackpullbyte_
pla
@ -392,7 +392,7 @@ main: {
// [10] stackpush(byte) = 6 -- _stackpushbyte_=vbuc1
lda #6
pha
// [11] callexecute pow2 -- jsr
// [11] callexecute pow2 -- call_vprc1
jsr pow2
// [12] main::$0 = stackpull(byte) -- vbuaa=_stackpullbyte_
pla

6
src/test/ref/procedure-callingconvention-stack-2.log
View File

@ -39,7 +39,7 @@ plus::@return: scope:[plus] from plus
void __start()
__start: scope:[__start] from
call main
call main
to:__start::@1
__start::@1: scope:[__start] from __start
to:__start::@return
@ -262,7 +262,7 @@ main: {
pha
lda #<$2345
pha
// [7] callexecute plus -- jsr
// [7] callexecute plus -- call_vprc1
jsr plus
// sideeffect stackpullbytes(2) -- _stackpullbyte_2
pla
@ -386,7 +386,7 @@ main: {
pha
lda #<$2345
pha
// [7] callexecute plus -- jsr
// [7] callexecute plus -- call_vprc1
jsr plus
// sideeffect stackpullbytes(2) -- _stackpullbyte_2
pla

6
src/test/ref/procedure-callingconvention-stack-3.log
View File

@ -39,7 +39,7 @@ plus::@return: scope:[plus] from plus
void __start()
__start: scope:[__start] from
call main
call main
to:__start::@1
__start::@1: scope:[__start] from __start
to:__start::@return
@ -261,7 +261,7 @@ main: {
pha
lda #<7
pha
// [7] callexecute plus -- jsr
// [7] callexecute plus -- call_vprc1
jsr plus
// sideeffect stackpullbytes(2) -- _stackpullbyte_2
pla
@ -388,7 +388,7 @@ main: {
pha
lda #<7
pha
// [7] callexecute plus -- jsr
// [7] callexecute plus -- call_vprc1
jsr plus
// sideeffect stackpullbytes(2) -- _stackpullbyte_2
pla

14
src/test/ref/procedure-callingconvention-stack-4.log
View File

@ -1,7 +1,7 @@
Converting variable modified inside __stackcall procedure plus() to load/store i
Adding parameter assignment in __stackcall procedure plus::b = param(plus::b)
Adding parameter assignment in __stackcall procedure plus::a = param(plus::a)
Inlined call call __init
Inlined call call __init
Eliminating unused variable with no statement main::$0
Eliminating unused variable with no statement main::$1
Calling convention __stackcall adding prepare/execute/finalize for main::w = call plus('0', main::v)
@ -57,7 +57,7 @@ __start::__init1: scope:[__start] from __start
i = 0
to:__start::@1
__start::@1: scope:[__start] from __start::__init1
call main
call main
to:__start::@2
__start::@2: scope:[__start] from __start::@1
to:__start::@return
@ -149,7 +149,7 @@ __start::__init1: scope:[__start] from __start
to:__start::@1
__start::@1: scope:[__start] from __start::__init1
[2] phi()
[3] call main
[3] call main
to:__start::@return
__start::@return: scope:[__start] from __start::@1
[4] return
@ -324,7 +324,7 @@ __start: {
jmp __b1
// __start::@1
__b1:
// [3] call main
// [3] call main
// [11] phi from __start::@1 to main [phi:__start::@1->main]
main_from___b1:
jsr main
@ -386,7 +386,7 @@ main: {
// [15] stackpush(byte) = main::v#0 -- _stackpushbyte_=vbuxx
txa
pha
// [16] callexecute plus -- jsr
// [16] callexecute plus -- call_vprc1
jsr plus
// sideeffect stackpullbytes(1) -- _stackpullbyte_1
pla
@ -499,7 +499,7 @@ __start: {
sta.z i
// [2] phi from __start::__init1 to __start::@1 [phi:__start::__init1->__start::@1]
// __start::@1
// [3] call main
// [3] call main
// [11] phi from __start::@1 to main [phi:__start::@1->main]
jsr main
// __start::@return
@ -557,7 +557,7 @@ main: {
// [15] stackpush(byte) = main::v#0 -- _stackpushbyte_=vbuxx
txa
pha
// [16] callexecute plus -- jsr
// [16] callexecute plus -- call_vprc1
jsr plus
// sideeffect stackpullbytes(1) -- _stackpullbyte_1
pla

22
src/test/ref/procedure-callingconvention-stack-5.log
View File

@ -1,7 +1,7 @@
Converting variable modified inside __stackcall procedure next() to load/store current
Inlined call call __init
Calling convention __stackcall adding prepare/execute/finalize for main::$0 = call next
Calling convention __stackcall adding prepare/execute/finalize for main::$1 = call next
Inlined call call __init
Calling convention __stackcall adding prepare/execute/finalize for main::$0 = call next
Calling convention __stackcall adding prepare/execute/finalize for main::$1 = call next
Calling convention STACK_CALL adding stack return stackidx(signed word,next::OFFSET_STACK_RETURN_0) = next::return
Calling convention STACK_CALL adding stack pull main::$0 = stackpull(signed word)
Calling convention STACK_CALL adding stack pull main::$1 = stackpull(signed word)
@ -43,7 +43,7 @@ __start::__init1: scope:[__start] from __start
current = $30
to:__start::@1
__start::@1: scope:[__start] from __start::__init1
call main
call main
to:__start::@2
__start::@2: scope:[__start] from __start::@1
to:__start::@return
@ -127,7 +127,7 @@ __start::__init1: scope:[__start] from __start
to:__start::@1
__start::@1: scope:[__start] from __start::__init1
[2] phi()
[3] call main
[3] call main
to:__start::@return
__start::@return: scope:[__start] from __start::@1
[4] return
@ -245,7 +245,7 @@ __start: {
jmp __b1
// __start::@1
__b1:
// [3] call main
// [3] call main
jsr main
jmp __breturn
// __start::@return
@ -286,7 +286,7 @@ main: {
// sideeffect stackpushbytes(2) -- _stackpushbyte_2
pha
pha
// [10] callexecute next -- jsr
// [10] callexecute next -- call_vprc1
jsr next
// [11] main::$0 = stackpull(signed word) -- vwsz1=_stackpullsword_
pla
@ -301,7 +301,7 @@ main: {
// sideeffect stackpushbytes(2) -- _stackpushbyte_2
pha
pha
// [14] callexecute next -- jsr
// [14] callexecute next -- call_vprc1
jsr next
// [15] main::$1 = stackpull(signed word) -- vwsz1=_stackpullsword_
pla
@ -387,7 +387,7 @@ __start: {
sta.z current+1
// [2] phi from __start::__init1 to __start::@1 [phi:__start::__init1->__start::@1]
// __start::@1
// [3] call main
// [3] call main
jsr main
// __start::@return
// [4] return
@ -427,7 +427,7 @@ main: {
// sideeffect stackpushbytes(2) -- _stackpushbyte_2
pha
pha
// [10] callexecute next -- jsr
// [10] callexecute next -- call_vprc1
jsr next
// [11] main::$0 = stackpull(signed word) -- vwsz1=_stackpullsword_
pla
@ -444,7 +444,7 @@ main: {
// sideeffect stackpushbytes(2) -- _stackpushbyte_2
pha
pha
// [14] callexecute next -- jsr
// [14] callexecute next -- call_vprc1
jsr next
// [15] main::$1 = stackpull(signed word) -- vwsz1=_stackpullsword_
pla

12
src/test/ref/procedure-callingconvention-stack-7.log
View File

@ -1,5 +1,5 @@
Calling convention __stackcall adding prepare/execute/finalize for call printline
Calling convention __stackcall adding prepare/execute/finalize for call main
Calling convention __stackcall adding prepare/execute/finalize for call printline
Calling convention __stackcall adding prepare/execute/finalize for call main
CONTROL FLOW GRAPH SSA
@ -184,7 +184,7 @@ ASSEMBLER BEFORE OPTIMIZATION
.segment Code
// __start
__start: {
// [1] callexecute main -- jsr
// [1] callexecute main -- call_vprc1
jsr main
jmp __breturn
// __start::@return
@ -225,7 +225,7 @@ printline: {
main: {
// [9] main::val#1 = *SCREEN -- vbuyy=_deref_pbuc1
ldy SCREEN
// [10] callexecute printline -- jsr
// [10] callexecute printline -- call_vprc1
jsr printline
// [11] *(SCREEN+$50) = main::val#1 -- _deref_pbuc1=vbuyy
sty SCREEN+$50
@ -285,7 +285,7 @@ Score: 223
.segment Code
// __start
__start: {
// [1] callexecute main -- jsr
// [1] callexecute main -- call_vprc1
jsr main
// __start::@return
// [2] return
@ -325,7 +325,7 @@ main: {
// [9] main::val#1 = *SCREEN -- vbuyy=_deref_pbuc1
ldy SCREEN
// printline()
// [10] callexecute printline -- jsr
// [10] callexecute printline -- call_vprc1
jsr printline
// SCREEN[80] = val
// [11] *(SCREEN+$50) = main::val#1 -- _deref_pbuc1=vbuyy

14
src/test/ref/procedure-callingconvention-stack-8.log
View File

@ -1,7 +1,7 @@
Converting variable modified inside __stackcall procedure main() to load/store val
Inlined call call __init
Calling convention __stackcall adding prepare/execute/finalize for call printline
Calling convention __stackcall adding prepare/execute/finalize for call main
Inlined call call __init
Calling convention __stackcall adding prepare/execute/finalize for call printline
Calling convention __stackcall adding prepare/execute/finalize for call main
CONTROL FLOW GRAPH SSA
@ -212,7 +212,7 @@ __start: {
jmp __b1
// __start::@1
__b1:
// [3] callexecute main -- jsr
// [3] callexecute main -- call_vprc1
jsr main
jmp __breturn
// __start::@return
@ -254,7 +254,7 @@ main: {
// [11] val = '-' -- vbuz1=vbuc1
lda #'-'
sta.z val
// [12] callexecute printline -- jsr
// [12] callexecute printline -- call_vprc1
jsr printline
// [13] *(SCREEN+$50) = val -- _deref_pbuc1=vbuz1
lda.z val
@ -328,7 +328,7 @@ __start: {
sta.z val
// [2] phi from __start::__init1 to __start::@1 [phi:__start::__init1->__start::@1]
// __start::@1
// [3] callexecute main -- jsr
// [3] callexecute main -- call_vprc1
jsr main
// __start::@return
// [4] return
@ -369,7 +369,7 @@ main: {
lda #'-'
sta.z val
// printline()
// [12] callexecute printline -- jsr
// [12] callexecute printline -- call_vprc1
jsr printline
// SCREEN[80] = val
// [13] *(SCREEN+$50) = val -- _deref_pbuc1=vbuz1

38
src/test/ref/procedure-callingconvention-stack-9.log
View File

@ -1,11 +1,11 @@
Converting variable modified inside __stackcall procedure main() to load/store val
Inlined call call __init
Calling convention __stackcall adding prepare/execute/finalize for call pval
Calling convention __stackcall adding prepare/execute/finalize for call printother
Calling convention __stackcall adding prepare/execute/finalize for call ival
Calling convention __stackcall adding prepare/execute/finalize for call printval
Calling convention __stackcall adding prepare/execute/finalize for call incval
Calling convention __stackcall adding prepare/execute/finalize for call main
Inlined call call __init
Calling convention __stackcall adding prepare/execute/finalize for call pval
Calling convention __stackcall adding prepare/execute/finalize for call printother
Calling convention __stackcall adding prepare/execute/finalize for call ival
Calling convention __stackcall adding prepare/execute/finalize for call printval
Calling convention __stackcall adding prepare/execute/finalize for call incval
Calling convention __stackcall adding prepare/execute/finalize for call main
CONTROL FLOW GRAPH SSA
@ -346,7 +346,7 @@ __start: {
jmp __b1
// __start::@1
__b1:
// [3] callexecute main -- jsr
// [3] callexecute main -- call_vprc1
jsr main
jmp __breturn
// __start::@return
@ -403,7 +403,7 @@ printval: {
}
// ival
ival: {
// [16] callexecute incval -- jsr
// [16] callexecute incval -- call_vprc1
jsr incval
jmp __breturn
// ival::@return
@ -413,7 +413,7 @@ ival: {
}
// pval
pval: {
// [19] callexecute printval -- jsr
// [19] callexecute printval -- call_vprc1
jsr printval
jmp __breturn
// pval::@return
@ -434,11 +434,11 @@ main: {
jmp __b1
// main::@1
__b1:
// [23] callexecute pval -- jsr
// [23] callexecute pval -- call_vprc1
jsr pval
// [24] callexecute printother -- jsr
// [24] callexecute printother -- call_vprc1
jsr printother
// [25] callexecute ival -- jsr
// [25] callexecute ival -- call_vprc1
jsr ival
// [26] main::i#1 = ++ main::i#2 -- vbuyy=_inc_vbuyy
iny
@ -538,7 +538,7 @@ __start: {
sta.z val
// [2] phi from __start::__init1 to __start::@1 [phi:__start::__init1->__start::@1]
// __start::@1
// [3] callexecute main -- jsr
// [3] callexecute main -- call_vprc1
jsr main
// __start::@return
// [4] return
@ -591,7 +591,7 @@ printval: {
// ival
ival: {
// incval()
// [16] callexecute incval -- jsr
// [16] callexecute incval -- call_vprc1
jsr incval
// ival::@return
// }
@ -601,7 +601,7 @@ ival: {
// pval
pval: {
// printval()
// [19] callexecute printval -- jsr
// [19] callexecute printval -- call_vprc1
jsr printval
// pval::@return
// }
@ -618,13 +618,13 @@ main: {
// main::@1
__b1:
// pval()
// [23] callexecute pval -- jsr
// [23] callexecute pval -- call_vprc1
jsr pval
// printother()
// [24] callexecute printother -- jsr
// [24] callexecute printother -- call_vprc1
jsr printother
// ival()
// [25] callexecute ival -- jsr
// [25] callexecute ival -- call_vprc1
jsr ival
// for(char i:0..5)
// [26] main::i#1 = ++ main::i#2 -- vbuyy=_inc_vbuyy

12
src/test/ref/procedure-declare-8.log
View File

@ -1,4 +1,4 @@
Inlined call call __init
Inlined call call __init
Calling convention STACK_CALL adding prepare/execute/finalize for call *proc_ptr
Calling convention STACK_CALL adding prepare/execute/finalize for call *proc_ptr
@ -43,7 +43,7 @@ __start::__init1: scope:[__start] from __start
to:__start::@1
__start::@1: scope:[__start] from __start::__init1
proc_ptr#9 = phi( __start::__init1/proc_ptr#3 )
call main
call main
to:__start::@2
__start::@2: scope:[__start] from __start::@1
proc_ptr#7 = phi( __start::@1/proc_ptr#2 )
@ -193,14 +193,14 @@ ASSEMBLER BEFORE OPTIMIZATION
.segment Code
// main
main: {
// [1] callexecute proc1 -- jsr
// [1] callexecute proc1 -- call_vprc1
jsr proc1
// [2] phi from main to main::@1 [phi:main->main::@1]
__b1_from_main:
jmp __b1
// main::@1
__b1:
// [3] callexecute proc2 -- jsr
// [3] callexecute proc2 -- call_vprc1
jsr proc2
jmp __breturn
// main::@return
@ -275,12 +275,12 @@ Score: 42
// main
main: {
// (*proc_ptr)()
// [1] callexecute proc1 -- jsr
// [1] callexecute proc1 -- call_vprc1
jsr proc1
// [2] phi from main to main::@1 [phi:main->main::@1]
// main::@1
// (*proc_ptr)()
// [3] callexecute proc2 -- jsr
// [3] callexecute proc2 -- call_vprc1
jsr proc2
// main::@return
// }

10
src/test/ref/varcall-1.log
View File

@ -25,7 +25,7 @@ setbg::@return: scope:[setbg] from setbg
void __start()
__start: scope:[__start] from
call main
call main
to:__start::@1
__start::@1: scope:[__start] from __start
to:__start::@return
@ -147,12 +147,12 @@ main: {
// [2] setbg::col = 0 -- vbuz1=vbuc1
lda #0
sta.z setbg.col
// [3] callexecute setbg -- jsr
// [3] callexecute setbg -- call_vprc1
jsr setbg
// [4] setbg::col = $b -- vbuz1=vbuc1
lda #$b
sta.z setbg.col
// [5] callexecute setbg -- jsr
// [5] callexecute setbg -- call_vprc1
jsr setbg
jmp __breturn
// main::@return
@ -216,13 +216,13 @@ main: {
// [2] setbg::col = 0 -- vbuz1=vbuc1
lda #0
sta.z setbg.col
// [3] callexecute setbg -- jsr
// [3] callexecute setbg -- call_vprc1
jsr setbg
// setbg(0x0b)
// [4] setbg::col = $b -- vbuz1=vbuc1
lda #$b
sta.z setbg.col
// [5] callexecute setbg -- jsr
// [5] callexecute setbg -- call_vprc1
jsr setbg
// main::@return
// }

10
src/test/ref/varcall-2.log
View File

@ -40,7 +40,7 @@ plus::@return: scope:[plus] from plus
void __start()
__start: scope:[__start] from
call main
call main
to:__start::@1
__start::@1: scope:[__start] from __start
to:__start::@return
@ -234,7 +234,7 @@ main: {
// [5] plus::b = 1 -- vbuz1=vbuc1
lda #1
sta.z plus.b
// [6] callexecute plus -- jsr
// [6] callexecute plus -- call_vprc1
jsr plus
// [7] main::a#1 = plus::return -- vbuaa=vbuz1
lda.z plus.return
@ -244,7 +244,7 @@ main: {
sta.z plus.a
// [10] plus::b = main::a#1 -- vbuz1=vbuaa
sta.z plus.b
// [11] callexecute plus -- jsr
// [11] callexecute plus -- call_vprc1
jsr plus
// [12] main::a#2 = plus::return -- vbuaa=vbuz1
lda.z plus.return
@ -337,7 +337,7 @@ main: {
sta.z plus.a
// [5] plus::b = 1 -- vbuz1=vbuc1
sta.z plus.b
// [6] callexecute plus -- jsr
// [6] callexecute plus -- call_vprc1
jsr plus
// a = plus(a, 1)
// [7] main::a#1 = plus::return -- vbuaa=vbuz1
@ -350,7 +350,7 @@ main: {
sta.z plus.a
// [10] plus::b = main::a#1 -- vbuz1=vbuaa
sta.z plus.b
// [11] callexecute plus -- jsr
// [11] callexecute plus -- call_vprc1
jsr plus
// a = plus(a, a)
// [12] main::a#2 = plus::return -- vbuaa=vbuz1

10
src/test/ref/varcall-3.log
View File

@ -40,7 +40,7 @@ plus::@return: scope:[plus] from plus
void __start()
__start: scope:[__start] from
call main
call main
to:__start::@1
__start::@1: scope:[__start] from __start
to:__start::@return
@ -249,7 +249,7 @@ main: {
sta.z plus.b
lda #>$203
sta.z plus.b+1
// [6] callexecute plus -- jsr
// [6] callexecute plus -- call_vprc1
jsr plus
// [7] main::a#1 = plus::return -- vwsz1=vwsz2
lda.z plus.return
@ -267,7 +267,7 @@ main: {
lda.z a+1
sta.z plus.a+1
// [10] plus::b = main::a#1
// [11] callexecute plus -- jsr
// [11] callexecute plus -- call_vprc1
jsr plus
// [12] main::a#2 = plus::return
// [13] *BGCOL = main::a#2 -- _deref_pwsc1=vwsz1
@ -369,7 +369,7 @@ main: {
sta.z plus.b
lda #>$203
sta.z plus.b+1
// [6] callexecute plus -- jsr
// [6] callexecute plus -- call_vprc1
jsr plus
// a = plus(a, 0x0203)
// [7] main::a#1 = plus::return -- vwsz1=vwsz2
@ -390,7 +390,7 @@ main: {
lda.z a+1
sta.z plus.a+1
// [10] plus::b = main::a#1
// [11] callexecute plus -- jsr
// [11] callexecute plus -- call_vprc1
jsr plus
// a = plus(a, a)
// [12] main::a#2 = plus::return

10
src/test/ref/varcall-4.log
View File

@ -50,7 +50,7 @@ fg_sum::@return: scope:[fg_sum] from fg_sum
void __start()
__start: scope:[__start] from
call main
call main
to:__start::@1
__start::@1: scope:[__start] from __start
to:__start::@return
@ -333,7 +333,7 @@ main: {
// [8] fg_sum::b_fg = *((byte*)&b+OFFSET_STRUCT_COLS_FG) -- vbuz1=_deref_pbuc1
lda b+OFFSET_STRUCT_COLS_FG
sta.z fg_sum.b_fg
// [9] callexecute fg_sum -- jsr
// [9] callexecute fg_sum -- call_vprc1
jsr fg_sum
// [10] main::sum1#0 = fg_sum::return -- vbuaa=vbuz1
lda.z fg_sum.return
@ -364,7 +364,7 @@ main: {
// [18] fg_sum::b_fg = *((byte*)&d+OFFSET_STRUCT_COLS_FG) -- vbuz1=_deref_pbuc1
lda d+OFFSET_STRUCT_COLS_FG
sta.z fg_sum.b_fg
// [19] callexecute fg_sum -- jsr
// [19] callexecute fg_sum -- call_vprc1
jsr fg_sum
// [20] main::sum2#0 = fg_sum::return -- vbuaa=vbuz1
lda.z fg_sum.return
@ -496,7 +496,7 @@ main: {
// [8] fg_sum::b_fg = *((byte*)&b+OFFSET_STRUCT_COLS_FG) -- vbuz1=_deref_pbuc1
lda b+OFFSET_STRUCT_COLS_FG
sta.z fg_sum.b_fg
// [9] callexecute fg_sum -- jsr
// [9] callexecute fg_sum -- call_vprc1
jsr fg_sum
// [10] main::sum1#0 = fg_sum::return -- vbuaa=vbuz1
lda.z fg_sum.return
@ -530,7 +530,7 @@ main: {
// [18] fg_sum::b_fg = *((byte*)&d+OFFSET_STRUCT_COLS_FG) -- vbuz1=_deref_pbuc1
lda d+OFFSET_STRUCT_COLS_FG
sta.z fg_sum.b_fg
// [19] callexecute fg_sum -- jsr
// [19] callexecute fg_sum -- call_vprc1
jsr fg_sum
// [20] main::sum2#0 = fg_sum::return -- vbuaa=vbuz1
lda.z fg_sum.return