From 3cdf54e7e967128f2c8e079c4b666d754cc4045a Mon Sep 17 00:00:00 2001
From: David Anderson <dvander@alliedmods.net>
Date: Wed, 20 Sep 2006 04:52:13 +0000
Subject: [PATCH] fixed AMX_INFO_FRM being used instead of AMX_REG_INFO

--HG--
extra : convert_revision : svn%3A39bc706e-5318-0410-9160-8a85361fbb7c/trunk%4078
---
 sourcepawn/vm/jit/x86/jit_x86.cpp        | 32 ++++++++++++------------
 sourcepawn/vm/jit/x86/jit_x86.h          |  6 ++---
 sourcepawn/vm/jit/x86/opcode_helpers.cpp | 22 ++++++++++++++++
 3 files changed, 41 insertions(+), 19 deletions(-)

diff --git a/sourcepawn/vm/jit/x86/jit_x86.cpp b/sourcepawn/vm/jit/x86/jit_x86.cpp
index 4f178a64..693890d5 100644
--- a/sourcepawn/vm/jit/x86/jit_x86.cpp
+++ b/sourcepawn/vm/jit/x86/jit_x86.cpp
@@ -218,16 +218,16 @@ inline void WriteOp_Proc(JitWriter *jit)
 {
 	//push old frame on stack:
 	//sub ebp, 4
-	//mov ecx, frm
+	//mov ecx, [frm]
 	//mov [ebp], ecx
 	IA32_Sub_Rm_Imm8(jit, AMX_REG_STK, 4, MOD_REG);
 	IA32_Mov_Reg_Rm(jit, AMX_REG_TMP, AMX_INFO_FRM, MOD_MEM_REG);
 	IA32_Mov_Rm_Reg(jit, AMX_REG_STK, AMX_REG_TMP, MOD_MEM_REG);
 	//save frame:
-	//mov frm, ebp	- get new frame
-	//mov ebx, ebp	- store frame back
-	//sub frm, edi	- relocate local frame
-	IA32_Mov_Rm_Reg(jit, AMX_REG_INFO, AMX_REG_STK, MOD_MEM_REG);
+	//mov [frm], ebp	- get new frame
+	//mov ebx, ebp		- store frame back
+	//sub [frm], edi	- relocate local frame
+	IA32_Mov_Rm_Reg(jit, AMX_INFO_FRM, AMX_REG_STK, MOD_MEM_REG);
 	IA32_Mov_Rm_Reg(jit, AMX_REG_FRM, AMX_REG_STK, MOD_REG);
 	IA32_Sub_Rm_Reg(jit, AMX_INFO_FRM, AMX_REG_DAT, MOD_MEM_REG);
 }
@@ -936,30 +936,30 @@ inline void WriteOp_Fill(JitWriter *jit)
 
 inline void WriteOp_Heap_Pri(JitWriter *jit)
 {
-	//mov edx, hea
-	//add hea, eax
-	IA32_Mov_Reg_Rm_Disp8(jit, AMX_REG_ALT, AMX_INFO_FRM, AMX_INFO_HEAP);
-	IA32_Add_Rm_Reg_Disp8(jit, AMX_INFO_FRM, AMX_REG_PRI, AMX_INFO_HEAP);
+	//mov edx, [hea]
+	//add [hea], eax
+	IA32_Mov_Reg_Rm_Disp8(jit, AMX_REG_ALT, AMX_REG_INFO, AMX_INFO_HEAP);
+	IA32_Add_Rm_Reg_Disp8(jit, AMX_REG_INFO, AMX_REG_PRI, AMX_INFO_HEAP);
 }
 
 inline void WriteOp_Push_Heap_C(JitWriter *jit)
 {
-	//mov ecx, hea
+	//mov ecx, [hea]
 	//mov [edi+ecx], <val>
-	//add hea, 4
+	//add [hea], 4
 	cell_t val = jit->read_cell();
-	IA32_Mov_Reg_Rm_Disp8(jit, AMX_REG_TMP, AMX_INFO_FRM, AMX_INFO_HEAP);
+	IA32_Mov_Reg_Rm_Disp8(jit, AMX_REG_TMP, AMX_REG_INFO, AMX_INFO_HEAP);
 	IA32_Mov_Rm_Imm32_Disp_Reg(jit, AMX_REG_DAT, AMX_REG_TMP, NOSCALE, val);
-	IA32_Add_Rm_Imm8_Disp8(jit, AMX_INFO_FRM, 4, AMX_INFO_HEAP);
+	IA32_Add_Rm_Imm8_Disp8(jit, AMX_REG_INFO, 4, AMX_INFO_HEAP);
 }
 
 inline void WriteOp_Pop_Heap_Pri(JitWriter *jit)
 {
-	//sub hea, 4
+	//sub [hea], 4
 	//mov ecx, [hea]
 	//mov eax, [edi+ecx]
-	IA32_Sub_Rm_Imm8_Disp8(jit, AMX_INFO_FRM, 4, AMX_INFO_HEAP);
-	IA32_Mov_Reg_Rm_Disp8(jit, AMX_REG_TMP, AMX_INFO_FRM, AMX_INFO_HEAP);
+	IA32_Sub_Rm_Imm8_Disp8(jit, AMX_REG_INFO, 4, AMX_INFO_HEAP);
+	IA32_Mov_Reg_Rm_Disp8(jit, AMX_REG_TMP, AMX_REG_INFO, AMX_INFO_HEAP);
 	IA32_Mov_Reg_Rm_Disp_Reg(jit, AMX_REG_PRI, AMX_REG_DAT, AMX_REG_TMP, NOSCALE);
 }
 
diff --git a/sourcepawn/vm/jit/x86/jit_x86.h b/sourcepawn/vm/jit/x86/jit_x86.h
index b78ca8a2..7fa56ce2 100644
--- a/sourcepawn/vm/jit/x86/jit_x86.h
+++ b/sourcepawn/vm/jit/x86/jit_x86.h
@@ -40,8 +40,8 @@ public:
 #define AMX_REG_INFO	REG_ESI
 #define AMX_REG_FRM		REG_EBX
 
-#define AMX_INFO_FRM	AMX_REG_INFO
-#define AMX_INFO_HEAP	4
-#define AMX_INFO_RETVAL	12
+#define AMX_INFO_FRM		AMX_REG_INFO
+#define AMX_INFO_HEAP		4
+#define AMX_INFO_RETVAL		8
 
 #endif //_INCLUDE_SOURCEPAWN_JIT_X86_H_
diff --git a/sourcepawn/vm/jit/x86/opcode_helpers.cpp b/sourcepawn/vm/jit/x86/opcode_helpers.cpp
index b78b3156..012f3a05 100644
--- a/sourcepawn/vm/jit/x86/opcode_helpers.cpp
+++ b/sourcepawn/vm/jit/x86/opcode_helpers.cpp
@@ -6,6 +6,28 @@
 
 int OpAdvTable[OP_NUM_OPCODES];
 
+void Write_Prologue(JitWriter *jit)
+{
+	/** 
+	 * The state expected by our plugin is:
+	 * #define AMX_REG_PRI		REG_EAX
+	   #define AMX_REG_ALT		REG_EDX
+	   #define AMX_REG_STK		REG_EBP
+	   #define AMX_REG_DAT		REG_EDI
+	   #define AMX_REG_TMP		REG_ECX
+	   #define AMX_REG_INFO		REG_ESI
+	   #define AMX_REG_FRM		REG_EBX
+	   #define AMX_INFO_FRM		AMX_REG_INFO
+	   #define AMX_INFO_HEAP	4
+	   #define AMX_INFO_RETVAL	12
+	 *
+	 * The variables we're passed in:
+	 *  sp_context_t *ctx, uint32_t code_idx, cell_t *result
+	 */
+
+
+}
+
 void Macro_PushN_Addr(JitWriter *jit, int i)
 {
 	//push eax