From dde9f2bb79423c7a9bfa370e023db930504c08d4 Mon Sep 17 00:00:00 2001
From: Rangi <35663410+Rangi42@users.noreply.github.com>
Date: Wed, 8 Nov 2023 15:30:27 -0500
Subject: [PATCH] Rename some RPN constants for consistency (#1230)

---
 include/asm/rpn.hpp  |  4 ++--
 include/linkdefs.hpp |  6 +++---
 src/asm/parser.y     |  6 +++---
 src/asm/rpn.cpp      | 16 ++++++++--------
 src/link/patch.cpp   |  6 +++---
 5 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/include/asm/rpn.hpp b/include/asm/rpn.hpp
index 890e2f3ed..c47b04168 100644
--- a/include/asm/rpn.hpp
+++ b/include/asm/rpn.hpp
@@ -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_LOW(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_UNNOT(struct Expression *expr, const struct Expression *src);
+void rpn_NEG(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_BankSection(struct Expression *expr, char const *sectionName);
 void rpn_BankSelf(struct Expression *expr);
diff --git a/include/linkdefs.hpp b/include/linkdefs.hpp
index f428d8aa0..db2e150a3 100644
--- a/include/linkdefs.hpp
+++ b/include/linkdefs.hpp
@@ -22,17 +22,17 @@ enum RPNCommand {
 	RPN_MUL			= 0x02,
 	RPN_DIV			= 0x03,
 	RPN_MOD			= 0x04,
-	RPN_UNSUB		= 0x05, // FIXME: should be renamed to "NEG" for consistency
+	RPN_NEG			= 0x05,
 	RPN_EXP			= 0x06,
 
 	RPN_OR			= 0x10,
 	RPN_AND			= 0x11,
 	RPN_XOR			= 0x12,
-	RPN_UNNOT		= 0x13, // FIXME: should be renamed to "NOT" for consistency
+	RPN_NOT			= 0x13,
 
 	RPN_LOGAND		= 0x21,
 	RPN_LOGOR		= 0x22,
-	RPN_LOGUNNOT		= 0x23, // FIXME: should be renamed to "LOGNOT" for consistency
+	RPN_LOGNOT		= 0x23,
 
 	RPN_LOGEQ		= 0x30,
 	RPN_LOGNE		= 0x31,
diff --git a/src/asm/parser.y b/src/asm/parser.y
index 71c8ef00a..d368a8886 100644
--- a/src/asm/parser.y
+++ b/src/asm/parser.y
@@ -1425,7 +1425,7 @@ reloc_8bit_offset : T_OP_ADD relocexpr {
 			$$ = $2;
 		}
 		| T_OP_SUB relocexpr {
-			rpn_UNNEG(&$$, &$2);
+			rpn_NEG(&$$, &$2);
 			rpn_CheckNBit(&$$, 8);
 		}
 ;
@@ -1521,8 +1521,8 @@ relocexpr_no_str : scoped_anon_id { rpn_Symbol(&$$, $1); }
 			rpn_BinaryOp(RPN_EXP, &$$, &$1, &$3);
 		}
 		| T_OP_ADD relocexpr %prec NEG { $$ = $2; }
-		| T_OP_SUB relocexpr %prec NEG { rpn_UNNEG(&$$, &$2); }
-		| T_OP_NOT relocexpr %prec NEG { rpn_UNNOT(&$$, &$2); }
+		| T_OP_SUB relocexpr %prec NEG { rpn_NEG(&$$, &$2); }
+		| T_OP_NOT relocexpr %prec NEG { rpn_NOT(&$$, &$2); }
 		| T_OP_HIGH T_LPAREN relocexpr T_RPAREN { rpn_HIGH(&$$, &$3); }
 		| T_OP_LOW T_LPAREN relocexpr T_RPAREN { rpn_LOW(&$$, &$3); }
 		| T_OP_ISCONST T_LPAREN relocexpr T_RPAREN { rpn_ISCONST(&$$, &$3); }
diff --git a/src/asm/rpn.cpp b/src/asm/rpn.cpp
index d33400a0a..308a73c96 100644
--- a/src/asm/rpn.cpp
+++ b/src/asm/rpn.cpp
@@ -317,7 +317,7 @@ void rpn_LOGNOT(struct Expression *expr, const struct Expression *src)
 		expr->val = !expr->val;
 	} else {
 		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);
 			break;
 
-		case RPN_UNSUB:
-		case RPN_UNNOT:
-		case RPN_LOGUNNOT:
+		case RPN_NEG:
+		case RPN_NOT:
+		case RPN_LOGNOT:
 		case RPN_BANK_SYM:
 		case RPN_BANK_SECT:
 		case RPN_BANK_SELF:
@@ -635,7 +635,7 @@ void rpn_ISCONST(struct Expression *expr, const struct Expression *src)
 	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->isSymbol = false;
@@ -644,11 +644,11 @@ void rpn_UNNEG(struct Expression *expr, const struct Expression *src)
 		expr->val = -(uint32_t)expr->val;
 	} else {
 		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->isSymbol = false;
@@ -657,6 +657,6 @@ void rpn_UNNOT(struct Expression *expr, const struct Expression *src)
 		expr->val = ~expr->val;
 	} else {
 		expr->rpnPatchSize++;
-		*reserveSpace(expr, 1) = RPN_UNNOT;
+		*reserveSpace(expr, 1) = RPN_NOT;
 	}
 }
diff --git a/src/link/patch.cpp b/src/link/patch.cpp
index b60a392c6..a0525825b 100644
--- a/src/link/patch.cpp
+++ b/src/link/patch.cpp
@@ -183,7 +183,7 @@ static int32_t computeRPNExpr(struct Patch const *patch,
 				value = op_modulo(popRPN(), value);
 			}
 			break;
-		case RPN_UNSUB:
+		case RPN_NEG:
 			value = -popRPN();
 			break;
 		case RPN_EXP:
@@ -208,7 +208,7 @@ static int32_t computeRPNExpr(struct Patch const *patch,
 		case RPN_XOR:
 			value = popRPN() ^ popRPN();
 			break;
-		case RPN_UNNOT:
+		case RPN_NOT:
 			value = ~popRPN();
 			break;
 
@@ -220,7 +220,7 @@ static int32_t computeRPNExpr(struct Patch const *patch,
 			value = popRPN();
 			value = popRPN() || value;
 			break;
-		case RPN_LOGUNNOT:
+		case RPN_LOGNOT:
 			value = !popRPN();
 			break;