gbdev/rgbds
1
0
Fork 0
mirror of https://github.com/gbdev/rgbds.git synced 2025-11-20 18:22:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

rgblink adjusts patches' PC offsets when merging FRAGMENTs

Browse Source 
Fixes #869
This commit is contained in:
Rangi
2021-05-02 14:57:54 -04:00
committed by Eldred Habert
parent 9ab9d0f39c
commit 296e5489c9
8 changed files with 37 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/link/section.c
View File

@@ -165,6 +165,9 @@ static void mergeSections(struct Section *target, struct Section *other, enum Se
if (!target->data) if (!target->data)
errx(1, "Failed to concatenate \"%s\"'s fragments", target->name); errx(1, "Failed to concatenate \"%s\"'s fragments", target->name);
memcpy(target->data + target->size - other->size, other->data, other->size); memcpy(target->data + target->size - other->size, other->data, other->size);
/* Adjust patches' PC offsets */
for (uint32_t patchID = 0; patchID < other->nbPatches; patchID++)
other->patches[patchID].pcOffset += other->offset;
} }
break; break;

4
test/link/section-fragment/jr-offset-load/a.asm Normal file
View File

@@ -0,0 +1,4 @@
SECTION FRAGMENT "output", ROM0
LOAD FRAGMENT "loaded", SRAM
ds 128
ENDL

6
test/link/section-fragment/jr-offset-load/b.asm Normal file
View File

@@ -0,0 +1,6 @@
SECTION FRAGMENT "output", ROM0
LOAD FRAGMENT "loaded", SRAM
label:
jr nz, label2
label2:
ENDL

BIN
test/link/section-fragment/jr-offset-load/ref.out.bin Normal file
View File

Binary file not shown.

2
test/link/section-fragment/jr-offset/a.asm Normal file
View File

@@ -0,0 +1,2 @@
SECTION FRAGMENT "output", ROM0
ds 128

4
test/link/section-fragment/jr-offset/b.asm Normal file
View File

@@ -0,0 +1,4 @@
SECTION FRAGMENT "output", ROM0
label:
jr nz, label2
label2:

BIN
test/link/section-fragment/jr-offset/ref.out.bin Normal file
View File

Binary file not shown.

18
test/link/test.sh
View File

@@ -151,6 +151,24 @@ rc=$(($? || $rc))
tryCmp overlay/out.gb $gbtemp tryCmp overlay/out.gb $gbtemp
rc=$(($? || $rc)) rc=$(($? || $rc))
i="section-fragment/jr-offset.asm"
startTest
$RGBASM -o $otemp section-fragment/jr-offset/a.asm
$RGBASM -o $gbtemp2 section-fragment/jr-offset/b.asm
rgblinkQuiet -o $gbtemp $otemp $gbtemp2
dd if=$gbtemp count=1 bs=$(printf %s $(wc -c < section-fragment/jr-offset/ref.out.bin)) > $otemp 2>/dev/null
tryCmp section-fragment/jr-offset/ref.out.bin $otemp
rc=$(($? || $rc))
i="section-fragment/jr-offset-load.asm"
startTest
$RGBASM -o $otemp section-fragment/jr-offset-load/a.asm
$RGBASM -o $gbtemp2 section-fragment/jr-offset-load/b.asm
rgblinkQuiet -o $gbtemp $otemp $gbtemp2
dd if=$gbtemp count=1 bs=$(printf %s $(wc -c < section-fragment/jr-offset-load/ref.out.bin)) > $otemp 2>/dev/null
tryCmp section-fragment/jr-offset-load/ref.out.bin $otemp
rc=$(($? || $rc))
i="section-union/good.asm" i="section-union/good.asm"
startTest startTest
$RGBASM -o $otemp section-union/good/a.asm $RGBASM -o $otemp section-union/good/a.asm