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

Allow PUSHS to be used before a section

Browse Source 
Previously, a PUSHS before a SECTION directive would cause rgbasm to crash when encountering a subsequent POPS.

This is because the subsequently-called out_setCurrentSection() expected the new section to be non-null, which wasn’t the case in this situation. This has been addressed by allowing the ‘null’ section to be set in this function, and only dereferencing it (to set nPC) if a non-null section is to be set.

In practice, this means that PUSHS/POPS can now be used to push/restore a context without a section.
This commit is contained in:
Ben Hetherington
2019-08-16 13:20:15 +01:00
parent b019b03946
commit 16111f46ef
10 changed files with 23 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/asm/output.c
View File

@@ -1,7 +1,7 @@
/*
* This file is part of RGBDS.
*
* Copyright (c) 1997-2018, Carsten Sorensen and RGBDS contributors.
* Copyright (c) 1997-2019, Carsten Sorensen and RGBDS contributors.
*
* SPDX-License-Identifier: MIT
*/
@@ -655,7 +655,7 @@ void out_SetCurrentSection(struct Section *pSect)
fatalerror("Cannot change the section within a UNION");
pCurrentSection = pSect;
nPC = pSect->nPC;
nPC = (pSect != NULL) ? pSect->nPC : 0;
pPCSymbol->nValue = nPC;
pPCSymbol->pSection = pCurrentSection;