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

PUSHS and POPS also affect the symbol scope

Browse Source 
Now, when POPS is executed, it restores the symbol scope of the
corresponding PUSHS. That way, the local symbols previously available
can be used again after the POPS.

This is useful in cases like this one:

```
    SECTION "Section 1", ROMX

BigFunction:

    ...

.loop:

    ...

    PUSHS

    SECTION "Section 2", ROMX

DataForBigFunction:
    DB 1, 2, 3, 4, 5

    POPS

    ld  a,BANK(DataForBigFunction)
    ld  hl,DataForBigFunction

    ...

    jr  .loop
```

Signed-off-by: Antonio Niño Díaz <antonio_nd@outlook.com>
This commit is contained in:
Antonio Niño Díaz
2018-01-07 23:05:04 +00:00
parent f5164325d2
commit de32e245c9
3 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/asm/symbol.h
View File

@@ -80,4 +80,8 @@ void sym_Purge(char *tzName);
uint32_t sym_isConstDefined(char *tzName); uint32_t sym_isConstDefined(char *tzName);
int32_t sym_IsRelocDiffDefined(char *tzSym1, char *tzSym2); int32_t sym_IsRelocDiffDefined(char *tzSym1, char *tzSym2);
/* Functions to save and restore the current symbol scope. */
struct sSymbol *sym_GetCurrentSymbolScope(void);
void sym_SetCurrentSymbolScope(struct sSymbol *pNewScope);
#endif /* RGBDS_SYMBOL_H */ #endif /* RGBDS_SYMBOL_H */

3
src/asm/output.c
View File

@@ -42,6 +42,7 @@ struct PatchSymbol {
struct SectionStackEntry { struct SectionStackEntry {
struct Section *pSection; struct Section *pSection;
struct sSymbol *pScope; /* Section's symbol scope */
struct SectionStackEntry *pNext; struct SectionStackEntry *pNext;
}; };
@@ -64,6 +65,7 @@ void out_PushSection(void)
fatalerror("No memory for section stack"); fatalerror("No memory for section stack");
pSect->pSection = pCurrentSection; pSect->pSection = pCurrentSection;
pSect->pScope = sym_GetCurrentSymbolScope();
pSect->pNext = pSectionStack; pSect->pNext = pSectionStack;
pSectionStack = pSect; pSectionStack = pSect;
} }
@@ -77,6 +79,7 @@ void out_PopSection(void)
pSect = pSectionStack; pSect = pSectionStack;
out_SetCurrentSection(pSect->pSection); out_SetCurrentSection(pSect->pSection);
sym_SetCurrentSymbolScope(pSect->pScope);
pSectionStack = pSect->pNext; pSectionStack = pSect->pNext;
free(pSect); free(pSect);
} }

12
src/asm/symbol.c
View File

@@ -19,7 +19,7 @@
#include "extern/version.h" #include "extern/version.h"
struct sSymbol *tHashedSymbols[HASHSIZE]; struct sSymbol *tHashedSymbols[HASHSIZE];
static struct sSymbol *pScope; static struct sSymbol *pScope; /* Current section symbol scope */
struct sSymbol *pPCSymbol; struct sSymbol *pPCSymbol;
static struct sSymbol *p_NARGSymbol; static struct sSymbol *p_NARGSymbol;
static struct sSymbol *p__LINE__Symbol; static struct sSymbol *p__LINE__Symbol;
@@ -406,6 +406,16 @@ uint32_t sym_GetDefinedValue(char *s)
return 0; return 0;
} }
struct sSymbol *sym_GetCurrentSymbolScope(void)
{
return pScope;
}
void sym_SetCurrentSymbolScope(struct sSymbol *pNewScope)
{
pScope = pNewScope;
}
/* /*
* Macro argument stuff * Macro argument stuff
*/ */