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

Output a non-empty RPN buffer from known expressions

Browse Source 
The code expected to never get "known" expressions passed in, as RGBASM
otherwise patches the bytes in by itself; however, JR cannot be patched in
by RGBASM unless the section's base address is known as well!
This commit is contained in:
ISSOtm
2020-07-27 17:32:47 +02:00
parent dda052da20
commit b1adbcc77c
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/asm/output.c
View File

@@ -308,24 +308,36 @@ static struct Patch *allocpatch(uint32_t type, struct Expression const *expr,
uint32_t ofs) uint32_t ofs)
{ {
struct Patch *pPatch = malloc(sizeof(struct Patch)); struct Patch *pPatch = malloc(sizeof(struct Patch));
uint32_t rpnSize = expr->isKnown ? 5 : expr->nRPNPatchSize;
if (!pPatch) if (!pPatch)
fatalerror("No memory for patch: %s", strerror(errno)); fatalerror("No memory for patch: %s", strerror(errno));
pPatch->pRPN = malloc(sizeof(*pPatch->pRPN) * expr->nRPNPatchSize); pPatch->pRPN = malloc(sizeof(*pPatch->pRPN) * rpnSize);
if (!pPatch->pRPN) if (!pPatch->pRPN)
fatalerror("No memory for patch's RPN expression: %s", fatalerror("No memory for patch's RPN expression: %s",
strerror(errno)); strerror(errno));
pPatch->nRPNSize = 0;
pPatch->nType = type; pPatch->nType = type;
fstk_DumpToStr(pPatch->tzFilename, sizeof(pPatch->tzFilename)); fstk_DumpToStr(pPatch->tzFilename, sizeof(pPatch->tzFilename));
pPatch->nOffset = ofs; pPatch->nOffset = ofs;
pPatch->pcSection = sect_GetSymbolSection(); pPatch->pcSection = sect_GetSymbolSection();
pPatch->pcOffset = curOffset; pPatch->pcOffset = curOffset;
/* If the expression's value is known, output a constant RPN expression directly */
if (expr->isKnown) {
pPatch->nRPNSize = rpnSize;
/* Make sure to update `rpnSize` above if modifying this! */
pPatch->pRPN[0] = RPN_CONST;
pPatch->pRPN[1] = (uint32_t)(expr->nVal) & 0xFF;
pPatch->pRPN[2] = (uint32_t)(expr->nVal) >> 8;
pPatch->pRPN[3] = (uint32_t)(expr->nVal) >> 16;
pPatch->pRPN[4] = (uint32_t)(expr->nVal) >> 24;
} else {
pPatch->nRPNSize = 0;
writerpn(pPatch->pRPN, &pPatch->nRPNSize, expr->tRPN, expr->nRPNLength); writerpn(pPatch->pRPN, &pPatch->nRPNSize, expr->tRPN, expr->nRPNLength);
assert(pPatch->nRPNSize == expr->nRPNPatchSize); }
assert(pPatch->nRPNSize == rpnSize);
return pPatch; return pPatch;
} }