gbdev/rgbds
1
0
Fork 0
mirror of https://github.com/gbdev/rgbds.git synced 2025-11-22 19:22:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Implement LOAD UNION and LOAD FRAGMENT

Browse Source 
Fix #632
This commit is contained in:
Rangi
2021-02-14 16:55:19 -05:00
committed by Eldred Habert
parent c67a696a87
commit 76d6ef8695
12 changed files with 76 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/asm/parser.y
View File

@@ -853,8 +853,8 @@ shift : T_POP_SHIFT { macro_ShiftCurrentArgs(1); }
| T_POP_SHIFT const { macro_ShiftCurrentArgs($2); }
;
load : T_POP_LOAD string T_COMMA sectiontype sectorg sectattrs {
out_SetLoadSection($2, $4, $5, &$6);
load : T_POP_LOAD sectmod string T_COMMA sectiontype sectorg sectattrs {
out_SetLoadSection($3, $5, $6, &$7, $2);
}
| T_POP_ENDL { out_EndLoadSection(); }
;

7
src/asm/rgbasm.5
View File

@@ -719,6 +719,13 @@ The former is situated in ROM, where the code is stored, the latter in RAM, wher
You cannot nest
.Ic LOAD
blocks, nor can you change the current section within them.
.Pp
.Ic LOAD
blocks can use the
.Ic UNION
or
.Ic FRAGMENT
modifiers, as described below.
.Ss Unionized Sections
When you're tight on RAM, you may want to define overlapping blocks of variables, as explained in the
.Sx Unions

13
src/asm/section.c
View File

@@ -30,7 +30,7 @@ struct SectionStackEntry {
struct SectionStackEntry *sectionStack;
uint32_t curOffset; /* Offset into the current section (see sect_GetSymbolOffset) */
static struct Section *currentLoadSection = NULL;
uint32_t loadOffset; /* The offset of the LOAD section within its parent */
int32_t loadOffset; /* Offset into the LOAD section's parent (see sect_GetOutputOffset) */
struct UnionStackEntry {
uint32_t start;
@@ -387,7 +387,8 @@ void out_NewSection(char const *name, uint32_t type, uint32_t org,
* Set the current section by name and type
*/
void out_SetLoadSection(char const *name, uint32_t type, uint32_t org,
struct SectionSpec const *attribs)
struct SectionSpec const *attribs,
enum SectionModifier mod)
{
checkcodesection();
@@ -397,11 +398,11 @@ void out_SetLoadSection(char const *name, uint32_t type, uint32_t org,
if (sect_HasData(type))
error("`LOAD` blocks cannot create a ROM section\n");
struct Section *sect = getSection(name, type, org, attribs, false);
struct Section *sect = getSection(name, type, org, attribs, mod);
loadOffset = curOffset;
curOffset = 0; /* curOffset -= loadOffset; */
changeSection();
loadOffset = curOffset - (mod == SECTION_UNION ? 0 : sect->size);
curOffset -= loadOffset;
currentLoadSection = sect;
}
@@ -409,11 +410,11 @@ void out_EndLoadSection(void)
{
if (!currentLoadSection)
error("Found `ENDL` outside of a `LOAD` block\n");
currentLoadSection = NULL;
changeSection();
curOffset += loadOffset;
loadOffset = 0;
currentLoadSection = NULL;
}
struct Section *sect_GetSymbolSection(void)