Standardize macro usage

This commit is contained in:
Joshua Bell 2017-12-07 21:48:41 -08:00
parent 89edcb917b
commit 106b31b899
3 changed files with 17 additions and 12 deletions

View File

@ -324,14 +324,14 @@ loop: lda driver,y
and #%00001111 and #%00001111
jsr cout_number jsr cout_number
lda #(HI '/') ; / lda #HI('/') ; /
jsr COUT jsr COUT
pla ; day pla ; day
and #%00011111 and #%00011111
jsr cout_number jsr cout_number
lda #(HI '/') ; / lda #HI('/') ; /
jsr COUT jsr COUT
pla ; year pla ; year
@ -486,7 +486,7 @@ not_found:
sta ptr+1 sta ptr+1
bne skip ; always (since data not on ZP) bne skip ; always (since data not on ZP)
next: cmp #(HI 'a') ; lower-case? next: cmp #HI('a') ; lower-case?
bcc :+ bcc :+
and lowercase_mask ; make upper-case if needed and lowercase_mask ; make upper-case if needed
: jsr COUT : jsr COUT
@ -508,7 +508,7 @@ skip: inc ptr
;;; COUT a 2-digit number in A ;;; COUT a 2-digit number in A
.proc cout_number .proc cout_number
ldx #(HI '0') ldx #HI('0')
cmp #10 ; >= 10? cmp #10 ; >= 10?
bcc tens bcc tens
@ -519,13 +519,13 @@ skip: inc ptr
bcs :- bcs :-
tens: pha tens: pha
cpx #(HI '0') cpx #HI('0')
beq units beq units
txa txa
jsr COUT jsr COUT
units: pla units: pla
ora #(HI '0') ora #HI('0')
jsr COUT jsr COUT
rts rts
.endproc .endproc

5
date.s
View File

@ -1,3 +1,8 @@
;;; Query ProDOS and print the current date/time
;;; (No dependency on Cricket clock)
;;; Output is: MM/DD/YY HH:MM
.setcpu "6502" .setcpu "6502"
.org $2000 .org $2000

View File

@ -303,14 +303,14 @@ loop: lda driver,y
and #%00001111 and #%00001111
jsr cout_number jsr cout_number
lda #(HI '/') ; / lda #HI('/') ; /
jsr COUT jsr COUT
pla ; day pla ; day
and #%00011111 and #%00011111
jsr cout_number jsr cout_number
lda #(HI '/') ; / lda #HI('/') ; /
jsr COUT jsr COUT
pla ; year pla ; year
@ -465,7 +465,7 @@ not_found:
sta ptr+1 sta ptr+1
bne skip ; always (since data not on ZP) bne skip ; always (since data not on ZP)
next: cmp #(HI 'a') ; lower-case? next: cmp #HI('a') ; lower-case?
bcc :+ bcc :+
and lowercase_mask ; make upper-case if needed and lowercase_mask ; make upper-case if needed
: jsr COUT : jsr COUT
@ -487,7 +487,7 @@ skip: inc ptr
;;; COUT a 2-digit number in A ;;; COUT a 2-digit number in A
.proc cout_number .proc cout_number
ldx #(HI '0') ldx #HI('0')
cmp #10 ; >= 10? cmp #10 ; >= 10?
bcc tens bcc tens
@ -498,13 +498,13 @@ skip: inc ptr
bcs :- bcs :-
tens: pha tens: pha
cpx #(HI '0') cpx #HI('0')
beq units beq units
txa txa
jsr COUT jsr COUT
units: pla units: pla
ora #(HI '0') ora #HI('0')
jsr COUT jsr COUT
rts rts
.endproc .endproc