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

Use std::map for rgbasm symbols

Browse Source
This commit is contained in:
Rangi42
2024-02-20 21:09:19 -05:00
committed by Sylvie
parent f44701c02d
commit 83d3a39dcd
3 changed files with 13 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/asm/symbol.cpp
View File

@@ -6,8 +6,10 @@
#include <errno.h>
#include <inttypes.h>
#include <limits.h>
#include <map>
#include <stdint.h>
#include <stdio.h>
#include <string>
#include <string.h>
#include <time.h>
@@ -22,11 +24,10 @@
#include "asm/warning.hpp"
#include "error.hpp"
#include "hashmap.hpp"
#include "helpers.hpp"
#include "version.hpp"
HashMap symbols;
std::map<std::string, struct Symbol *> symbols;
static const char *labelScope; // Current section's label scope
static struct Symbol *PCSymbol;
@@ -42,24 +43,10 @@ bool sym_IsPC(struct Symbol const *sym)
return sym == PCSymbol;
}
struct ForEachArgs {
void (*func)(struct Symbol *sym, void *arg);
void *arg;
};
static void forEachWrapper(void *_sym, void *_argWrapper)
void sym_ForEach(void (*callback)(struct Symbol *))
{
struct ForEachArgs *argWrapper = (struct ForEachArgs *)_argWrapper;
struct Symbol *sym = (struct Symbol *)_sym;
argWrapper->func(sym, argWrapper->arg);
}
void sym_ForEach(void (*func)(struct Symbol *, void *), void *arg)
{
struct ForEachArgs argWrapper = { .func = func, .arg = arg };
hash_ForEach(symbols, forEachWrapper, &argWrapper);
for (auto &it : symbols)
callback(it.second);
}
static int32_t Callback_NARG(void)
@@ -138,7 +125,7 @@ static struct Symbol *createsymbol(char const *symName)
setSymbolFilename(sym);
sym->ID = -1;
hash_AddElement(symbols, sym->name, sym);
symbols[sym->name] = sym;
return sym;
}
@@ -169,7 +156,8 @@ static void assignStringSymbol(struct Symbol *sym, char const *value)
struct Symbol *sym_FindExactSymbol(char const *symName)
{
return (struct Symbol *)hash_GetElement(symbols, symName);
auto search = symbols.find(symName);
return search != symbols.end() ? search->second : NULL;
}
struct Symbol *sym_FindScopedSymbol(char const *symName)
@@ -234,7 +222,7 @@ void sym_Purge(char const *symName)
// FIXME: this leaks sym->equs.value for SYM_EQUS and sym->macro.value for SYM_MACRO,
// but this can't free either of them because the expansion may be purging itself.
hash_RemoveElement(symbols, sym->name);
symbols.erase(sym->name);
// TODO: ideally, also unref the file stack nodes
free(sym);
}