Apple-2-SW/a2d
1
0
Fork 0
mirror of https://github.com/mi57730/a2d.git synced 2025-02-21 08:29:10 +00:00
Code Issues Projects Releases Wiki Activity

Calculator DA: Fix FSUB call. Fixes #159

Browse Source 
When updating how Calculator calls ROM routines in 88666311 the FSUB
wrapper was missing a PLA. Convert the wrappers into a macro to avoid
such mistakes (D.R.Y.)

Also, updated refs to CHRGET routine.
This commit is contained in:
Joshua Bell 2019-07-11 21:18:48 -07:00
parent 25297ccb28
commit 92482500a6
2 changed files with 27 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

106
desk.acc/calculator.s
View File

@ -10,8 +10,6 @@
.org $800 .org $800
adjust_txtptr := $B1
;;; ============================================================ ;;; ============================================================
;;; Start of the code ;;; Start of the code
@ -684,9 +682,9 @@ init: MGTK_CALL MGTK::OpenWindow, winfo
sta calc_l sta calc_l
.proc copy_to_b1 .proc copy_to_b1
ldx #sizeof_adjust_txtptr_copied + 4 ; should be just + 1 ? ldx #sizeof_chrget_routine + 4 ; should be just + 1 ?
loop: lda adjust_txtptr_copied-1,x loop: lda chrget_routine-1,x
sta adjust_txtptr-1,x sta CHRGET-1,x
dex dex
bne loop bne loop
.endproc .endproc
@ -1202,7 +1200,7 @@ rts3: rts
jmp reset_buffer1_and_state jmp reset_buffer1_and_state
reparse:copy16 #text_buffer1, TXTPTR reparse:copy16 #text_buffer1, TXTPTR
jsr adjust_txtptr jsr CHRGET
jsr CALL_FIN jsr CALL_FIN
do_op: pla do_op: pla
@ -1506,8 +1504,7 @@ draw_title_bar:
jmp input_loop jmp input_loop
.endproc .endproc
;; Following proc is copied to $B1 PROC_AT chrget_routine, $B1 ; CHRGET ("Constant expression expected" error if label used)
PROC_AT adjust_txtptr_copied, $B1
dummy_addr := $EA60 dummy_addr := $EA60
loop: inc TXTPTR loop: inc TXTPTR
@ -1527,94 +1524,43 @@ loop: inc TXTPTR
sbc #$D0 ; carry set if successful sbc #$D0 ; carry set if successful
end: rts end: rts
END_PROC_AT END_PROC_AT
sizeof_adjust_txtptr_copied = .sizeof(adjust_txtptr_copied) sizeof_chrget_routine = .sizeof(chrget_routine)
.macro CALL_FP proc
pha
lda ROMIN2
pla
jsr proc
pha
lda LCBANK1
lda LCBANK1
pla
rts
.endmacro
CALL_FLOAT: CALL_FLOAT:
pha CALL_FP FLOAT
lda ROMIN2
pla
jsr FLOAT
pha
lda LCBANK1
lda LCBANK1
pla
rts
CALL_FADD: CALL_FADD:
pha CALL_FP FADD
lda ROMIN2
pla
jsr FADD
pha
lda LCBANK1
lda LCBANK1
pla
rts
CALL_FSUB: CALL_FSUB:
pha CALL_FP FSUB
lda ROMIN2
jsr FSUB
pha
lda LCBANK1
lda LCBANK1
pla
rts
CALL_FMULT: CALL_FMULT:
pha CALL_FP FMULT
lda ROMIN2
pla
jsr FMULT
pha
lda LCBANK1
lda LCBANK1
pla
rts
CALL_FDIV: CALL_FDIV:
pha CALL_FP FDIV
lda ROMIN2
pla
jsr FDIV
pha
lda LCBANK1
lda LCBANK1
pla
rts
CALL_FIN: CALL_FIN:
pha CALL_FP FIN
lda ROMIN2
pla
jsr FIN
pha
lda LCBANK1
lda LCBANK1
pla
rts
CALL_FOUT: CALL_FOUT:
pha CALL_FP FOUT
lda ROMIN2
pla
jsr FOUT
pha
lda LCBANK1
lda LCBANK1
pla
rts
CALL_ROUND: CALL_ROUND:
pha CALL_FP ROUND
lda ROMIN2
pla
jsr ROUND
pha
lda LCBANK1
lda LCBANK1
pla
rts
da_end := * da_end := *

1
inc/apple2.inc
View File

@ -78,6 +78,7 @@ ID_BYTE_FE1F := $FE1F ; RTS ($60) on pre-IIgs, clears carry on IIgs
LINNUM := $50 ; Line number, unsigned word LINNUM := $50 ; Line number, unsigned word
ERRFLG := $D8 ERRFLG := $D8
CHRGET := $B1 ; Routine called by ROM
TXTPTR := $B8 TXTPTR := $B8
FAC := $9D FAC := $9D
SHIFT_SIGN_EXT := $A4 ; Zero before using FP ops SHIFT_SIGN_EXT := $A4 ; Zero before using FP ops