mirror of
https://gitlab.com/camelot/kickc.git
synced 2025-04-05 07:40:39 +00:00
Fixed exception in pass 2 casued by constant function parameter. Closes #561
This commit is contained in:
jespergravgaard
parent
279cc322b7
commit
85dcf992df
@ -124,7 +124,7 @@ public class Procedure extends Scope {
|
||||
public List<Variable> getParameters() {
|
||||
ArrayList<Variable> parameters = new ArrayList<>();
|
||||
for(String name : parameterNames) {
|
||||
parameters.add(this.getLocalVariable(name));
|
||||
parameters.add(this.getLocalVar(name));
|
||||
}
|
||||
return parameters;
|
||||
}
|
||||
|
||||
@ -45,6 +45,11 @@ public class TestPrograms {
|
||||
}
|
||||
|
||||
|
||||
@Test
|
||||
public void testFunctionPointerProblem1() throws IOException, URISyntaxException {
|
||||
compileAndCompare("function-pointer-problem-1.c");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testInlineKickasmUsesProblem() throws IOException, URISyntaxException {
|
||||
compileAndCompare("inline-kickasm-uses-problem.c");
|
||||
@ -3098,6 +3103,11 @@ public class TestPrograms {
|
||||
compileAndCompare("pointer-pointer-1.c");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testFunctionPointerNoargCall14() throws IOException, URISyntaxException {
|
||||
compileAndCompare("function-pointer-noarg-call-14.c");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testFunctionPointerNoargCall13() throws IOException, URISyntaxException {
|
||||
compileAndCompare("function-pointer-noarg-call-13.c");
|
||||
|
||||
22
src/test/kc/function-pointer-noarg-call-14.c
Normal file
22
src/test/kc/function-pointer-noarg-call-14.c
Normal file
@ -0,0 +1,22 @@
|
||||
// Tests trouble passing a function pointer
|
||||
|
||||
#include <stdio.h>
|
||||
#include <printf.h>
|
||||
#include <conio.h>
|
||||
|
||||
void f1(void()* fn) {
|
||||
(*fn)();
|
||||
}
|
||||
|
||||
void hello() {
|
||||
printf("hello ");
|
||||
}
|
||||
|
||||
void world() {
|
||||
printf("world!");
|
||||
}
|
||||
|
||||
void main() {
|
||||
f1(&hello);
|
||||
f1(&world);
|
||||
}
|
||||
25
src/test/kc/function-pointer-problem-1.c
Normal file
25
src/test/kc/function-pointer-problem-1.c
Normal file
@ -0,0 +1,25 @@
|
||||
// The following casuses an exception in pass 2
|
||||
// https://gitlab.com/camelot/kickc/-/issues/561
|
||||
|
||||
char const * r = 0x8000;
|
||||
|
||||
void main() {
|
||||
enableDLI(&fn1);
|
||||
}
|
||||
|
||||
void fn1() {
|
||||
*r = 1;
|
||||
}
|
||||
|
||||
void enableDLI(__ma void *dliptr) {
|
||||
asm {
|
||||
lda #<dliptr
|
||||
sta dlivec
|
||||
lda #>dliptr
|
||||
sta dlivec+1
|
||||
|
||||
jmp !+
|
||||
dlivec: .byte 0, 0
|
||||
!:
|
||||
}
|
||||
}
|
||||
305
src/test/ref/function-pointer-noarg-call-14.asm
Normal file
305
src/test/ref/function-pointer-noarg-call-14.asm
Normal file
@ -0,0 +1,305 @@
|
||||
// Tests trouble passing a function pointer
|
||||
.pc = $801 "Basic"
|
||||
:BasicUpstart(__start)
|
||||
.pc = $80d "Program"
|
||||
.const LIGHT_BLUE = $e
|
||||
// Color Ram
|
||||
.label COLORRAM = $d800
|
||||
// Default address of screen character matrix
|
||||
.label DEFAULT_SCREEN = $400
|
||||
// The number of bytes on the screen
|
||||
// The current cursor x-position
|
||||
.label conio_cursor_x = 8
|
||||
// The current cursor y-position
|
||||
.label conio_cursor_y = 9
|
||||
// The current text cursor line start
|
||||
.label conio_line_text = $a
|
||||
// The current color cursor line start
|
||||
.label conio_line_color = $c
|
||||
__start: {
|
||||
// conio_cursor_x = 0
|
||||
lda #0
|
||||
sta.z conio_cursor_x
|
||||
// conio_cursor_y = 0
|
||||
sta.z conio_cursor_y
|
||||
// conio_line_text = CONIO_SCREEN_TEXT
|
||||
lda #<DEFAULT_SCREEN
|
||||
sta.z conio_line_text
|
||||
lda #>DEFAULT_SCREEN
|
||||
sta.z conio_line_text+1
|
||||
// conio_line_color = CONIO_SCREEN_COLORS
|
||||
lda #<COLORRAM
|
||||
sta.z conio_line_color
|
||||
lda #>COLORRAM
|
||||
sta.z conio_line_color+1
|
||||
jsr main
|
||||
rts
|
||||
}
|
||||
world: {
|
||||
// printf("world!")
|
||||
lda #<s
|
||||
sta.z cputs.s
|
||||
lda #>s
|
||||
sta.z cputs.s+1
|
||||
jsr cputs
|
||||
// }
|
||||
rts
|
||||
s: .text "world!"
|
||||
.byte 0
|
||||
}
|
||||
hello: {
|
||||
// printf("hello ")
|
||||
lda #<s
|
||||
sta.z cputs.s
|
||||
lda #>s
|
||||
sta.z cputs.s+1
|
||||
jsr cputs
|
||||
// }
|
||||
rts
|
||||
s: .text "hello "
|
||||
.byte 0
|
||||
}
|
||||
main: {
|
||||
// f1(&hello)
|
||||
lda #<hello
|
||||
sta.z f1.fn
|
||||
lda #>hello
|
||||
sta.z f1.fn+1
|
||||
jsr f1
|
||||
// f1(&world)
|
||||
lda #<world
|
||||
sta.z f1.fn
|
||||
lda #>world
|
||||
sta.z f1.fn+1
|
||||
jsr f1
|
||||
// }
|
||||
rts
|
||||
}
|
||||
// Output a NUL-terminated string at the current cursor position
|
||||
// cputs(byte* zp(2) s)
|
||||
cputs: {
|
||||
.label s = 2
|
||||
__b1:
|
||||
// while(c=*s++)
|
||||
ldy #0
|
||||
lda (s),y
|
||||
inc.z s
|
||||
bne !+
|
||||
inc.z s+1
|
||||
!:
|
||||
cmp #0
|
||||
bne __b2
|
||||
// }
|
||||
rts
|
||||
__b2:
|
||||
// cputc(c)
|
||||
jsr cputc
|
||||
jmp __b1
|
||||
}
|
||||
// f1(void()* zp(4) fn)
|
||||
f1: {
|
||||
.label fn = 4
|
||||
// (*fn)()
|
||||
jsr bi_fn
|
||||
// }
|
||||
rts
|
||||
bi_fn:
|
||||
jmp (fn)
|
||||
}
|
||||
// Output one character at the current cursor position
|
||||
// Moves the cursor forward. Scrolls the entire screen if needed
|
||||
// cputc(byte register(A) c)
|
||||
cputc: {
|
||||
// if(c=='\n')
|
||||
cmp #'\n'
|
||||
beq __b1
|
||||
// conio_line_text[conio_cursor_x] = c
|
||||
ldy.z conio_cursor_x
|
||||
sta (conio_line_text),y
|
||||
// conio_line_color[conio_cursor_x] = conio_textcolor
|
||||
lda #LIGHT_BLUE
|
||||
sta (conio_line_color),y
|
||||
// if(++conio_cursor_x==CONIO_WIDTH)
|
||||
inc.z conio_cursor_x
|
||||
lda #$28
|
||||
cmp.z conio_cursor_x
|
||||
bne __breturn
|
||||
// cputln()
|
||||
jsr cputln
|
||||
__breturn:
|
||||
// }
|
||||
rts
|
||||
__b1:
|
||||
// cputln()
|
||||
jsr cputln
|
||||
rts
|
||||
}
|
||||
// Print a newline
|
||||
cputln: {
|
||||
// conio_line_text += CONIO_WIDTH
|
||||
lda #$28
|
||||
clc
|
||||
adc.z conio_line_text
|
||||
sta.z conio_line_text
|
||||
bcc !+
|
||||
inc.z conio_line_text+1
|
||||
!:
|
||||
// conio_line_color += CONIO_WIDTH
|
||||
lda #$28
|
||||
clc
|
||||
adc.z conio_line_color
|
||||
sta.z conio_line_color
|
||||
bcc !+
|
||||
inc.z conio_line_color+1
|
||||
!:
|
||||
// conio_cursor_x = 0
|
||||
lda #0
|
||||
sta.z conio_cursor_x
|
||||
// conio_cursor_y++;
|
||||
inc.z conio_cursor_y
|
||||
// cscroll()
|
||||
jsr cscroll
|
||||
// }
|
||||
rts
|
||||
}
|
||||
// Scroll the entire screen if the cursor is beyond the last line
|
||||
cscroll: {
|
||||
// if(conio_cursor_y==CONIO_HEIGHT)
|
||||
lda #$19
|
||||
cmp.z conio_cursor_y
|
||||
bne __breturn
|
||||
// memcpy(CONIO_SCREEN_TEXT, CONIO_SCREEN_TEXT+CONIO_WIDTH, CONIO_BYTES-CONIO_WIDTH)
|
||||
lda #<DEFAULT_SCREEN
|
||||
sta.z memcpy.destination
|
||||
lda #>DEFAULT_SCREEN
|
||||
sta.z memcpy.destination+1
|
||||
lda #<DEFAULT_SCREEN+$28
|
||||
sta.z memcpy.source
|
||||
lda #>DEFAULT_SCREEN+$28
|
||||
sta.z memcpy.source+1
|
||||
jsr memcpy
|
||||
// memcpy(CONIO_SCREEN_COLORS, CONIO_SCREEN_COLORS+CONIO_WIDTH, CONIO_BYTES-CONIO_WIDTH)
|
||||
lda #<COLORRAM
|
||||
sta.z memcpy.destination
|
||||
lda #>COLORRAM
|
||||
sta.z memcpy.destination+1
|
||||
lda #<COLORRAM+$28
|
||||
sta.z memcpy.source
|
||||
lda #>COLORRAM+$28
|
||||
sta.z memcpy.source+1
|
||||
jsr memcpy
|
||||
// memset(CONIO_SCREEN_TEXT+CONIO_BYTES-CONIO_WIDTH, ' ', CONIO_WIDTH)
|
||||
ldx #' '
|
||||
lda #<DEFAULT_SCREEN+$19*$28-$28
|
||||
sta.z memset.str
|
||||
lda #>DEFAULT_SCREEN+$19*$28-$28
|
||||
sta.z memset.str+1
|
||||
jsr memset
|
||||
// memset(CONIO_SCREEN_COLORS+CONIO_BYTES-CONIO_WIDTH, conio_textcolor, CONIO_WIDTH)
|
||||
ldx #LIGHT_BLUE
|
||||
lda #<COLORRAM+$19*$28-$28
|
||||
sta.z memset.str
|
||||
lda #>COLORRAM+$19*$28-$28
|
||||
sta.z memset.str+1
|
||||
jsr memset
|
||||
// conio_line_text -= CONIO_WIDTH
|
||||
sec
|
||||
lda.z conio_line_text
|
||||
sbc #$28
|
||||
sta.z conio_line_text
|
||||
lda.z conio_line_text+1
|
||||
sbc #0
|
||||
sta.z conio_line_text+1
|
||||
// conio_line_color -= CONIO_WIDTH
|
||||
sec
|
||||
lda.z conio_line_color
|
||||
sbc #$28
|
||||
sta.z conio_line_color
|
||||
lda.z conio_line_color+1
|
||||
sbc #0
|
||||
sta.z conio_line_color+1
|
||||
// conio_cursor_y--;
|
||||
dec.z conio_cursor_y
|
||||
__breturn:
|
||||
// }
|
||||
rts
|
||||
}
|
||||
// Copy block of memory (forwards)
|
||||
// Copies the values of num bytes from the location pointed to by source directly to the memory block pointed to by destination.
|
||||
// memcpy(void* zp($10) destination, void* zp(6) source)
|
||||
memcpy: {
|
||||
.label src_end = $e
|
||||
.label dst = $10
|
||||
.label src = 6
|
||||
.label source = 6
|
||||
.label destination = $10
|
||||
// src_end = (char*)source+num
|
||||
clc
|
||||
lda.z source
|
||||
adc #<$19*$28-$28
|
||||
sta.z src_end
|
||||
lda.z source+1
|
||||
adc #>$19*$28-$28
|
||||
sta.z src_end+1
|
||||
__b1:
|
||||
// while(src!=src_end)
|
||||
lda.z src+1
|
||||
cmp.z src_end+1
|
||||
bne __b2
|
||||
lda.z src
|
||||
cmp.z src_end
|
||||
bne __b2
|
||||
// }
|
||||
rts
|
||||
__b2:
|
||||
// *dst++ = *src++
|
||||
ldy #0
|
||||
lda (src),y
|
||||
sta (dst),y
|
||||
// *dst++ = *src++;
|
||||
inc.z dst
|
||||
bne !+
|
||||
inc.z dst+1
|
||||
!:
|
||||
inc.z src
|
||||
bne !+
|
||||
inc.z src+1
|
||||
!:
|
||||
jmp __b1
|
||||
}
|
||||
// Copies the character c (an unsigned char) to the first num characters of the object pointed to by the argument str.
|
||||
// memset(void* zp(6) str, byte register(X) c)
|
||||
memset: {
|
||||
.label end = $10
|
||||
.label dst = 6
|
||||
.label str = 6
|
||||
// end = (char*)str + num
|
||||
lda #$28
|
||||
clc
|
||||
adc.z str
|
||||
sta.z end
|
||||
lda #0
|
||||
adc.z str+1
|
||||
sta.z end+1
|
||||
__b2:
|
||||
// for(char* dst = str; dst!=end; dst++)
|
||||
lda.z dst+1
|
||||
cmp.z end+1
|
||||
bne __b3
|
||||
lda.z dst
|
||||
cmp.z end
|
||||
bne __b3
|
||||
// }
|
||||
rts
|
||||
__b3:
|
||||
// *dst = c
|
||||
txa
|
||||
ldy #0
|
||||
sta (dst),y
|
||||
// for(char* dst = str; dst!=end; dst++)
|
||||
inc.z dst
|
||||
bne !+
|
||||
inc.z dst+1
|
||||
!:
|
||||
jmp __b2
|
||||
}
|
||||
183
src/test/ref/function-pointer-noarg-call-14.cfg
Normal file
183
src/test/ref/function-pointer-noarg-call-14.cfg
Normal file
@ -0,0 +1,183 @@
|
||||
|
||||
void __start()
|
||||
__start: scope:[__start] from
|
||||
[0] phi()
|
||||
to:__start::__init1
|
||||
__start::__init1: scope:[__start] from __start
|
||||
[1] conio_cursor_x = 0
|
||||
[2] conio_cursor_y = 0
|
||||
[3] conio_line_text = DEFAULT_SCREEN
|
||||
[4] conio_line_color = COLORRAM
|
||||
to:__start::@1
|
||||
__start::@1: scope:[__start] from __start::__init1
|
||||
[5] phi()
|
||||
[6] call main
|
||||
to:__start::@return
|
||||
__start::@return: scope:[__start] from __start::@1
|
||||
[7] return
|
||||
to:@return
|
||||
|
||||
void world()
|
||||
world: scope:[world] from
|
||||
[8] phi()
|
||||
[9] call cputs
|
||||
to:world::@return
|
||||
world::@return: scope:[world] from world
|
||||
[10] return
|
||||
to:@return
|
||||
|
||||
void hello()
|
||||
hello: scope:[hello] from
|
||||
[11] phi()
|
||||
[12] call cputs
|
||||
to:hello::@return
|
||||
hello::@return: scope:[hello] from hello
|
||||
[13] return
|
||||
to:@return
|
||||
|
||||
void main()
|
||||
main: scope:[main] from __start::@1
|
||||
[14] phi()
|
||||
[15] call f1
|
||||
to:main::@1
|
||||
main::@1: scope:[main] from main
|
||||
[16] phi()
|
||||
[17] call f1
|
||||
to:main::@return
|
||||
main::@return: scope:[main] from main::@1
|
||||
[18] return
|
||||
to:@return
|
||||
|
||||
void cputs(to_nomodify byte* cputs::s)
|
||||
cputs: scope:[cputs] from hello world
|
||||
[19] cputs::s#4 = phi( hello/hello::s, world/world::s )
|
||||
to:cputs::@1
|
||||
cputs::@1: scope:[cputs] from cputs cputs::@2
|
||||
[20] cputs::s#3 = phi( cputs/cputs::s#4, cputs::@2/cputs::s#0 )
|
||||
[21] cputs::c#1 = *cputs::s#3
|
||||
[22] cputs::s#0 = ++ cputs::s#3
|
||||
[23] if(0!=cputs::c#1) goto cputs::@2
|
||||
to:cputs::@return
|
||||
cputs::@return: scope:[cputs] from cputs::@1
|
||||
[24] return
|
||||
to:@return
|
||||
cputs::@2: scope:[cputs] from cputs::@1
|
||||
[25] cputc::c#0 = cputs::c#1
|
||||
[26] call cputc
|
||||
to:cputs::@1
|
||||
|
||||
void f1(void()* f1::fn)
|
||||
f1: scope:[f1] from main main::@1
|
||||
[27] f1::fn#2 = phi( main/&hello, main::@1/&world )
|
||||
[28] call *f1::fn#2
|
||||
to:f1::@return
|
||||
f1::@return: scope:[f1] from f1
|
||||
[29] return
|
||||
to:@return
|
||||
|
||||
void cputc(byte cputc::c)
|
||||
cputc: scope:[cputc] from cputs::@2
|
||||
[30] if(cputc::c#0=='
|
||||
') goto cputc::@1
|
||||
to:cputc::@2
|
||||
cputc::@2: scope:[cputc] from cputc
|
||||
[31] conio_line_text[conio_cursor_x] = cputc::c#0
|
||||
[32] conio_line_color[conio_cursor_x] = LIGHT_BLUE
|
||||
[33] conio_cursor_x = ++ conio_cursor_x
|
||||
[34] if(conio_cursor_x!=$28) goto cputc::@return
|
||||
to:cputc::@3
|
||||
cputc::@3: scope:[cputc] from cputc::@2
|
||||
[35] phi()
|
||||
[36] call cputln
|
||||
to:cputc::@return
|
||||
cputc::@return: scope:[cputc] from cputc::@1 cputc::@2 cputc::@3
|
||||
[37] return
|
||||
to:@return
|
||||
cputc::@1: scope:[cputc] from cputc
|
||||
[38] phi()
|
||||
[39] call cputln
|
||||
to:cputc::@return
|
||||
|
||||
void cputln()
|
||||
cputln: scope:[cputln] from cputc::@1 cputc::@3
|
||||
[40] conio_line_text = conio_line_text + $28
|
||||
[41] conio_line_color = conio_line_color + $28
|
||||
[42] conio_cursor_x = 0
|
||||
[43] conio_cursor_y = ++ conio_cursor_y
|
||||
[44] call cscroll
|
||||
to:cputln::@return
|
||||
cputln::@return: scope:[cputln] from cputln
|
||||
[45] return
|
||||
to:@return
|
||||
|
||||
void cscroll()
|
||||
cscroll: scope:[cscroll] from cputln
|
||||
[46] if(conio_cursor_y!=$19) goto cscroll::@return
|
||||
to:cscroll::@1
|
||||
cscroll::@1: scope:[cscroll] from cscroll
|
||||
[47] phi()
|
||||
[48] call memcpy
|
||||
to:cscroll::@2
|
||||
cscroll::@2: scope:[cscroll] from cscroll::@1
|
||||
[49] phi()
|
||||
[50] call memcpy
|
||||
to:cscroll::@3
|
||||
cscroll::@3: scope:[cscroll] from cscroll::@2
|
||||
[51] phi()
|
||||
[52] call memset
|
||||
to:cscroll::@4
|
||||
cscroll::@4: scope:[cscroll] from cscroll::@3
|
||||
[53] phi()
|
||||
[54] call memset
|
||||
to:cscroll::@5
|
||||
cscroll::@5: scope:[cscroll] from cscroll::@4
|
||||
[55] conio_line_text = conio_line_text - $28
|
||||
[56] conio_line_color = conio_line_color - $28
|
||||
[57] conio_cursor_y = -- conio_cursor_y
|
||||
to:cscroll::@return
|
||||
cscroll::@return: scope:[cscroll] from cscroll cscroll::@5
|
||||
[58] return
|
||||
to:@return
|
||||
|
||||
void* memcpy(void* memcpy::destination , void* memcpy::source , word memcpy::num)
|
||||
memcpy: scope:[memcpy] from cscroll::@1 cscroll::@2
|
||||
[59] memcpy::destination#2 = phi( cscroll::@1/(void*)DEFAULT_SCREEN, cscroll::@2/(void*)COLORRAM )
|
||||
[59] memcpy::source#2 = phi( cscroll::@1/(void*)DEFAULT_SCREEN+$28, cscroll::@2/(void*)COLORRAM+$28 )
|
||||
[60] memcpy::src_end#0 = (byte*)memcpy::source#2 + (word)$19*$28-$28
|
||||
[61] memcpy::src#4 = (byte*)memcpy::source#2
|
||||
[62] memcpy::dst#4 = (byte*)memcpy::destination#2
|
||||
to:memcpy::@1
|
||||
memcpy::@1: scope:[memcpy] from memcpy memcpy::@2
|
||||
[63] memcpy::dst#2 = phi( memcpy/memcpy::dst#4, memcpy::@2/memcpy::dst#1 )
|
||||
[63] memcpy::src#2 = phi( memcpy/memcpy::src#4, memcpy::@2/memcpy::src#1 )
|
||||
[64] if(memcpy::src#2!=memcpy::src_end#0) goto memcpy::@2
|
||||
to:memcpy::@return
|
||||
memcpy::@return: scope:[memcpy] from memcpy::@1
|
||||
[65] return
|
||||
to:@return
|
||||
memcpy::@2: scope:[memcpy] from memcpy::@1
|
||||
[66] *memcpy::dst#2 = *memcpy::src#2
|
||||
[67] memcpy::dst#1 = ++ memcpy::dst#2
|
||||
[68] memcpy::src#1 = ++ memcpy::src#2
|
||||
to:memcpy::@1
|
||||
|
||||
void* memset(void* memset::str , byte memset::c , word memset::num)
|
||||
memset: scope:[memset] from cscroll::@3 cscroll::@4
|
||||
[69] memset::c#4 = phi( cscroll::@3/' ', cscroll::@4/LIGHT_BLUE )
|
||||
[69] memset::str#3 = phi( cscroll::@3/(void*)DEFAULT_SCREEN+(word)$19*$28-$28, cscroll::@4/(void*)COLORRAM+(word)$19*$28-$28 )
|
||||
to:memset::@1
|
||||
memset::@1: scope:[memset] from memset
|
||||
[70] memset::end#0 = (byte*)memset::str#3 + $28
|
||||
[71] memset::dst#4 = (byte*)memset::str#3
|
||||
to:memset::@2
|
||||
memset::@2: scope:[memset] from memset::@1 memset::@3
|
||||
[72] memset::dst#2 = phi( memset::@1/memset::dst#4, memset::@3/memset::dst#1 )
|
||||
[73] if(memset::dst#2!=memset::end#0) goto memset::@3
|
||||
to:memset::@return
|
||||
memset::@return: scope:[memset] from memset::@2
|
||||
[74] return
|
||||
to:@return
|
||||
memset::@3: scope:[memset] from memset::@2
|
||||
[75] *memset::dst#2 = memset::c#4
|
||||
[76] memset::dst#1 = ++ memset::dst#2
|
||||
to:memset::@2
|
||||
2312
src/test/ref/function-pointer-noarg-call-14.log
Normal file
2312
src/test/ref/function-pointer-noarg-call-14.log
Normal file
File diff suppressed because it is too large
Load Diff
75
src/test/ref/function-pointer-noarg-call-14.sym
Normal file
75
src/test/ref/function-pointer-noarg-call-14.sym
Normal file
@ -0,0 +1,75 @@
|
||||
const nomodify byte* COLORRAM = (byte*) 55296
|
||||
const nomodify byte* DEFAULT_SCREEN = (byte*) 1024
|
||||
const nomodify byte LIGHT_BLUE = $e
|
||||
const byte RADIX::BINARY = 2
|
||||
const byte RADIX::DECIMAL = $a
|
||||
const byte RADIX::HEXADECIMAL = $10
|
||||
const byte RADIX::OCTAL = 8
|
||||
void __start()
|
||||
byte conio_cursor_x loadstore zp[1]:8 714.6666666666666
|
||||
byte conio_cursor_y loadstore zp[1]:9 8421.236842105263
|
||||
byte* conio_line_color loadstore zp[2]:12 5815.973684210527
|
||||
byte* conio_line_text loadstore zp[2]:10 5815.973684210527
|
||||
void cputc(byte cputc::c)
|
||||
byte cputc::c
|
||||
byte cputc::c#0 reg byte a 1051.5
|
||||
void cputln()
|
||||
void cputs(to_nomodify byte* cputs::s)
|
||||
byte cputs::c
|
||||
byte cputs::c#1 reg byte a 101.0
|
||||
to_nomodify byte* cputs::s
|
||||
to_nomodify byte* cputs::s#0 s zp[2]:2 50.5
|
||||
to_nomodify byte* cputs::s#3 s zp[2]:2 157.0
|
||||
to_nomodify byte* cputs::s#4 s zp[2]:2 11.0
|
||||
void cscroll()
|
||||
void f1(void()* f1::fn)
|
||||
void()* f1::fn
|
||||
void()* f1::fn#2 fn zp[2]:4
|
||||
void hello()
|
||||
const byte* hello::s[7] = "hello "
|
||||
void main()
|
||||
void* memcpy(void* memcpy::destination , void* memcpy::source , word memcpy::num)
|
||||
void* memcpy::destination
|
||||
void* memcpy::destination#2 destination zp[2]:16
|
||||
byte* memcpy::dst
|
||||
byte* memcpy::dst#1 dst zp[2]:16 1.00000001E8
|
||||
byte* memcpy::dst#2 dst zp[2]:16 1.0033333466666667E8
|
||||
byte* memcpy::dst#4 dst zp[2]:16 2000002.0
|
||||
word memcpy::num
|
||||
void* memcpy::return
|
||||
void* memcpy::source
|
||||
void* memcpy::source#2 source zp[2]:6
|
||||
byte* memcpy::src
|
||||
byte* memcpy::src#1 src zp[2]:6 2.00000002E8
|
||||
byte* memcpy::src#2 src zp[2]:6 1.0025000125E8
|
||||
byte* memcpy::src#4 src zp[2]:6 1000001.0
|
||||
byte* memcpy::src_end
|
||||
byte* memcpy::src_end#0 src_end zp[2]:14 1.262500025E7
|
||||
void* memset(void* memset::str , byte memset::c , word memset::num)
|
||||
byte memset::c
|
||||
byte memset::c#4 reg byte x 1.428571442857143E7
|
||||
byte* memset::dst
|
||||
byte* memset::dst#1 dst zp[2]:6 2.00000002E8
|
||||
byte* memset::dst#2 dst zp[2]:6 1.3366666833333334E8
|
||||
byte* memset::dst#4 dst zp[2]:6 2000002.0
|
||||
byte* memset::end
|
||||
byte* memset::end#0 end zp[2]:16 1.6833333666666668E7
|
||||
word memset::num
|
||||
void* memset::return
|
||||
void* memset::str
|
||||
void* memset::str#3 str zp[2]:6
|
||||
void world()
|
||||
const byte* world::s[7] = "world!"
|
||||
|
||||
zp[2]:2 [ cputs::s#3 cputs::s#4 cputs::s#0 ]
|
||||
zp[2]:4 [ f1::fn#2 ]
|
||||
zp[2]:6 [ memset::str#3 memset::dst#2 memset::dst#4 memset::dst#1 memcpy::source#2 memcpy::src#2 memcpy::src#4 memcpy::src#1 ]
|
||||
reg byte x [ memset::c#4 ]
|
||||
zp[1]:8 [ conio_cursor_x ]
|
||||
zp[1]:9 [ conio_cursor_y ]
|
||||
zp[2]:10 [ conio_line_text ]
|
||||
zp[2]:12 [ conio_line_color ]
|
||||
reg byte a [ cputs::c#1 ]
|
||||
reg byte a [ cputc::c#0 ]
|
||||
zp[2]:14 [ memcpy::src_end#0 ]
|
||||
zp[2]:16 [ memset::end#0 memcpy::destination#2 memcpy::dst#2 memcpy::dst#4 memcpy::dst#1 ]
|
||||
34
src/test/ref/function-pointer-problem-1.asm
Normal file
34
src/test/ref/function-pointer-problem-1.asm
Normal file
@ -0,0 +1,34 @@
|
||||
// The following casuses an exception in pass 2
|
||||
// https://gitlab.com/camelot/kickc/-/issues/561
|
||||
.pc = $801 "Basic"
|
||||
:BasicUpstart(main)
|
||||
.pc = $80d "Program"
|
||||
.label r = $8000
|
||||
fn1: {
|
||||
// *r = 1
|
||||
lda #1
|
||||
sta r
|
||||
// }
|
||||
rts
|
||||
}
|
||||
main: {
|
||||
// enableDLI(&fn1)
|
||||
jsr enableDLI
|
||||
// }
|
||||
rts
|
||||
}
|
||||
// enableDLI(void* dliptr)
|
||||
enableDLI: {
|
||||
.label dliptr = fn1
|
||||
// asm
|
||||
lda #<dliptr
|
||||
sta dlivec
|
||||
lda #>dliptr
|
||||
sta dlivec+1
|
||||
jmp !+
|
||||
dlivec:
|
||||
.byte 0, 0
|
||||
!:
|
||||
// }
|
||||
rts
|
||||
}
|
||||
25
src/test/ref/function-pointer-problem-1.cfg
Normal file
25
src/test/ref/function-pointer-problem-1.cfg
Normal file
@ -0,0 +1,25 @@
|
||||
|
||||
void fn1()
|
||||
fn1: scope:[fn1] from
|
||||
[0] *r = 1
|
||||
to:fn1::@return
|
||||
fn1::@return: scope:[fn1] from fn1
|
||||
[1] return
|
||||
to:@return
|
||||
|
||||
void main()
|
||||
main: scope:[main] from
|
||||
[2] phi()
|
||||
[3] call enableDLI
|
||||
to:main::@return
|
||||
main::@return: scope:[main] from main
|
||||
[4] return
|
||||
to:@return
|
||||
|
||||
void enableDLI(const void* enableDLI::dliptr)
|
||||
enableDLI: scope:[enableDLI] from main
|
||||
asm { lda#<dliptr stadlivec lda#>dliptr stadlivec+1 jmp!+ dlivec: .byte0,0 !: }
|
||||
to:enableDLI::@return
|
||||
enableDLI::@return: scope:[enableDLI] from enableDLI
|
||||
[6] return
|
||||
to:@return
|
||||
257
src/test/ref/function-pointer-problem-1.log
Normal file
257
src/test/ref/function-pointer-problem-1.log
Normal file
@ -0,0 +1,257 @@
|
||||
Resolved forward reference fn1 to void fn1()
|
||||
Inlined call call __init
|
||||
|
||||
CONTROL FLOW GRAPH SSA
|
||||
|
||||
void main()
|
||||
main: scope:[main] from __start::@1
|
||||
enableDLI::dliptr = (void*)&fn1
|
||||
call enableDLI
|
||||
to:main::@1
|
||||
main::@1: scope:[main] from main
|
||||
to:main::@return
|
||||
main::@return: scope:[main] from main::@1
|
||||
return
|
||||
to:@return
|
||||
|
||||
void fn1()
|
||||
fn1: scope:[fn1] from
|
||||
*r = 1
|
||||
to:fn1::@return
|
||||
fn1::@return: scope:[fn1] from fn1
|
||||
return
|
||||
to:@return
|
||||
|
||||
void enableDLI(void* enableDLI::dliptr)
|
||||
enableDLI: scope:[enableDLI] from main
|
||||
asm { lda#<dliptr stadlivec lda#>dliptr stadlivec+1 jmp!+ dlivec: .byte0,0 !: }
|
||||
to:enableDLI::@return
|
||||
enableDLI::@return: scope:[enableDLI] from enableDLI
|
||||
return
|
||||
to:@return
|
||||
|
||||
void __start()
|
||||
__start: scope:[__start] from
|
||||
to:__start::__init1
|
||||
__start::__init1: scope:[__start] from __start
|
||||
to:__start::@1
|
||||
__start::@1: scope:[__start] from __start::__init1
|
||||
call main
|
||||
to:__start::@2
|
||||
__start::@2: scope:[__start] from __start::@1
|
||||
to:__start::@return
|
||||
__start::@return: scope:[__start] from __start::@2
|
||||
return
|
||||
to:@return
|
||||
|
||||
SYMBOL TABLE SSA
|
||||
void __start()
|
||||
void enableDLI(void* enableDLI::dliptr)
|
||||
void* enableDLI::dliptr loadstore
|
||||
void fn1()
|
||||
void main()
|
||||
const to_nomodify byte* r = (byte*)$8000
|
||||
|
||||
Adding number conversion cast (unumber) 1 in *r = 1
|
||||
Successful SSA optimization PassNAddNumberTypeConversions
|
||||
Inlining cast *r = (unumber)1
|
||||
Successful SSA optimization Pass2InlineCast
|
||||
Simplifying constant pointer cast (byte*) 32768
|
||||
Simplifying constant integer cast 1
|
||||
Successful SSA optimization PassNCastSimplification
|
||||
Finalized unsigned number type 1
|
||||
Successful SSA optimization PassNFinalizeNumberTypeConversions
|
||||
Constant enableDLI::dliptr = (void*)&fn1
|
||||
Successful SSA optimization Pass2ConstantIdentification
|
||||
Removing unused procedure __start
|
||||
Removing unused procedure block __start
|
||||
Removing unused procedure block __start::__init1
|
||||
Removing unused procedure block __start::@1
|
||||
Removing unused procedure block __start::@2
|
||||
Removing unused procedure block __start::@return
|
||||
Successful SSA optimization PassNEliminateEmptyStart
|
||||
Adding NOP phi() at start of main
|
||||
Adding NOP phi() at start of main::@1
|
||||
CALL GRAPH
|
||||
Calls in [main] to enableDLI:3
|
||||
|
||||
Created 0 initial phi equivalence classes
|
||||
Coalesced down to 0 phi equivalence classes
|
||||
Culled Empty Block label main::@1
|
||||
Adding NOP phi() at start of main
|
||||
|
||||
FINAL CONTROL FLOW GRAPH
|
||||
|
||||
void fn1()
|
||||
fn1: scope:[fn1] from
|
||||
[0] *r = 1
|
||||
to:fn1::@return
|
||||
fn1::@return: scope:[fn1] from fn1
|
||||
[1] return
|
||||
to:@return
|
||||
|
||||
void main()
|
||||
main: scope:[main] from
|
||||
[2] phi()
|
||||
[3] call enableDLI
|
||||
to:main::@return
|
||||
main::@return: scope:[main] from main
|
||||
[4] return
|
||||
to:@return
|
||||
|
||||
void enableDLI(const void* enableDLI::dliptr)
|
||||
enableDLI: scope:[enableDLI] from main
|
||||
asm { lda#<dliptr stadlivec lda#>dliptr stadlivec+1 jmp!+ dlivec: .byte0,0 !: }
|
||||
to:enableDLI::@return
|
||||
enableDLI::@return: scope:[enableDLI] from enableDLI
|
||||
[6] return
|
||||
to:@return
|
||||
|
||||
|
||||
VARIABLE REGISTER WEIGHTS
|
||||
void enableDLI(const void* enableDLI::dliptr)
|
||||
void fn1()
|
||||
void main()
|
||||
|
||||
Initial phi equivalence classes
|
||||
Complete equivalence classes
|
||||
REGISTER UPLIFT POTENTIAL REGISTERS
|
||||
Statement [0] *r = 1 [ ] ( [ ] { } ) always clobbers reg byte a
|
||||
Statement asm { lda#<dliptr stadlivec lda#>dliptr stadlivec+1 jmp!+ dlivec: .byte0,0 !: } always clobbers reg byte a
|
||||
|
||||
REGISTER UPLIFT SCOPES
|
||||
Uplift Scope [main]
|
||||
Uplift Scope [fn1]
|
||||
Uplift Scope [enableDLI]
|
||||
Uplift Scope []
|
||||
|
||||
Uplifting [main] best 54 combination
|
||||
Uplifting [fn1] best 54 combination
|
||||
Uplifting [enableDLI] best 54 combination
|
||||
Uplifting [] best 54 combination
|
||||
|
||||
ASSEMBLER BEFORE OPTIMIZATION
|
||||
// File Comments
|
||||
// The following casuses an exception in pass 2
|
||||
// https://gitlab.com/camelot/kickc/-/issues/561
|
||||
// Upstart
|
||||
.pc = $801 "Basic"
|
||||
:BasicUpstart(main)
|
||||
.pc = $80d "Program"
|
||||
// Global Constants & labels
|
||||
.label r = $8000
|
||||
// fn1
|
||||
fn1: {
|
||||
// [0] *r = 1 -- _deref_pbuc1=vbuc2
|
||||
lda #1
|
||||
sta r
|
||||
jmp __breturn
|
||||
// fn1::@return
|
||||
__breturn:
|
||||
// [1] return
|
||||
rts
|
||||
}
|
||||
// main
|
||||
main: {
|
||||
// [3] call enableDLI
|
||||
jsr enableDLI
|
||||
jmp __breturn
|
||||
// main::@return
|
||||
__breturn:
|
||||
// [4] return
|
||||
rts
|
||||
}
|
||||
// enableDLI
|
||||
// enableDLI(void* dliptr)
|
||||
enableDLI: {
|
||||
.label dliptr = fn1
|
||||
// asm { lda#<dliptr stadlivec lda#>dliptr stadlivec+1 jmp!+ dlivec: .byte0,0 !: }
|
||||
lda #<dliptr
|
||||
sta dlivec
|
||||
lda #>dliptr
|
||||
sta dlivec+1
|
||||
jmp !+
|
||||
dlivec:
|
||||
.byte 0, 0
|
||||
!:
|
||||
jmp __breturn
|
||||
// enableDLI::@return
|
||||
__breturn:
|
||||
// [6] return
|
||||
rts
|
||||
}
|
||||
// File Data
|
||||
|
||||
ASSEMBLER OPTIMIZATIONS
|
||||
Removing instruction jmp __breturn
|
||||
Removing instruction jmp __breturn
|
||||
Removing instruction jmp __breturn
|
||||
Succesful ASM optimization Pass5NextJumpElimination
|
||||
Removing instruction __breturn:
|
||||
Removing instruction __breturn:
|
||||
Removing instruction __breturn:
|
||||
Succesful ASM optimization Pass5UnusedLabelElimination
|
||||
|
||||
FINAL SYMBOL TABLE
|
||||
void enableDLI(const void* enableDLI::dliptr)
|
||||
const void* enableDLI::dliptr = (void*)&fn1
|
||||
void fn1()
|
||||
void main()
|
||||
const to_nomodify byte* r = (byte*) 32768
|
||||
|
||||
|
||||
|
||||
FINAL ASSEMBLER
|
||||
Score: 45
|
||||
|
||||
// File Comments
|
||||
// The following casuses an exception in pass 2
|
||||
// https://gitlab.com/camelot/kickc/-/issues/561
|
||||
// Upstart
|
||||
.pc = $801 "Basic"
|
||||
:BasicUpstart(main)
|
||||
.pc = $80d "Program"
|
||||
// Global Constants & labels
|
||||
.label r = $8000
|
||||
// fn1
|
||||
fn1: {
|
||||
// *r = 1
|
||||
// [0] *r = 1 -- _deref_pbuc1=vbuc2
|
||||
lda #1
|
||||
sta r
|
||||
// fn1::@return
|
||||
// }
|
||||
// [1] return
|
||||
rts
|
||||
}
|
||||
// main
|
||||
main: {
|
||||
// enableDLI(&fn1)
|
||||
// [3] call enableDLI
|
||||
jsr enableDLI
|
||||
// main::@return
|
||||
// }
|
||||
// [4] return
|
||||
rts
|
||||
}
|
||||
// enableDLI
|
||||
// enableDLI(void* dliptr)
|
||||
enableDLI: {
|
||||
.label dliptr = fn1
|
||||
// asm
|
||||
// asm { lda#<dliptr stadlivec lda#>dliptr stadlivec+1 jmp!+ dlivec: .byte0,0 !: }
|
||||
lda #<dliptr
|
||||
sta dlivec
|
||||
lda #>dliptr
|
||||
sta dlivec+1
|
||||
jmp !+
|
||||
dlivec:
|
||||
.byte 0, 0
|
||||
!:
|
||||
// enableDLI::@return
|
||||
// }
|
||||
// [6] return
|
||||
rts
|
||||
}
|
||||
// File Data
|
||||
|
||||
6
src/test/ref/function-pointer-problem-1.sym
Normal file
6
src/test/ref/function-pointer-problem-1.sym
Normal file
@ -0,0 +1,6 @@
|
||||
void enableDLI(const void* enableDLI::dliptr)
|
||||
const void* enableDLI::dliptr = (void*)&fn1
|
||||
void fn1()
|
||||
void main()
|
||||
const to_nomodify byte* r = (byte*) 32768
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user