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

Refactor to avoid repeating rpn_isKnown(expr)

Browse Source
This commit is contained in:
Rangi42
2024-02-28 14:33:03 -05:00
committed by Sylvie
parent d6681d3580
commit ace45bfd90
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/asm/output.cpp
View File

@@ -269,10 +269,8 @@ static void writerpn(std::vector<uint8_t> &rpnexpr, const std::vector<uint8_t> &
static void initpatch(struct Patch &patch, uint32_t type, struct Expression const *expr, uint32_t ofs) static void initpatch(struct Patch &patch, uint32_t type, struct Expression const *expr, uint32_t ofs)
{ {
uint32_t rpnSize = rpn_isKnown(expr) ? 5 : expr->rpnPatchSize;
struct FileStackNode *node = fstk_GetFileStack(); struct FileStackNode *node = fstk_GetFileStack();
patch.rpn.resize(rpnSize);
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
@@ -282,15 +280,16 @@ static void initpatch(struct Patch &patch, uint32_t type, struct Expression cons
patch.pcSection = sect_GetSymbolSection(); patch.pcSection = sect_GetSymbolSection();
patch.pcOffset = sect_GetSymbolOffset(); patch.pcOffset = sect_GetSymbolOffset();
// If the rpnSize's value is known, output a constant RPN rpnSize directly
if (rpn_isKnown(expr)) { if (rpn_isKnown(expr)) {
// Make sure to update `rpnSize` above if modifying this! // If the RPN expr's value is known, output a constant directly
patch.rpn.resize(5);
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;
patch.rpn[2] = (uint32_t)(expr->val) >> 8; patch.rpn[2] = (uint32_t)(expr->val) >> 8;
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.rpn.resize(expr->rpnPatchSize);
writerpn(patch.rpn, *expr->rpn); writerpn(patch.rpn, *expr->rpn);
} }
} }