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

Prevent RGBLINK from crashing when getting the bank of a constant

Browse Source
This commit is contained in:
ISSOtm
2020-04-07 20:41:20 +02:00
parent 9f82fa4cf7
commit 190678107b
5 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/link/patch.c
View File

@@ -260,6 +260,11 @@ static int32_t computeRPNExpr(struct Patch const *patch,
patch->fileName, patch->fileName,
fileSymbols[value]->name); fileSymbols[value]->name);
value = 1; value = 1;
} else if (!symbol->section) {
error("%s: Requested BANK() of non-label symbol \"%s\"",
patch->fileName,
fileSymbols[value]->name);
value = 1;
} else { } else {
value = symbol->section->bank; value = symbol->section->bank;
} }

2
test/link/bank-const/a.asm Normal file
View File

@@ -0,0 +1,2 @@
CONSTANT equ 0
EXPORT CONSTANT

2
test/link/bank-const/b.asm Normal file
View File

@@ -0,0 +1,2 @@
SECTION "Test", ROM0[0]
db BANK(CONSTANT)

2
test/link/bank-const/err.out Normal file
View File

@@ -0,0 +1,2 @@
error: bank-const/b.asm(2): Requested BANK() of non-label symbol "CONSTANT"
Linking failed with 1 error

6
test/link/test.sh
View File

@@ -80,6 +80,12 @@ $RGBLINK -o $gbtemp2 $otemp
i="high-low.asm" tryCmp $gbtemp $gbtemp2 i="high-low.asm" tryCmp $gbtemp $gbtemp2
rc=$(($? || $rc)) rc=$(($? || $rc))
$RGBASM -o $otemp bank-const/a.asm
$RGBASM -o $gbtemp2 bank-const/b.asm
$RGBLINK -o $gbtemp $gbtemp2 $otemp > $outtemp 2>&1
i="bank-const.asm" tryDiff bank-const/err.out $outtemp
rc=$(($? || $rc))
$RGBASM -o $otemp section-union/good/a.asm $RGBASM -o $otemp section-union/good/a.asm
$RGBASM -o $gbtemp2 section-union/good/b.asm $RGBASM -o $gbtemp2 section-union/good/b.asm
$RGBLINK -o $gbtemp -l section-union/good/script.link $otemp $gbtemp2 $RGBLINK -o $gbtemp -l section-union/good/script.link $otemp $gbtemp2