1
0
mirror of https://gitlab.com/camelot/kickc.git synced 2024-07-03 20:29:34 +00:00

Fixed a few tests.

This commit is contained in:
jespergravgaard 2020-02-22 12:06:47 +01:00
parent 7dacbb2c75
commit d33c84488a
3 changed files with 13 additions and 13 deletions

View File

@ -45,7 +45,7 @@ public class TestPrograms {
@Test @Test
public void testVarModelMaMem4() throws IOException, URISyntaxException { public void testVarModelMaMem4() throws IOException, URISyntaxException {
compileAndCompare("varmodel-ma_mem-4", log()); compileAndCompare("varmodel-ma_mem-4");
} }
@Test @Test

View File

@ -106,16 +106,16 @@ void render_score() {
char* score_bytes = (byte*)(&score_bcd); char* score_bytes = (byte*)(&score_bcd);
unsigned int score_offset = 40*0x05 + 0x1c; unsigned int score_offset = 40*0x05 + 0x1c;
render_bcd( screen, score_offset, score_bytes[2], 0); render_bcd( screen, score_offset, score_bytes[2], 0);
render_bcd( screen, score_offset+2, score_bytes[1], 0); render_bcd( screen, score_offset+2, score_bytes[1], 0);
render_bcd( screen, score_offset+4, score_bytes[0], 0); render_bcd( screen, score_offset+4, score_bytes[0], 0);
unsigned int lines_offset = 40*0x01 + 0x16; unsigned int lines_offset = 40*0x01 + 0x16;
render_bcd( screen, lines_offset, >lines_bcd, 1); render_bcd( screen, lines_offset, >lines_bcd, 1);
render_bcd( screen, lines_offset+1, <lines_bcd, 0); render_bcd( screen, lines_offset+1, <lines_bcd, 0);
unsigned int level_offset = 40*19 + 0x1f; unsigned int level_offset = 40*19 + 0x1f;
render_bcd( screen, level_offset, level_bcd, 0); render_bcd( screen, level_offset, level_bcd, 0);
} }

View File

@ -22581,7 +22581,7 @@ render_score: {
sta.z screen+1 sta.z screen+1
// render_score::@2 // render_score::@2
__b2: __b2:
// render_bcd( screen, score_offset, score_bytes[2], 0) // render_bcd( screen, score_offset, score_bytes[2], 0)
// [78] (byte*) render_bcd::screen#0 ← (byte*) render_score::screen#3 // [78] (byte*) render_bcd::screen#0 ← (byte*) render_score::screen#3
// [79] (byte) render_bcd::bcd#0 ← *((const byte*) render_score::score_bytes+(byte) 2) -- vbuxx=_deref_pbuc1 // [79] (byte) render_bcd::bcd#0 ← *((const byte*) render_score::score_bytes+(byte) 2) -- vbuxx=_deref_pbuc1
ldx score_bytes+2 ldx score_bytes+2
@ -22598,7 +22598,7 @@ render_score: {
// [97] phi (byte*) render_bcd::screen#6 = (byte*) render_bcd::screen#0 [phi:render_score::@2->render_bcd#3] -- register_copy // [97] phi (byte*) render_bcd::screen#6 = (byte*) render_bcd::screen#0 [phi:render_score::@2->render_bcd#3] -- register_copy
jsr render_bcd jsr render_bcd
// render_score::@3 // render_score::@3
// render_bcd( screen, score_offset+2, score_bytes[1], 0) // render_bcd( screen, score_offset+2, score_bytes[1], 0)
// [81] (byte*) render_bcd::screen#1 ← (byte*) render_score::screen#3 // [81] (byte*) render_bcd::screen#1 ← (byte*) render_score::screen#3
// [82] (byte) render_bcd::bcd#1 ← *((const byte*) render_score::score_bytes+(byte) 1) -- vbuxx=_deref_pbuc1 // [82] (byte) render_bcd::bcd#1 ← *((const byte*) render_score::score_bytes+(byte) 1) -- vbuxx=_deref_pbuc1
ldx score_bytes+1 ldx score_bytes+1
@ -22615,7 +22615,7 @@ render_score: {
// [97] phi (byte*) render_bcd::screen#6 = (byte*) render_bcd::screen#1 [phi:render_score::@3->render_bcd#3] -- register_copy // [97] phi (byte*) render_bcd::screen#6 = (byte*) render_bcd::screen#1 [phi:render_score::@3->render_bcd#3] -- register_copy
jsr render_bcd jsr render_bcd
// render_score::@4 // render_score::@4
// render_bcd( screen, score_offset+4, score_bytes[0], 0) // render_bcd( screen, score_offset+4, score_bytes[0], 0)
// [84] (byte*) render_bcd::screen#2 ← (byte*) render_score::screen#3 // [84] (byte*) render_bcd::screen#2 ← (byte*) render_score::screen#3
// [85] (byte) render_bcd::bcd#2 ← *((const byte*) render_score::score_bytes) -- vbuxx=_deref_pbuc1 // [85] (byte) render_bcd::bcd#2 ← *((const byte*) render_score::score_bytes) -- vbuxx=_deref_pbuc1
ldx.z score_bytes ldx.z score_bytes
@ -22632,7 +22632,7 @@ render_score: {
// [97] phi (byte*) render_bcd::screen#6 = (byte*) render_bcd::screen#2 [phi:render_score::@4->render_bcd#3] -- register_copy // [97] phi (byte*) render_bcd::screen#6 = (byte*) render_bcd::screen#2 [phi:render_score::@4->render_bcd#3] -- register_copy
jsr render_bcd jsr render_bcd
// render_score::@5 // render_score::@5
// render_bcd( screen, lines_offset, >lines_bcd, 1) // render_bcd( screen, lines_offset, >lines_bcd, 1)
// [87] (byte) render_bcd::bcd#3 ← > (word) lines_bcd#15 -- vbuxx=_hi_vwuz1 // [87] (byte) render_bcd::bcd#3 ← > (word) lines_bcd#15 -- vbuxx=_hi_vwuz1
lda.z lines_bcd+1 lda.z lines_bcd+1
tax tax
@ -22650,7 +22650,7 @@ render_score: {
// [97] phi (byte*) render_bcd::screen#6 = (byte*) render_bcd::screen#3 [phi:render_score::@5->render_bcd#3] -- register_copy // [97] phi (byte*) render_bcd::screen#6 = (byte*) render_bcd::screen#3 [phi:render_score::@5->render_bcd#3] -- register_copy
jsr render_bcd jsr render_bcd
// render_score::@6 // render_score::@6
// render_bcd( screen, lines_offset+1, <lines_bcd, 0) // render_bcd( screen, lines_offset+1, <lines_bcd, 0)
// [90] (byte) render_bcd::bcd#4 ← < (word) lines_bcd#15 -- vbuxx=_lo_vwuz1 // [90] (byte) render_bcd::bcd#4 ← < (word) lines_bcd#15 -- vbuxx=_lo_vwuz1
lda.z lines_bcd lda.z lines_bcd
tax tax
@ -22668,7 +22668,7 @@ render_score: {
// [97] phi (byte*) render_bcd::screen#6 = (byte*) render_bcd::screen#4 [phi:render_score::@6->render_bcd#3] -- register_copy // [97] phi (byte*) render_bcd::screen#6 = (byte*) render_bcd::screen#4 [phi:render_score::@6->render_bcd#3] -- register_copy
jsr render_bcd jsr render_bcd
// render_score::@7 // render_score::@7
// render_bcd( screen, level_offset, level_bcd, 0) // render_bcd( screen, level_offset, level_bcd, 0)
// [93] (byte*) render_bcd::screen#5 ← (byte*) render_score::screen#3 // [93] (byte*) render_bcd::screen#5 ← (byte*) render_score::screen#3
// [94] (byte) render_bcd::bcd#5 ← (byte) level_bcd#17 -- vbuxx=vbuz1 // [94] (byte) render_bcd::bcd#5 ← (byte) level_bcd#17 -- vbuxx=vbuz1
ldx.z level_bcd ldx.z level_bcd