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

Use automatic allocation for patch RPN

Browse Source
This commit is contained in:
Rangi42
2024-02-22 15:56:45 -05:00
committed by Sylvie
parent dec1811d20
commit 1b8e588961
2 changed files with 10 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/asm/section.hpp
View File

@@ -23,8 +23,7 @@ struct Patch {
struct Section *pcSection; struct Section *pcSection;
uint32_t pcOffset; uint32_t pcOffset;
uint8_t type; uint8_t type;
uint32_t rpnSize; std::vector<uint8_t> rpn;
uint8_t *rpn;
}; };
struct Section { struct Section {

41
src/asm/output.cpp
View File

@@ -113,8 +113,8 @@ static void writepatch(struct Patch const &patch, FILE *f)
putlong(getSectIDIfAny(patch.pcSection), f); putlong(getSectIDIfAny(patch.pcSection), f);
putlong(patch.pcOffset, f); putlong(patch.pcOffset, f);
putc(patch.type, f); putc(patch.type, f);
putlong(patch.rpnSize, f); putlong(patch.rpn.size(), f);
fwrite(patch.rpn, 1, patch.rpnSize, f); fwrite(patch.rpn.data(), 1, patch.rpn.size(), f);
} }
// Write a section to a file // Write a section to a file
@@ -143,14 +143,6 @@ static void writesection(struct Section const &sect, FILE *f)
} }
} }
static void freesection(struct Section &sect)
{
if (sect_HasData(sect.type)) {
for (struct Patch &patch : sect.patches)
free(patch.rpn);
}
}
// Write a symbol to a file // Write a symbol to a file
static void writesymbol(struct Symbol const *sym, FILE *f) static void writesymbol(struct Symbol const *sym, FILE *f)
{ {
@@ -184,14 +176,14 @@ static uint32_t getSymbolID(struct Symbol *sym)
return sym->ID; return sym->ID;
} }
static void writerpn(uint8_t *rpnexpr, uint32_t *rpnptr, const uint8_t *rpn, static void writerpn(std::vector<uint8_t> &rpnexpr, const uint8_t *rpn, uint32_t rpnlen)
uint32_t rpnlen)
{ {
char symName[512]; char symName[512];
size_t rpnptr = 0;
for (size_t offset = 0; offset < rpnlen; ) { for (size_t offset = 0; offset < rpnlen; ) {
#define popbyte() rpn[offset++] #define popbyte() rpn[offset++]
#define writebyte(byte) rpnexpr[(*rpnptr)++] = byte #define writebyte(byte) rpnexpr[rpnptr++] = byte
uint8_t rpndata = popbyte(); uint8_t rpndata = popbyte();
switch (rpndata) { switch (rpndata) {
@@ -285,10 +277,7 @@ static void initpatch(struct Patch &patch, uint32_t type, struct Expression cons
uint32_t rpnSize = rpn_isKnown(expr) ? 5 : expr->rpnPatchSize; uint32_t rpnSize = rpn_isKnown(expr) ? 5 : expr->rpnPatchSize;
struct FileStackNode *node = fstk_GetFileStack(); struct FileStackNode *node = fstk_GetFileStack();
patch.rpn = (uint8_t *)malloc(sizeof(*patch.rpn) * rpnSize); patch.rpn.resize(rpnSize);
if (!patch.rpn)
fatalerror("No memory for patch's RPN rpnSize: %s\n", strerror(errno));
patch.type = type; patch.type = type;
patch.src = node; patch.src = node;
// All patches are assumed to eventually be written, so the file stack node is registered // All patches are assumed to eventually be written, so the file stack node is registered
@@ -300,7 +289,6 @@ static void initpatch(struct Patch &patch, uint32_t type, struct Expression cons
// If the rpnSize's value is known, output a constant RPN rpnSize directly // If the rpnSize's value is known, output a constant RPN rpnSize directly
if (rpn_isKnown(expr)) { if (rpn_isKnown(expr)) {
patch.rpnSize = rpnSize;
// Make sure to update `rpnSize` above if modifying this! // Make sure to update `rpnSize` above if modifying this!
patch.rpn[0] = RPN_CONST; patch.rpn[0] = RPN_CONST;
patch.rpn[1] = (uint32_t)(expr->val) & 0xFF; patch.rpn[1] = (uint32_t)(expr->val) & 0xFF;
@@ -308,10 +296,8 @@ static void initpatch(struct Patch &patch, uint32_t type, struct Expression cons
patch.rpn[3] = (uint32_t)(expr->val) >> 16; patch.rpn[3] = (uint32_t)(expr->val) >> 16;
patch.rpn[4] = (uint32_t)(expr->val) >> 24; patch.rpn[4] = (uint32_t)(expr->val) >> 24;
} else { } else {
patch.rpnSize = 0; writerpn(patch.rpn, expr->rpn, expr->rpnLength);
writerpn(patch.rpn, &patch.rpnSize, expr->rpn, expr->rpnLength);
} }
assert(patch.rpnSize == rpnSize);
} }
// Create a new patch (includes the rpn expr) // Create a new patch (includes the rpn expr)
@@ -344,11 +330,6 @@ static void writeassert(struct Assertion &assert, FILE *f)
putstring(assert.message.c_str(), f); putstring(assert.message.c_str(), f);
} }
static void freeassert(struct Assertion &assert)
{
free(assert.patch.rpn);
}
static void writeFileStackNode(struct FileStackNode const *node, FILE *f) static void writeFileStackNode(struct FileStackNode const *node, FILE *f)
{ {
putlong(node->parent ? node->parent->ID : (uint32_t)-1, f); putlong(node->parent ? node->parent->ID : (uint32_t)-1, f);
@@ -413,17 +394,13 @@ void out_WriteObject(void)
for (struct Symbol const *sym : objectSymbols) for (struct Symbol const *sym : objectSymbols)
writesymbol(sym, f); writesymbol(sym, f);
for (struct Section &sect : sectionList) { for (struct Section &sect : sectionList)
writesection(sect, f); writesection(sect, f);
freesection(sect);
}
putlong(assertions.size(), f); putlong(assertions.size(), f);
for (struct Assertion &assert : assertions) { for (struct Assertion &assert : assertions)
writeassert(assert, f); writeassert(assert, f);
freeassert(assert);
}
fclose(f); fclose(f);
} }