From 7ed66f0b38b9f4ed281f0a9eeb6a7b22938a7032 Mon Sep 17 00:00:00 2001
From: David Anderson <dvander@alliedmods.net>
Date: Mon, 6 Sep 2004 22:18:58 +0000
Subject: [PATCH] Fixed line errors in JIT Fixed externs in amx.cpp

---
 amxmodx/JIT/jits.asm |   7 ++++---
 amxmodx/JIT/jits.o   | Bin 26286 -> 26398 bytes
 amxmodx/Makefile.pl  |  12 ++++++------
 amxmodx/amx.cpp      |  15 ++++++++++++++-
 4 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/amxmodx/JIT/jits.asm b/amxmodx/JIT/jits.asm
index 459a5e7f..455f90d2 100755
--- a/amxmodx/JIT/jits.asm
+++ b/amxmodx/JIT/jits.asm
@@ -108,7 +108,7 @@
 ;
 ; GWMV: to generate LINE opcode, %define ALLOWOPLINE
 ;
-%undef ALLOWOPLINE
+%define ALLOWOPLINE
 
 ;
 ; If this is set to 1 the JIT generates relocatable code for case tables, too.
@@ -164,8 +164,9 @@ _alt:        resd 1
 _reset_stk:  resd 1
 _reset_hea:  resd 1
 _syscall_d:  resd 1
-; the two fields below are for the JIT; they do not exist in
-; the non-JIT version of the abstract machine
+; the two fields below are for the JIT
+; they are included in the non-JIT version for AMX Mod X
+;  this is to make sure that the structs match universally!
 _reloc_size: resd 1          ; memory block for relocations
 _code_size:  resd 1          ; memory size of the native code
 	endstruc
diff --git a/amxmodx/JIT/jits.o b/amxmodx/JIT/jits.o
index 468efa42a2ba9a888ac49936a085cd601f41ee9c..f15a1b5fdf21569a94a04c05371fd27ee7432fed 100755
GIT binary patch
delta 4221
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
S)E!c<l=>E_*GMf-1p7Y?erA6F

delta 4123
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
D;4VpD

diff --git a/amxmodx/Makefile.pl b/amxmodx/Makefile.pl
index a51e60c8..b503304c 100755
--- a/amxmodx/Makefile.pl
+++ b/amxmodx/Makefile.pl
@@ -75,14 +75,14 @@ while ($cmd = shift)
 $gcc = `$gccf --version`;
 if ($gcc =~ /2\.9/)
 {
-	if ($OPTIONS{"jit"})
-	{
-		push(@CPP_SOURCE_FILES, "amx.cpp");
-		$OPT{"opt"} .= " -malign-loops=2 -malign-jumps=2 -malign-functions=2";
-	} else {
+	#if ($OPTIONS{"jit"})
+	#{
+#		push(@CPP_SOURCE_FILES, "amx.cpp");
+#		$OPT{"opt"} .= " -malign-loops=2 -malign-jumps=2 -malign-functions=2";
+#	} else {
 		`ln -s amx.cpp amx.c`;
 		push(@C_SOURCE_FILES, "amx.c");
-	}
+#	}
 } else {
 	if ($OPTIONS{"amd64"})
 	{
diff --git a/amxmodx/amx.cpp b/amxmodx/amx.cpp
index d33669c7..df5f108f 100755
--- a/amxmodx/amx.cpp
+++ b/amxmodx/amx.cpp
@@ -480,8 +480,12 @@ int AMXAPI amx_Debug(AMX *amx)
 }
 
 #if defined JIT
+#if defined WIN32 || __cplusplus
   extern "C" int AMXAPI getMaxCodeSize(void);
   extern "C" int AMXAPI asm_runJIT(void *sourceAMXbase, void *jumparray, void *compiledAMXbase);
+#else
+  extern int AMXAPI getMaxCodeSize(void);
+  extern int AMXAPI asm_runJIT(void *sourceAMXbase, void *jumparray, void *compiledAMXbase);
 #endif
 
 #if SMALL_CELL_SIZE==16
@@ -2728,17 +2732,26 @@ static void *amx_opcodelist_nodebug[] = {
     #endif
   #elif defined __GNUC__
     /* force "cdecl" by adding an "attribute" to the declaration */
+	#if defined __cplusplus
+    extern "C" cell amx_exec_asm(cell *regs,cell *retval,cell stp,cell hea) __attribute__((cdecl));
+	#else
     extern cell amx_exec_asm(cell *regs,cell *retval,cell stp,cell hea) __attribute__((cdecl));
+	#endif
   #else
     /* force "cdecl" by specifying it as a "function class" with the "__cdecl" keyword */
-    extern cell __cdecl amx_exec_asm(cell *regs,cell *retval,cell stp,cell hea);
+    extern "C" cell __cdecl amx_exec_asm(cell *regs,cell *retval,cell stp,cell hea);
   #endif
 #endif
 
 #if defined ASM32 || defined JIT
+#if defined WIN32 || defined __cplusplus
+	extern "C" void *amx_opcodelist[];
+    extern "C" void *amx_opcodelist_nodebug[];
+#else
 	extern void *amx_opcodelist[];
     extern void *amx_opcodelist_nodebug[];
 #endif
+#endif
 
 int AMXAPI amx_Exec(AMX *amx, cell *retval, int index, int numparams, ...)
 {