diff --git a/Makefile b/Makefile index c94074b..711adcd 100644 --- a/Makefile +++ b/Makefile @@ -2,11 +2,8 @@ all : mandel.xex -mandel.xex : mandel.o mandel-core.o tables.o atari-xex.cfg - ld65 -C ./atari-xex.cfg --mapfile mandel.map -o $@ mandel.o mandel-core.o tables.o atari.lib - -mandel.s : mandel.c mandel.h - cc65 -o $@ mandel.c +mandel.xex : mandel.o tables.o atari-asm-xex.cfg + ld65 -C ./atari-asm-xex.cfg --mapfile mandel.map -o $@ mandel.o tables.o %.o : %.s ca65 -o $@ $< @@ -16,7 +13,8 @@ tables.s : tables.js clean : rm -f tables.s - rm -f mandel.s rm -f *.o rm -f *.xex rm -f mandel.map + + diff --git a/atari-xex.cfg b/atari-xex.cfg deleted file mode 100644 index 467d9d4..0000000 --- a/atari-xex.cfg +++ /dev/null @@ -1,69 +0,0 @@ -# Sample linker configuration for C programs using the Atari binary file support. -# Use with: cl65 -tatari -Catari-xex.cfg prog.c -o prog.xex -FEATURES { - STARTADDRESS: default = $8000; -} -SYMBOLS { - __SYSTEM_CHECK__: type = import; # force inclusion of "system check" load chunk - __STACKSIZE__: type = weak, value = $0800; # 2k stack - __STARTADDRESS__: type = export, value = %S; - __RESERVED_MEMORY__: type = weak, value = $0000; - __SYSCHKHDR__: type = export, value = 0; # Disable system check header - __SYSCHKTRL__: type = export, value = 0; # Disable system check trailer - __TABLESEG_START__: type = weak, value = $2E00 + $0300; - __TABLESEG_SIZE__: type = weak, value = 6 * $100; - __BANKSY_START__: type = weak, value = $4000; - __BANKSY_SIZE__: type = weak, value = $4000; - __FRAMEBUFFER_START__: type = weak, value = $A000; -} -MEMORY { -# Note -- $80 and $81 (LOMEM) appear to be reserved in ZP. - ZP: file = "", define = yes, start = $0082, size = $007E; -# "system check" load chunk - SYSCHKCHNK: file = %O, start = $2E00, size = $0300; -# Note $a000-$bfff is against the BASIC cartridge, may require booting with OPTION. - TABLES: file = %O, define = yes, start = __TABLESEG_START__, size = __TABLESEG_SIZE__; -# We reserve $4000-7fff for the bank-switch window. -# In theory we could keep data and code here that we only use on 48k/64k systems. - BANKSWITCH: file = "", define = yes, start = __BANKSY_START__, size = __BANKSY_SIZE__; -# "main program" load chunk - MAIN: file = %O, define = yes, start = %S, size = __FRAMEBUFFER_START__ - __STACKSIZE__ - __RESERVED_MEMORY__ - %S; -} -FILES { - %O: format = atari; -} -FORMATS { - atari: runad = start, - initad = SYSCHKCHNK: __SYSTEM_CHECK__; -} -SEGMENTS { - ZEROPAGE: load = ZP, type = zp; - EXTZP: load = ZP, type = zp, optional = yes; - SYSCHK: load = SYSCHKCHNK, type = rw, define = yes, optional = yes; - TABLES: load = TABLES, type = ro, optional = yes, align = 256; - BANKSWICH: load = BANKSWITCH, type = ro, optional = yes; - STARTUP: load = MAIN, type = ro, define = yes; - LOWBSS: load = MAIN, type = rw, optional = yes; # not zero initialized - LOWCODE: load = MAIN, type = ro, define = yes, optional = yes; - ONCE: load = MAIN, type = ro, optional = yes; - CODE: load = MAIN, type = ro, define = yes; - RODATA: load = MAIN, type = ro; - DATA: load = MAIN, type = rw; - INIT: load = MAIN, type = rw, optional = yes; - BSS: load = MAIN, type = bss, define = yes; -} -FEATURES { - CONDES: type = constructor, - label = __CONSTRUCTOR_TABLE__, - count = __CONSTRUCTOR_COUNT__, - segment = ONCE; - CONDES: type = destructor, - label = __DESTRUCTOR_TABLE__, - count = __DESTRUCTOR_COUNT__, - segment = RODATA; - CONDES: type = interruptor, - label = __INTERRUPTOR_TABLE__, - count = __INTERRUPTOR_COUNT__, - segment = RODATA, - import = __CALLIRQ__; -} diff --git a/mandel.c b/mandel.c deleted file mode 100644 index f287fa3..0000000 --- a/mandel.c +++ /dev/null @@ -1,15 +0,0 @@ -/** - * The UI and I/O wrapper for the Mandelbrot runner, in C. - * - * For the moment *all* logic is in mandel-core.s, I'm just - * trying to get this to run within a cc65 environment. - * Eventually just the inner loop fun will live in there. - */ - -#include -#include -#include "mandel.h" - -void main(void) { - mandel_start(); -} \ No newline at end of file diff --git a/mandel.h b/mandel.h deleted file mode 100644 index e43fad7..0000000 --- a/mandel.h +++ /dev/null @@ -1,4 +0,0 @@ -#include - -// From mandel-core.s: -extern void mandel_start(void); diff --git a/mandel-core.s b/mandel.s similarity index 99% rename from mandel-core.s rename to mandel.s index 6ebb089..ec9f17f 100644 --- a/mandel-core.s +++ b/mandel.s @@ -361,7 +361,7 @@ z_buffer: .word 0 .endrepeat -.export _mandel_start +.export start ;max_fill_level = 6 max_fill_level = 3 @@ -588,7 +588,7 @@ bank_switch_table: .macro imul8 dest, arg1, arg2, xe .if xe ; using 64KB lookup table - ; 51-70 cycles + ; 50-70 cycles ; clobbers x, y, dest, ptr .scope output = dest @@ -600,13 +600,13 @@ bank_switch_table: ; bottom 14 bits except the LSB are the per-bank table index ; add $4000 for the bank pointer - txa ; 2 cyc and #$3f ; 2 cyc ora #$40 ; 2 cyc sta ptr + 1 ; 3 cyc ; copy the entry into output lda arg1 ; 3 cyc + tax ; 2 cyc and #$fe ; 2 cyc tay ; 2 cyc lda (ptr),y ; 5 cyc @@ -623,13 +623,13 @@ bank_switch_table: ;;sta PORTB ; 4 cyc - disabled ; check that 1 bit we skipped to fit into space - lda arg1 ; 3 cyc + txa ; 2 cyc and #1 ; 2 cyc beq done ; 2 cyc ; add arg2 one last time for the skipped bit clc ; 2 cyc - txa ; 2 cyc + lda arg1 ; 3 cyc adc output ; 3 cyc sta output ; 3 cyc lda #0 ; 2 cyc @@ -1745,7 +1745,7 @@ zero_byte_loop: rts .endproc -.proc _mandel_start +.proc start jsr imul8xe_init