From 4e8b1c15de6d0edf0e50a74ee6ddbef2bf460c82 Mon Sep 17 00:00:00 2001
From: Max Wash <mbswash@gmail.com>
Date: Mon, 8 Sep 2025 15:46:44 +0100
Subject: [PATCH] common: rename instruction opcode enum names to avoid
 conflict

---
 common/include/ivy/opcode.h | 90 +++++++++++++++++++------------------
 1 file changed, 46 insertions(+), 44 deletions(-)

diff --git a/common/include/ivy/opcode.h b/common/include/ivy/opcode.h
index ff6c6c5..e108ef4 100644
--- a/common/include/ivy/opcode.h
+++ b/common/include/ivy/opcode.h
@@ -27,66 +27,68 @@ enum ivy_instr_id {
 	IVY_INSTR_IT_G,
 	IVY_INSTR_IT_N,
 	IVY_INSTR_IT_V,
+	IVY_INSTR_STK_A,
+	IVY_INSTR_STK_F,
 	IVY_INSTR_RET,
 	IVY_INSTR_RET_N,
 };
 
 enum ivy_opcode {
-	IVY_OP_NONE = 0,
+	IVY_OPC_NONE = 0,
 
-	IVY_OP_LDR_SP_REG,
-	IVY_OP_LDR_SP_CONST,
-	IVY_OP_LDR_BP_REG,
-	IVY_OP_LDR_BP_CONST,
-	IVY_OP_LDR_SELF_REG,
-	IVY_OP_LDR_SELF_CONST,
-	IVY_OP_LDR_POOL_REG,
-	IVY_OP_LDR_POOL_CONST,
-	IVY_OP_LDR_CONST,
+	IVY_OPC_LDR_SP_REG,
+	IVY_OPC_LDR_SP_CONST,
+	IVY_OPC_LDR_BP_REG,
+	IVY_OPC_LDR_BP_CONST,
+	IVY_OPC_LDR_SELF_REG,
+	IVY_OPC_LDR_SELF_CONST,
+	IVY_OPC_LDR_POOL_REG,
+	IVY_OPC_LDR_POOL_CONST,
+	IVY_OPC_LDR_CONST,
 
-	IVY_OP_STR_SP_REG,
-	IVY_OP_STR_SP_CONST,
-	IVY_OP_STR_BP_REG,
-	IVY_OP_STR_BP_CONST,
-	IVY_OP_STR_SELF_REG,
-	IVY_OP_STR_SELF_CONST,
+	IVY_OPC_STR_SP_REG,
+	IVY_OPC_STR_SP_CONST,
+	IVY_OPC_STR_BP_REG,
+	IVY_OPC_STR_BP_CONST,
+	IVY_OPC_STR_SELF_REG,
+	IVY_OPC_STR_SELF_CONST,
 
-	IVY_OP_PUSH_REG,
-	IVY_OP_PUSH_CONST,
-	IVY_OP_POP,
+	IVY_OPC_PUSH_REG,
+	IVY_OPC_PUSH_CONST,
+	IVY_OPC_POP,
 
-	IVY_OP_MSG_REG,
-	IVY_OP_MSG_CONST,
+	IVY_OPC_MSG_REG,
+	IVY_OPC_MSG_CONST,
 
-	IVY_OP_ADD,
-	IVY_OP_SUB,
-	IVY_OP_MUL,
-	IVY_OP_DIV,
+	IVY_OPC_ADD,
+	IVY_OPC_SUB,
+	IVY_OPC_MUL,
+	IVY_OPC_DIV,
 
-	IVY_OP_C_EQ,
-	IVY_OP_C_NE,
-	IVY_OP_C_LT,
-	IVY_OP_C_LE,
-	IVY_OP_C_GT,
-	IVY_OP_C_GE,
+	IVY_OPC_C_EQ,
+	IVY_OPC_C_NE,
+	IVY_OPC_C_LT,
+	IVY_OPC_C_LE,
+	IVY_OPC_C_GT,
+	IVY_OPC_C_GE,
 
-	IVY_OP_BR,
-	IVY_OP_BR_T,
-	IVY_OP_BR_F,
+	IVY_OPC_BR,
+	IVY_OPC_BR_T,
+	IVY_OPC_BR_F,
 
-	IVY_OP_OB_C_REG,
-	IVY_OP_OB_C_CONST,
-	IVY_OP_OB_E,
+	IVY_OPC_OB_C_REG,
+	IVY_OPC_OB_C_CONST,
+	IVY_OPC_OB_E,
 
-	IVY_OP_LAM_C_REG,
-	IVY_OP_LAM_C_CONST,
+	IVY_OPC_LAM_C_REG,
+	IVY_OPC_LAM_C_CONST,
 
-	IVY_OP_IT_G,
-	IVY_OP_IT_N,
-	IVY_OP_IT_V,
+	IVY_OPC_IT_G,
+	IVY_OPC_IT_N,
+	IVY_OPC_IT_V,
 
-	IVY_OP_RET,
-	IVY_OP_RET_N,
+	IVY_OPC_RET,
+	IVY_OPC_RET_N,
 };
 
 #endif