diff --git a/src/test/java/dk/camelot64/kickc/test/ref/simple-multiplexer.asm b/src/test/java/dk/camelot64/kickc/test/ref/simple-multiplexer.asm index 7bb5a0f0a..9e0ac9efa 100644 --- a/src/test/java/dk/camelot64/kickc/test/ref/simple-multiplexer.asm +++ b/src/test/java/dk/camelot64/kickc/test/ref/simple-multiplexer.asm @@ -15,8 +15,8 @@ .const BLACK = 0 .const GREEN = 5 .const PLEX_COUNT = $20 - .label SPRITE = $2000 .label SCREEN = $400 + .label SPRITE = $2000 .label YSIN = $2100 .label PLEX_SCREEN_PTR = SCREEN+$3f8 .label plex_free_next = 3 diff --git a/src/test/java/dk/camelot64/kickc/test/ref/simple-multiplexer.log b/src/test/java/dk/camelot64/kickc/test/ref/simple-multiplexer.log index e6cd65cd3..dd3df4d3e 100644 --- a/src/test/java/dk/camelot64/kickc/test/ref/simple-multiplexer.log +++ b/src/test/java/dk/camelot64/kickc/test/ref/simple-multiplexer.log @@ -4,8 +4,8 @@ import "c64" import "multiplexer" // Location of screen & sprites -byte* SPRITE = $2000; byte* SCREEN = $400; +byte* SPRITE = $2000; byte* YSIN = $2100; kickasm(pc YSIN) {{ @@ -650,8 +650,8 @@ Promoting word/dword/signed dword to byte* in CIA2_PORT_B ← ((byte*)) 56577 Promoting word/dword/signed dword to byte* in CIA2_PORT_A_DDR ← ((byte*)) 56578 Promoting word/dword/signed dword to byte* in CIA2_PORT_B_DDR ← ((byte*)) 56579 Promoting word/signed word/dword/signed dword to byte* in PLEX_SCREEN_PTR ← ((byte*)) $0 -Promoting word/signed word/dword/signed dword to byte* in SPRITE ← ((byte*)) 8192 Promoting word/signed word/dword/signed dword to byte* in SCREEN ← ((byte*)) 1024 +Promoting word/signed word/dword/signed dword to byte* in SPRITE ← ((byte*)) 8192 Promoting word/signed word/dword/signed dword to byte* in YSIN ← ((byte*)) 8448 INITIAL CONTROL FLOW GRAPH @begin: scope:[] from @@ -943,8 +943,8 @@ plexFreeAdd::@return: scope:[plexFreeAdd] from plexFreeAdd return to:@return @11: scope:[] from @10 - (byte*) SPRITE ← ((byte*)) (word/signed word/dword/signed dword) 8192 (byte*) SCREEN ← ((byte*)) (word/signed word/dword/signed dword) 1024 + (byte*) SPRITE ← ((byte*)) (word/signed word/dword/signed dword) 8192 (byte*) YSIN ← ((byte*)) (word/signed word/dword/signed dword) 8448 kickasm(location (byte*) YSIN) {{ .var min = 50 .var max = 250-21 @@ -1492,8 +1492,8 @@ plexShowSprite::@return: scope:[plexShowSprite] from plexShowSprite::@3 plexSho (byte) plex_sprite_idx#39 ← phi( @8/(byte) plex_sprite_idx#41 ) (byte) plex_show_idx#39 ← phi( @8/(byte) plex_show_idx#41 ) (byte*) PLEX_SCREEN_PTR#25 ← phi( @8/(byte*) PLEX_SCREEN_PTR#27 ) - (byte*) SPRITE#0 ← ((byte*)) (word/signed word/dword/signed dword) 8192 (byte*) SCREEN#0 ← ((byte*)) (word/signed word/dword/signed dword) 1024 + (byte*) SPRITE#0 ← ((byte*)) (word/signed word/dword/signed dword) 8192 (byte*) YSIN#0 ← ((byte*)) (word/signed word/dword/signed dword) 8448 kickasm(location (byte*) YSIN#0) {{ .var min = 50 .var max = 250-21 @@ -2918,8 +2918,8 @@ Constant (const byte) plex_free_next#0 = 0 Constant (const byte) plex_sprite_msb#4 = 1 Constant (const byte[8]) PLEX_FREE_YPOS#0 = { fill( 8, 0) } Constant (const byte) plex_free_next#29 = 0 -Constant (const byte*) SPRITE#0 = ((byte*))8192 Constant (const byte*) SCREEN#0 = ((byte*))1024 +Constant (const byte*) SPRITE#0 = ((byte*))8192 Constant (const byte*) YSIN#0 = ((byte*))8448 Constant (const word) init::xp#0 = 32 Constant (const byte) init::sx#0 = 0 @@ -3746,8 +3746,8 @@ INITIAL ASM .const BLACK = 0 .const GREEN = 5 .const PLEX_COUNT = $20 - .label SPRITE = $2000 .label SCREEN = $400 + .label SPRITE = $2000 .label YSIN = $2100 .label PLEX_SCREEN_PTR = SCREEN+$3f8 .label plex_free_next = 5 @@ -4541,8 +4541,8 @@ ASSEMBLER BEFORE OPTIMIZATION .const BLACK = 0 .const GREEN = 5 .const PLEX_COUNT = $20 - .label SPRITE = $2000 .label SCREEN = $400 + .label SPRITE = $2000 .label YSIN = $2100 .label PLEX_SCREEN_PTR = SCREEN+$3f8 .label plex_free_next = 3 @@ -5442,8 +5442,8 @@ Score: 63464 .const BLACK = 0 .const GREEN = 5 .const PLEX_COUNT = $20 - .label SPRITE = $2000 .label SCREEN = $400 + .label SPRITE = $2000 .label YSIN = $2100 .label PLEX_SCREEN_PTR = SCREEN+$3f8 .label plex_free_next = 3