gbdev/rgbds
1
0
Fork 0
mirror of https://github.com/gbdev/rgbds.git synced 2025-12-01 15:27:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move curOffset into section code

Browse Source 
Improves organization
This commit is contained in:
ISSOtm
2020-09-06 18:50:19 +02:00
parent 0d7914bff7
commit 12b7cf3cd4
7 changed files with 24 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/asm/asmy.y
View File

@@ -394,19 +394,19 @@ static void startUnion(void)
if (nUnionDepth > MAXUNIONS)
fatalerror("Too many nested UNIONs");
unionStart[unionIndex] = curOffset;
unionStart[unionIndex] = sect_GetOutputOffset();
unionSize[unionIndex] = 0;
}
static void updateUnion(void)
{
uint32_t unionIndex = nUnionDepth - 1;
uint32_t size = curOffset - unionStart[unionIndex];
uint32_t size = sect_GetOutputOffset() - unionStart[unionIndex];
if (size > unionSize[unionIndex])
unionSize[unionIndex] = size;
curOffset = unionStart[unionIndex];
sect_SetSymbolOffset(unionStart[unionIndex]);
}
static size_t strlenUTF8(const char *s)
@@ -993,7 +993,7 @@ endu : T_POP_ENDU {
updateUnion();
nUnionDepth--;
curOffset = unionStart[nUnionDepth] + unionSize[nUnionDepth];
sect_SetSymbolOffset(unionStart[nUnionDepth] + unionSize[nUnionDepth]);
}
;