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

Refactor part of getSection into createSection

Browse Source 
getSection validates its parameters and calls
either mergeSections or createSection.
This commit is contained in:
Rangi
2021-02-28 16:12:03 -05:00
parent 1dafc1c762
commit 76d8862900
1 changed files with 45 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
src/asm/section.c
View File

@@ -245,7 +245,47 @@ static void mergeSections(struct Section *sect, enum SectionType type, uint32_t
#undef fail #undef fail
/* /*
* Find a section by name and type. If it doesn't exist, create it * Create a new section, not yet in the list.
*/
static struct Section *createSection(char const *name, enum SectionType type,
uint32_t org, uint32_t bank, uint8_t alignment,
uint16_t alignOffset, enum SectionModifier mod)
{
struct Section *sect = malloc(sizeof(*sect));
if (sect == NULL)
fatalerror("Not enough memory for section: %s\n", strerror(errno));
sect->name = strdup(name);
if (sect->name == NULL)
fatalerror("Not enough memory for section name: %s\n", strerror(errno));
sect->type = type;
sect->modifier = mod;
sect->src = fstk_GetFileStack();
sect->fileLine = lexer_GetLineNo();
sect->size = 0;
sect->org = org;
sect->bank = bank;
sect->align = alignment;
sect->alignOfs = alignOffset;
sect->next = NULL;
sect->patches = NULL;
/* It is only needed to allocate memory for ROM sections. */
if (sect_HasData(type)) {
sect->data = malloc(maxsize[type]);
if (sect->data == NULL)
fatalerror("Not enough memory for section: %s\n", strerror(errno));
} else {
sect->data = NULL;
}
return sect;
}
/*
* Find a section by name and type. If it doesn't exist, create it.
*/ */
static struct Section *getSection(char const *name, enum SectionType type, uint32_t org, static struct Section *getSection(char const *name, enum SectionType type, uint32_t org,
struct SectionSpec const *attrs, enum SectionModifier mod) struct SectionSpec const *attrs, enum SectionModifier mod)
@@ -313,43 +353,12 @@ static struct Section *getSection(char const *name, enum SectionType type, uint3
if (sect) { if (sect) {
mergeSections(sect, type, org, bank, alignment, alignOffset, mod); mergeSections(sect, type, org, bank, alignment, alignOffset, mod);
return sect;
}
sect = malloc(sizeof(*sect));
if (sect == NULL)
fatalerror("Not enough memory for section: %s\n", strerror(errno));
sect->name = strdup(name);
if (sect->name == NULL)
fatalerror("Not enough memory for section name: %s\n", strerror(errno));
sect->type = type;
sect->modifier = mod;
sect->src = fstk_GetFileStack();
sect->fileLine = lexer_GetLineNo();
sect->size = 0;
sect->org = org;
sect->bank = bank;
sect->align = alignment;
sect->alignOfs = alignOffset;
sect->patches = NULL;
/* It is only needed to allocate memory for ROM sections. */
if (sect_HasData(type)) {
uint32_t sectsize;
sectsize = maxsize[type];
sect->data = malloc(sectsize);
if (sect->data == NULL)
fatalerror("Not enough memory for section: %s\n", strerror(errno));
} else { } else {
sect->data = NULL; sect = createSection(name, type, org, bank, alignment, alignOffset, mod);
}
// Add the new section to the list (order doesn't matter) // Add the new section to the list (order doesn't matter)
sect->next = pSectionList; sect->next = pSectionList;
pSectionList = sect; pSectionList = sect;
}
return sect; return sect;
} }