mirror of
https://github.com/fadden/6502bench.git
synced 2024-12-01 22:50:35 +00:00
ba35f88d02
We weren't altering the status flags after a BRK because of the assumption that a BRK was a crash. For an inline BRK, such as a SOS call, execution continues. We need to mark NVZC indeterminate or we may incorrectly handle conditional branches that follow. The BRK instruction now uses the same flag updater as JSR, since it's effectively a subroutine call to unknown code. If execution doesn't continue across the BRK then the flags don't matter. Updated 20182-extension-scripts to exercise this.
164 lines
4.6 KiB
ArmAsm
164 lines
4.6 KiB
ArmAsm
; Copyright 2019 faddenSoft. All Rights Reserved.
|
|
; See the LICENSE.txt file for distribution terms (Apache 2.0).
|
|
;
|
|
; Assembler: Merlin 32
|
|
|
|
; EDIT: the project must include the platform symbol file and extension script
|
|
|
|
PrintInlineL1String equ $011000
|
|
PrintInlineL2String equ $012000
|
|
PrintInlineDciString equ $013000 ;EDIT: add to project symbols
|
|
|
|
org $1000
|
|
|
|
clc
|
|
xce
|
|
sep #$30
|
|
mx %11
|
|
|
|
; check basics
|
|
jsr PrintInline8String
|
|
asc '01234567'
|
|
jsr PrintInlineRev8String
|
|
asc '76543210'
|
|
jsr PrintInlineNullString
|
|
asc 'null-term string',00
|
|
|
|
jsl PrintInlineL1String
|
|
str 'string with length/1'
|
|
jsl PrintInlineL2String
|
|
strl 'string with length/2'
|
|
jsl PrintInlineDciString
|
|
dci 'DCI string'
|
|
|
|
; check errors
|
|
jsr broken
|
|
jsr off_end
|
|
jsr too_long
|
|
|
|
; check block formatting
|
|
brk $01
|
|
dw data01
|
|
|
|
brk $02
|
|
dw data02
|
|
|
|
; Handle an edge case where the inline formatting gets thrown out.
|
|
; Two paths: BIT $A9 / BRK $85 / inline $FF/EA goes first, then
|
|
; LDA $00 / STA $FF / NOP goes. When we get to the STA we notice
|
|
; that it's marked as inline data, so we remove it from $85 $ff
|
|
; but not from $ea.
|
|
;
|
|
; If we try to walk through the file, advancing offset by the anattrib
|
|
; length, we will traverse the first path, which (with 2-byte BRKs)
|
|
; runs into the $FF, which is marked as an instruction but not an
|
|
; instruction start.
|
|
;
|
|
; Switching to 1-byte BRKs makes the $85 an inline data item rather
|
|
; than an instruction. When we come back through, we LDA $00 and
|
|
; then skip over the next 3 bytes. No conflict.
|
|
nop
|
|
jsr edge1 ;alt path, evaluated later
|
|
dfb $24 ;1: BIT dp
|
|
edge1 dfb $a9 ;2: LDA imm
|
|
brk ;1: BRK <op>
|
|
dfb $85 ;2: STA imm
|
|
dfb $ff ;1: address $eaff
|
|
nop ;2:
|
|
|
|
jmp Next1
|
|
|
|
PrintInline8String rts ;EDIT: set label
|
|
PrintInlineRev8String rts ;EDIT: set label
|
|
PrintInlineNullString rts ;EDIT: set label
|
|
|
|
data01 ;EDIT: set label
|
|
dw $1122 ;should be little-endian
|
|
dw $4433 ;should be big-endian
|
|
hex 55667788 ;32-bit
|
|
hex 99887766 ;32-bit big-endian
|
|
dfb 'f' ;ASCII
|
|
dfb "F" ;high ASCII
|
|
hex 40C142C344C546C7 ;bad DCI string
|
|
hex 002001 ;24-bit addr
|
|
dw data02 ;by symbol
|
|
|
|
dfb $80
|
|
|
|
data02 ;EDIT: set label, must be "data02"
|
|
dw data03
|
|
dfb $80
|
|
|
|
data03 ;EDIT: set label
|
|
asc "AllEight"
|
|
|
|
|
|
;
|
|
; The analyzer is trying to avoid calling the inline JSR check on code it
|
|
; has previously visited. There was a bug that caused us to lose the
|
|
; no-continue value if code was revisited.
|
|
;
|
|
; To ensure we revisit the function, we need to call it, then call
|
|
; something else that calls it, changing up the flags.
|
|
;
|
|
|
|
NoCont pla
|
|
pla
|
|
rts
|
|
|
|
TestNC1 jsr NoCont
|
|
dfb $00,$80
|
|
TestNC2 jsr NoCont
|
|
dfb $00,$80
|
|
|
|
Next1 jsr TestNC1
|
|
|
|
jsr PushThing
|
|
clc
|
|
jsr TestNC2
|
|
rts
|
|
|
|
PushThing
|
|
sec
|
|
jsr TestNC2
|
|
|
|
|
|
; Make sure flags get marked as indeterminate across inline BRK.
|
|
; Also exercises formatting the same block twice.
|
|
clc
|
|
brk $02
|
|
dw data02
|
|
bcc :BrkNext
|
|
bcs :BrkNext
|
|
brk $80
|
|
:BrkNext
|
|
|
|
rts
|
|
|
|
|
|
; Failed call tests. Some of these need to be at the end of the file.
|
|
; We use an align directive to ensure their offsets don't change as we
|
|
; update stuff earlier in the file.
|
|
ds \
|
|
ds 256
|
|
|
|
|
|
org $1800
|
|
|
|
; check address split across string
|
|
broken jsr PrintInlineNullString
|
|
asc 'broken ',01
|
|
org $1840 ;EDIT: split address
|
|
asc 'string',00
|
|
rts
|
|
|
|
too_long jsl PrintInlineL2String
|
|
dw END-*+1 ;should be 1 byte over; want it to be rejected by
|
|
rts ; function in .cs (otherwise code overlap race)
|
|
|
|
; MUST be last
|
|
off_end jsr PrintInlineNullString
|
|
nonterm asc 'end'
|
|
|
|
END equ *
|