gbdev/rgbds
1
0
Fork 0
mirror of https://github.com/gbdev/rgbds.git synced 2026-01-21 16:01:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Error messages note when a symbol has been purged (#1453)

Browse Source
This commit is contained in:
Sylvie
2024-08-06 15:35:06 -04:00
committed by GitHub
parent fc8707886c
commit 7435630d6a
8 changed files with 55 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/asm/symbol.cpp
View File

@@ -5,6 +5,7 @@
#include <inttypes.h>
#include <stdio.h>
#include <unordered_map>
#include <unordered_set>
#include "error.hpp"
#include "helpers.hpp" // assume
@@ -19,6 +20,7 @@
using namespace std::literals;
std::unordered_map<std::string, Symbol> symbols;
std::unordered_set<std::string> purgedSymbols;
static std::optional<std::string> labelScope = std::nullopt; // Current section's label scope
static Symbol *PCSymbol;
@@ -158,12 +160,14 @@ Symbol const *sym_GetPC() {
return PCSymbol;
}
// Purge a symbol
void sym_Purge(std::string const &symName) {
Symbol *sym = sym_FindScopedValidSymbol(symName);
if (!sym) {
error("'%s' not defined\n", symName.c_str());
if (sym_IsPurgedScoped(symName))
error("'%s' was already purged\n", symName.c_str());
else
error("'%s' not defined\n", symName.c_str());
} else if (sym->isBuiltin) {
error("Built-in symbol '%s' cannot be purged\n", symName.c_str());
} else if (sym->ID != (uint32_t)-1) {
@@ -176,10 +180,27 @@ void sym_Purge(std::string const &symName) {
// Do not keep a reference to the label's name after purging it
if (sym->name == labelScope)
labelScope = std::nullopt;
purgedSymbols.emplace(sym->name);
symbols.erase(sym->name);
}
}
bool sym_IsPurgedExact(std::string const &symName) {
return purgedSymbols.find(symName) != purgedSymbols.end();
}
bool sym_IsPurgedScoped(std::string const &symName) {
if (size_t dotPos = symName.find('.'); dotPos != std::string::npos) {
// Check for a nonsensical reference to a nested scoped symbol
if (symName.find('.', dotPos + 1) != std::string::npos)
return false;
// If auto-scoped local label, expand the name
if (dotPos == 0 && labelScope)
return sym_IsPurgedExact(*labelScope + symName);
}
return sym_IsPurgedExact(symName);
}
uint32_t sym_GetPCValue() {
Section const *sect = sect_GetSymbolSection();
@@ -218,7 +239,10 @@ uint32_t sym_GetConstantValue(std::string const &symName) {
if (Symbol const *sym = sym_FindScopedSymbol(symName); sym)
return sym->getConstantValue();
error("'%s' not defined\n", symName.c_str());
if (sym_IsPurgedScoped(symName))
error("'%s' not defined; it was purged\n", symName.c_str());
else
error("'%s' not defined\n", symName.c_str());
return 0;
}
@@ -242,6 +266,7 @@ static Symbol *createNonrelocSymbol(std::string const &symName, bool numeric) {
if (!sym) {
sym = &createSymbol(symName);
purgedSymbols.erase(sym->name);
} else if (sym->isDefined()) {
error("'%s' already defined at ", symName.c_str());
dumpFilename(*sym);