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

Add a way to seek a SECTION by name without creating one

Browse Source
This commit is contained in:
ISSOtm
2019-09-08 23:40:16 +02:00
parent 54ed050ecf
commit 74f43d4e09
2 changed files with 32 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/asm/output.h
View File

@@ -29,6 +29,7 @@ extern char *tzObjectname;
void out_PrepPass2(void); void out_PrepPass2(void);
void out_SetFileName(char *s); void out_SetFileName(char *s);
struct Section *out_FindSectionByName(const char *pzName);
void out_NewSection(char *pzName, uint32_t secttype); void out_NewSection(char *pzName, uint32_t secttype);
void out_NewAbsSection(char *pzName, uint32_t secttype, int32_t org, void out_NewAbsSection(char *pzName, uint32_t secttype, int32_t org,
int32_t bank); int32_t bank);

52
src/asm/output.c
View File

@@ -599,48 +599,52 @@ void out_SetFileName(char *s)
printf("Output filename %s\n", s); printf("Output filename %s\n", s);
} }
struct Section *out_FindSectionByName(const char *pzName)
{
struct Section *pSect = pSectionList;
while (pSect) {
if (strcmp(pzName, pSect->pzName) == 0)
return pSect;
pSect = pSect->pNext;
}
return NULL;
}
/* /*
* Find a section by name and type. If it doesn't exist, create it * Find a section by name and type. If it doesn't exist, create it
*/ */
struct Section *out_FindSection(char *pzName, uint32_t secttype, int32_t org, struct Section *out_FindSection(char *pzName, uint32_t secttype, int32_t org,
int32_t bank, int32_t alignment) int32_t bank, int32_t alignment)
{ {
struct Section *pSect, **ppSect; struct Section *pSect = out_FindSectionByName(pzName);
ppSect = &pSectionList; if (pSect) {
pSect = pSectionList; if (secttype == pSect->nType
&& ((uint32_t)org) == pSect->nOrg
while (pSect) { && ((uint32_t)bank) == pSect->nBank
if (strcmp(pzName, pSect->pzName) == 0) { && ((uint32_t)alignment == pSect->nAlign)) {
if (secttype == pSect->nType return pSect;
&& ((uint32_t)org) == pSect->nOrg
&& ((uint32_t)bank) == pSect->nBank
&& ((uint32_t)alignment == pSect->nAlign)) {
return pSect;
}
fatalerror("Section already exists but with a different type");
} }
ppSect = &(pSect->pNext); fatalerror("Section already exists but with a different type");
pSect = pSect->pNext;
} }
pSect = malloc(sizeof(struct Section)); pSect = malloc(sizeof(struct Section));
*ppSect = pSect;
if (pSect == NULL) if (pSect == NULL)
fatalerror("Not enough memory for section"); fatalerror("Not enough memory for section");
pSect->pzName = malloc(strlen(pzName) + 1); pSect->pzName = strdup(pzName);
if (pSect->pzName == NULL) if (pSect->pzName == NULL)
fatalerror("Not enough memory for sectionname"); fatalerror("Not enough memory for sectionname");
strcpy(pSect->pzName, pzName);
pSect->nType = secttype; pSect->nType = secttype;
pSect->nPC = 0; pSect->nPC = 0;
pSect->nOrg = org; pSect->nOrg = org;
pSect->nBank = bank; pSect->nBank = bank;
pSect->nAlign = alignment; pSect->nAlign = alignment;
pSect->pNext = NULL; pSect->pNext = pSectionList;
pSect->pPatches = NULL; pSect->pPatches = NULL;
/* It is only needed to allocate memory for ROM sections. */ /* It is only needed to allocate memory for ROM sections. */
@@ -655,7 +659,13 @@ struct Section *out_FindSection(char *pzName, uint32_t secttype, int32_t org,
pSect->tData = NULL; pSect->tData = NULL;
} }
return (pSect); /*
* Add the new section to the list
* at the beginning because order doesn't matter
*/
pSectionList = pSect;
return pSect;
} }
/* /*