gbdev/rgbds
1
0
Fork 0
mirror of https://github.com/gbdev/rgbds.git synced 2025-11-21 02:32:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Encapsulate access to sectionList and currentSection

Browse Source
This commit is contained in:
Rangi42
2025-07-28 11:22:28 -04:00
parent 75aed1afd5
commit f7eb986313
4 changed files with 51 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/asm/rpn.cpp
View File

@@ -4,6 +4,7 @@
#include <inttypes.h>
#include <limits.h>
#include <optional>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -102,15 +103,15 @@ void Expression::makeBankSymbol(std::string const &symName) {
clear();
if (Symbol const *sym = sym_FindScopedSymbol(symName); sym_IsPC(sym)) {
// The @ symbol is treated differently.
if (!currentSection) {
if (std::optional<uint32_t> outputBank = sect_GetOutputBank(); !outputBank) {
error("PC has no bank outside of a section");
data = 1;
} else if (currentSection->bank == UINT32_MAX) {
} else if (*outputBank == UINT32_MAX) {
data = "Current section's bank is not known";
*reserveSpace(1) = RPN_BANK_SELF;
} else {
data = static_cast<int32_t>(currentSection->bank);
data = static_cast<int32_t>(*outputBank);
}
return;
} else if (sym && !sym->isLabel()) {