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

Rename some RPN constants for consistency (#1230)

Browse Source
This commit is contained in:
Rangi
2023-11-08 15:30:27 -05:00
committed by GitHub
parent 5711c088e5
commit dde9f2bb79
5 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/asm/rpn.hpp
View File

@@ -44,8 +44,8 @@ void rpn_BinaryOp(enum RPNCommand op, struct Expression *expr,
void rpn_HIGH(struct Expression *expr, const struct Expression *src); void rpn_HIGH(struct Expression *expr, const struct Expression *src);
void rpn_LOW(struct Expression *expr, const struct Expression *src); void rpn_LOW(struct Expression *expr, const struct Expression *src);
void rpn_ISCONST(struct Expression *expr, const struct Expression *src); void rpn_ISCONST(struct Expression *expr, const struct Expression *src);
void rpn_UNNEG(struct Expression *expr, const struct Expression *src); void rpn_NEG(struct Expression *expr, const struct Expression *src);
void rpn_UNNOT(struct Expression *expr, const struct Expression *src); void rpn_NOT(struct Expression *expr, const struct Expression *src);
void rpn_BankSymbol(struct Expression *expr, char const *symName); void rpn_BankSymbol(struct Expression *expr, char const *symName);
void rpn_BankSection(struct Expression *expr, char const *sectionName); void rpn_BankSection(struct Expression *expr, char const *sectionName);
void rpn_BankSelf(struct Expression *expr); void rpn_BankSelf(struct Expression *expr);

6
include/linkdefs.hpp
View File

@@ -22,17 +22,17 @@ enum RPNCommand {
RPN_MUL = 0x02, RPN_MUL = 0x02,
RPN_DIV = 0x03, RPN_DIV = 0x03,
RPN_MOD = 0x04, RPN_MOD = 0x04,
RPN_UNSUB = 0x05, // FIXME: should be renamed to "NEG" for consistency RPN_NEG = 0x05,
RPN_EXP = 0x06, RPN_EXP = 0x06,
RPN_OR = 0x10, RPN_OR = 0x10,
RPN_AND = 0x11, RPN_AND = 0x11,
RPN_XOR = 0x12, RPN_XOR = 0x12,
RPN_UNNOT = 0x13, // FIXME: should be renamed to "NOT" for consistency RPN_NOT = 0x13,
RPN_LOGAND = 0x21, RPN_LOGAND = 0x21,
RPN_LOGOR = 0x22, RPN_LOGOR = 0x22,
RPN_LOGUNNOT = 0x23, // FIXME: should be renamed to "LOGNOT" for consistency RPN_LOGNOT = 0x23,
RPN_LOGEQ = 0x30, RPN_LOGEQ = 0x30,
RPN_LOGNE = 0x31, RPN_LOGNE = 0x31,

6
src/asm/parser.y
View File

@@ -1425,7 +1425,7 @@ reloc_8bit_offset : T_OP_ADD relocexpr {
$$ = $2; $$ = $2;
} }
| T_OP_SUB relocexpr { | T_OP_SUB relocexpr {
rpn_UNNEG(&$$, &$2); rpn_NEG(&$$, &$2);
rpn_CheckNBit(&$$, 8); rpn_CheckNBit(&$$, 8);
} }
; ;
@@ -1521,8 +1521,8 @@ relocexpr_no_str : scoped_anon_id { rpn_Symbol(&$$, $1); }
rpn_BinaryOp(RPN_EXP, &$$, &$1, &$3); rpn_BinaryOp(RPN_EXP, &$$, &$1, &$3);
} }
| T_OP_ADD relocexpr %prec NEG { $$ = $2; } | T_OP_ADD relocexpr %prec NEG { $$ = $2; }
| T_OP_SUB relocexpr %prec NEG { rpn_UNNEG(&$$, &$2); } | T_OP_SUB relocexpr %prec NEG { rpn_NEG(&$$, &$2); }
| T_OP_NOT relocexpr %prec NEG { rpn_UNNOT(&$$, &$2); } | T_OP_NOT relocexpr %prec NEG { rpn_NOT(&$$, &$2); }
| T_OP_HIGH T_LPAREN relocexpr T_RPAREN { rpn_HIGH(&$$, &$3); } | T_OP_HIGH T_LPAREN relocexpr T_RPAREN { rpn_HIGH(&$$, &$3); }
| T_OP_LOW T_LPAREN relocexpr T_RPAREN { rpn_LOW(&$$, &$3); } | T_OP_LOW T_LPAREN relocexpr T_RPAREN { rpn_LOW(&$$, &$3); }
| T_OP_ISCONST T_LPAREN relocexpr T_RPAREN { rpn_ISCONST(&$$, &$3); } | T_OP_ISCONST T_LPAREN relocexpr T_RPAREN { rpn_ISCONST(&$$, &$3); }

16
src/asm/rpn.cpp
View File

@@ -317,7 +317,7 @@ void rpn_LOGNOT(struct Expression *expr, const struct Expression *src)
expr->val = !expr->val; expr->val = !expr->val;
} else { } else {
expr->rpnPatchSize++; expr->rpnPatchSize++;
*reserveSpace(expr, 1) = RPN_LOGUNNOT; *reserveSpace(expr, 1) = RPN_LOGNOT;
} }
} }
@@ -518,9 +518,9 @@ void rpn_BinaryOp(enum RPNCommand op, struct Expression *expr,
expr->val = op_exponent(src1->val, src2->val); expr->val = op_exponent(src1->val, src2->val);
break; break;
case RPN_UNSUB: case RPN_NEG:
case RPN_UNNOT: case RPN_NOT:
case RPN_LOGUNNOT: case RPN_LOGNOT:
case RPN_BANK_SYM: case RPN_BANK_SYM:
case RPN_BANK_SECT: case RPN_BANK_SECT:
case RPN_BANK_SELF: case RPN_BANK_SELF:
@@ -635,7 +635,7 @@ void rpn_ISCONST(struct Expression *expr, const struct Expression *src)
expr->isSymbol = false; expr->isSymbol = false;
} }
void rpn_UNNEG(struct Expression *expr, const struct Expression *src) void rpn_NEG(struct Expression *expr, const struct Expression *src)
{ {
*expr = *src; *expr = *src;
expr->isSymbol = false; expr->isSymbol = false;
@@ -644,11 +644,11 @@ void rpn_UNNEG(struct Expression *expr, const struct Expression *src)
expr->val = -(uint32_t)expr->val; expr->val = -(uint32_t)expr->val;
} else { } else {
expr->rpnPatchSize++; expr->rpnPatchSize++;
*reserveSpace(expr, 1) = RPN_UNSUB; *reserveSpace(expr, 1) = RPN_NEG;
} }
} }
void rpn_UNNOT(struct Expression *expr, const struct Expression *src) void rpn_NOT(struct Expression *expr, const struct Expression *src)
{ {
*expr = *src; *expr = *src;
expr->isSymbol = false; expr->isSymbol = false;
@@ -657,6 +657,6 @@ void rpn_UNNOT(struct Expression *expr, const struct Expression *src)
expr->val = ~expr->val; expr->val = ~expr->val;
} else { } else {
expr->rpnPatchSize++; expr->rpnPatchSize++;
*reserveSpace(expr, 1) = RPN_UNNOT; *reserveSpace(expr, 1) = RPN_NOT;
} }
} }

6
src/link/patch.cpp
View File

@@ -183,7 +183,7 @@ static int32_t computeRPNExpr(struct Patch const *patch,
value = op_modulo(popRPN(), value); value = op_modulo(popRPN(), value);
} }
break; break;
case RPN_UNSUB: case RPN_NEG:
value = -popRPN(); value = -popRPN();
break; break;
case RPN_EXP: case RPN_EXP:
@@ -208,7 +208,7 @@ static int32_t computeRPNExpr(struct Patch const *patch,
case RPN_XOR: case RPN_XOR:
value = popRPN() ^ popRPN(); value = popRPN() ^ popRPN();
break; break;
case RPN_UNNOT: case RPN_NOT:
value = ~popRPN(); value = ~popRPN();
break; break;
@@ -220,7 +220,7 @@ static int32_t computeRPNExpr(struct Patch const *patch,
value = popRPN(); value = popRPN();
value = popRPN() || value; value = popRPN() || value;
break; break;
case RPN_LOGUNNOT: case RPN_LOGNOT:
value = !popRPN(); value = !popRPN();
break; break;