Skip to content

Update print.s #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
FrederickDietz wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update print.s #17

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 7 additions & 14 deletions print.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,24 +37,17 @@ PRINT2:
.endif
beq L29F5
cmp #','
; Pre-KIM had no CLC. KIM added the CLC
; here. Post-KIM moved the CLC up...
; (makes no sense on KIM, liveness = 0)
.if .def(CONFIG_11A) && (!.def(CONFIG_2))
clc
.endif
; Instead of relying on a prior CLC here (which might be clobbered by
; JSRs called before the arithmetic), ensure CLC is performed immediately
; before the ADC that depends on it.
beq L29DE
cmp #$3B
beq L2A0D
jsr FRMEVL
bit VALTYP
bmi PRSTRING
jsr FOUT
jsr STRLIT

.ifndef CONFIG_NO_CR
ldy #$00
lda (FAC_LAST-1),y
clc
; Explicitly clear carry right before ADC that uses POSX.
; This makes the code robust even if called routines have modified flags.
clc ; <<-- move/ensure CLC here
adc POSX
.ifdef KBD
cmp #$28
Expand Down