Apple-2-SW
/
qasm
mirror of https://github.com/marketideas/qasm.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #59 from ksherlock/rel_ds 

qlinkgs: Fix rel DS handling
This commit is contained in:
Lane Roathe 2021-04-27 15:54:33 -07:00 committed by GitHub
parent b1867bb1e3 b92683ed43
commit b6826d0df4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 58 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/link/linker.1.s
View File

@ -1800,7 +1800,7 @@ lnkop sec
bit :dsvalid
jpl :xit
ldy :dsy
lda :aux
lda :rel
and #$FF
eor #$FF
inc
@ -1820,6 +1820,15 @@ lnkop sec
psl :handle
_GetHandleSize
pll :size
sec
lda :size
sbc :aux
sta :rsize
lda :size+2
sbc #0
sta :rsize+2
lda :more
clc
adc :size
@ -1867,9 +1876,7 @@ lnkop sec
sta :dest+2
psl :src
psl :dest
pea $00
lda :more
pha
psl :rsize
_BlockMove
ldy :aux
ldx #$00
@ -1912,6 +1919,7 @@ lnkop sec
:dest ds 4
:byte ds 2
:temp ds 4
:rsize ds 4
:constrainterr php
rep $30

6
testdata/3012-rel-ds-1.S vendored Normal file
View File

@ -0,0 +1,6 @@
rel
nop
nop
sav 3012-rel-ds-1.L

16
testdata/3012-rel-ds-2.S vendored Normal file
View File

@ -0,0 +1,16 @@
rel
a ent
b ent
c ent
nop
nop
* should generate $100 - 4 bytes of $ff since 2 bytes in first file, 2 bytes above.
* extra ent labels to verify the DS padding algorithm adjusts the relacation records.
ds \,$ff
d ent
sav 3012-rel-ds-2.L

9
testdata/3012-rel-ds-3.S vendored Normal file
View File

@ -0,0 +1,9 @@
rel
ext a,b,c,d
dw a,b,c,d
ds \,$00
sav 3012-rel-ds-3.L

15
testdata/3012-rel-ds-link.S vendored Normal file
View File

@ -0,0 +1,15 @@
*
* test rel DS \ command to verify it uses the current segment offset,
* not the current file offset.
*
ovr all
asm 3012-rel-ds-1.S
asm 3012-rel-ds-2.S
asm 3012-rel-ds-3.S
lnk 3012-rel-ds-1.L
lnk 3012-rel-ds-2.L
lnk 3012-rel-ds-3.L
sav 3012-rel-ds