get ramtest properly working in sim

Author: rcbilson

.gitignore

@@ -3,3 +3,4 @@
 *.map
 *.swp
 rom.bin
+librt.a

Makefile

@@ -1,10 +1,21 @@
 CC65=cc65/bin
 AS=$(CC65)/ca65
-ASFLAGS=--target sim65c02
+ASFLAGS=-l $@.lst
 
-rom.bin: main.o ramtest.o
+rom.bin: main.o ramtest.o librt.a 
 	$(CC65)/ld65 --config eater.cfg -m rom.map -o $@ $^
 
+librt.a: reg.o via.o led.o lcd.o lfsr.o
+	$(CC65)/ar65 r $@ $^
+
+.PHONY: test
+test: rom.bin
+	make -C test
+
+.PHONY: program
+program: rom.bin
+	minipro -p AT28C256 -w rom.bin
+
 .PHONY: hexdump
 hexdump: rom.bin
 	hexdump -C $<
@@ -15,4 +26,5 @@ cc65:
 
 .PHONY: clean
 clean:
-	rm -f rom.bin *.o
+	rm -f rom.bin librt.a *.o
+	make -C test clean

defs.inc

@@ -1,11 +1,29 @@
 .PC02
 
+; main.s
+.globalzp r0, r1, r2, r3
+
+; lfsr.s
 .global srand
 .global rand
 
+; via.s
+.global via_init
+
+; lcd.s
 .global lcd_init
 .global lcd_home
+.global lcd_clear
 .global lcd_puthex
+.global lcd_putc
+.global lcd_puts
+
+; led.s
+.global led_on
+.global led_off
+.global led_blink
+.global led_code
 
+; ramtest.s
 .global ramtest
 .global ramtest_success

lcd.s

@@ -1,13 +1,5 @@
 .include "defs.inc"
-
-PORTB = $6000
-PORTA = $6001
-DDRB = $6002
-DDRA = $6003
-
-E  = %10000000
-RW = %01000000
-RS = %00100000
+.include "via.inc"
 
 .proc lcd_wait
         lda #%00000000 ; Set all pins on port B to input
@@ -48,7 +40,7 @@ loop:
         rts
 .endproc
 
-.proc lcd_data
+.proc lcd_putc
         sta PORTB
 
         jsr lcd_wait
@@ -81,21 +73,29 @@ skip:
         lsr
         lsr
         TO_ASCII
-        jsr lcd_data
+        jsr lcd_putc
         pla
         and #$f
         TO_ASCII
-        jsr lcd_data
+        jsr lcd_putc
         rts
 .endproc
 
-.proc lcd_init
-        lda #%11111111 ; Set all pins on port B to output
-        sta DDRB
-
-        lda #%11100000 ; Set top 3 pins on port A to output
-        sta DDRA
+.proc lcd_puts
+        sty r0
+        sta r0+1
+        ldy #0
+loop:
+        lda (r0),y
+        beq done
+        jsr lcd_putc
+        iny
+        jmp loop
+done:
+        rts
+.endproc
 
+.proc lcd_init
         lda #%00111000 ; Set 8-bit mode; 2-line display; 5x8 font
         jsr lcd_cmd
         lda #%00000001 ; Clear display
@@ -110,3 +110,8 @@ skip:
         lda #%00000010 ; Return home
         jmp lcd_cmd
 .endproc
+
+.proc lcd_clear
+        lda #%00000001 ; Clear display
+        jmp lcd_cmd
+.endproc

led.s

@@ -0,0 +1,60 @@
+.include "defs.inc"
+.include "via.inc"
+
+.proc led_on
+        lda #LED
+        sta PORTA
+        rts
+.endproc
+
+.proc led_off
+        lda #0
+        sta PORTA
+        rts
+.endproc
+
+.macro DELAY
+.local outer_loop
+.local inner_loop
+        sty 0
+        ;lsl 0
+        ;lsl 0
+        ;lsl 0
+outer_loop:
+        ldy #$ff
+inner_loop:
+        dey
+        bne inner_loop
+        dec 0
+        bne outer_loop
+.endmacro
+
+.proc led_blink
+        tay
+        lda #LED
+        sta PORTA
+        DELAY
+        lda #0
+        sta PORTA
+        rts
+.endproc
+
+.proc led_code
+        sec
+nextbit:
+        ldy #$A0
+        rol
+        beq done
+        bcc blink
+        ldy #$50
+blink:
+        tax
+        tya
+        jsr led_blink
+        txa
+        DELAY
+        clc
+        jmp nextbit
+done:
+        rts
+.endproc

main.s

@@ -1,10 +1,35 @@
 .include "defs.inc"
 
+RAMTEST_START = $01
+
 main:
+        ldx #$ff
+        txs
+
+        jsr via_init
+	jsr led_on
+        jsr lcd_init
+        lda #>testing
+        ldy #<testing
+        jsr lcd_puts
+
+        lda #RAMTEST_START
         jmp ramtest
 
 ramtest_success:
-        jmp ramtest_success
+        jsr lcd_clear
+        lda #>test_complete
+        ldy #<test_complete
+        jsr lcd_puts
+        jsr led_off
+loop:
+        jmp loop
+
+.rodata
+testing:
+.asciiz "testing"
+test_complete:
+.asciiz "test complete"
 
 .segment "VECTORS"
 nmi: