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

Fix BANK(@) outside sections causing crashes

Browse Source
This commit is contained in:
ISSOtm
2020-04-07 15:45:30 +02:00
parent 562835308b
commit 9f82fa4cf7
5 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/asm/rpn.c
View File

@@ -143,7 +143,10 @@ void rpn_BankSelf(struct Expression *expr)
{
rpn_Init(expr);
if (pCurrentSection->nBank == -1) {
if (!pCurrentSection) {
yyerror("PC has no bank outside a section");
expr->nVal = 1;
} else if (pCurrentSection->nBank == -1) {
makeUnknown(expr, "Current section's bank is not known");
expr->nRPNPatchSize++;
*reserveSpace(expr, 1) = RPN_BANK_SELF;

7
src/link/patch.c
View File

@@ -282,7 +282,12 @@ static int32_t computeRPNExpr(struct Patch const *patch,
break;
case RPN_BANK_SELF:
value = patch->pcSection->bank;
if (!patch->pcSection) {
error("%s: PC has no bank outside a section");
value = 1;
} else {
value = patch->pcSection->bank;
}
break;
case RPN_HRAM: