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

Save UNION stack when using PUSHS as well

Browse Source 
This allows using the latter within the former
This commit is contained in:
ISSOtm
2021-05-21 09:47:27 +02:00
parent 69d7f84502
commit e3b7339dd6
5 changed files with 54 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/asm/section.c
View File

@@ -20,12 +20,19 @@
uint8_t fillByte;
struct UnionStackEntry {
uint32_t start;
uint32_t size;
struct UnionStackEntry *next;
} *unionStack = NULL;
struct SectionStackEntry {
struct Section *section;
struct Section *loadSection;
char const *scope; /* Section's symbol scope */
uint32_t offset;
int32_t loadOffset;
struct UnionStackEntry *unionStack;
struct SectionStackEntry *next;
};
@@ -35,12 +42,6 @@ struct Section *currentSection = NULL;
static struct Section *currentLoadSection = NULL;
int32_t loadOffset; /* Offset into the LOAD section's parent (see sect_GetOutputOffset) */
struct UnionStackEntry {
uint32_t start;
uint32_t size;
struct UnionStackEntry *next;
} *unionStack = NULL;
/*
* A quick check to see if we have an initialized section
*/
@@ -428,6 +429,11 @@ void sect_NewSection(char const *name, uint32_t type, uint32_t org,
void sect_SetLoadSection(char const *name, uint32_t type, uint32_t org,
struct SectionSpec const *attribs, enum SectionModifier mod)
{
// Important info: currently, UNION and LOAD cannot interact, since UNION is prohibited in
// "code" sections, whereas LOAD is restricted to them.
// Therefore, any interactions are NOT TESTED, so lift either of those restrictions at
// your own peril! ^^
if (!checkcodesection())
return;
@@ -548,6 +554,11 @@ static void createPatch(enum PatchType type, struct Expression const *expr, uint
void sect_StartUnion(void)
{
// Important info: currently, UNION and LOAD cannot interact, since UNION is prohibited in
// "code" sections, whereas LOAD is restricted to them.
// Therefore, any interactions are NOT TESTED, so lift either of those restrictions at
// your own peril! ^^
if (!currentSection) {
error("UNIONs must be inside a SECTION\n");
return;
@@ -964,22 +975,24 @@ cleanup:
*/
void sect_PushSection(void)
{
struct SectionStackEntry *sect = malloc(sizeof(*sect));
struct SectionStackEntry *entry = malloc(sizeof(*entry));
if (sect == NULL)
if (entry == NULL)
fatalerror("No memory for section stack: %s\n", strerror(errno));
sect->section = currentSection;
sect->loadSection = currentLoadSection;
sect->scope = sym_GetCurrentSymbolScope();
sect->offset = curOffset;
sect->loadOffset = loadOffset;
sect->next = sectionStack;
sectionStack = sect;
entry->section = currentSection;
entry->loadSection = currentLoadSection;
entry->scope = sym_GetCurrentSymbolScope();
entry->offset = curOffset;
entry->loadOffset = loadOffset;
entry->unionStack = unionStack;
entry->next = sectionStack;
sectionStack = entry;
// Reset the section scope
currentSection = NULL;
currentLoadSection = NULL;
sym_SetCurrentSymbolScope(NULL);
unionStack = NULL;
}
void sect_PopSection(void)
@@ -998,6 +1011,7 @@ void sect_PopSection(void)
sym_SetCurrentSymbolScope(entry->scope);
curOffset = entry->offset;
loadOffset = entry->loadOffset;
unionStack = entry->unionStack;
sectionStack = entry->next;
free(entry);