From 82693ccae6b6012cc7006b9be38f89446d2cb6f6 Mon Sep 17 00:00:00 2001
From: David Anderson <dvander@alliedmods.net>
Date: Sat, 11 Feb 2006 21:51:28 +0000
Subject: [PATCH] fixed serious OP_FLOAT_CMP bug (boy I was tired)

---
 amxmodx/JIT/amxexecn.o   | Bin 12800 -> 12800 bytes
 amxmodx/JIT/amxexecn.obj | Bin 12426 -> 12427 bytes
 amxmodx/JIT/amxjitsn.o   | Bin 40944 -> 40944 bytes
 amxmodx/JIT/amxjitsn.obj | Bin 43004 -> 43004 bytes
 amxmodx/amxexecn.asm     |   5 +++--
 amxmodx/amxjitsn.asm     |   5 +++--
 amxmodx/amxmodx.cpp      |   2 +-
 7 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/amxmodx/JIT/amxexecn.o b/amxmodx/JIT/amxexecn.o
index fbfe37b8b9356578018c226612b5ec89496d50cf..db51ab900953e7d2674f2b5c59db1690872f2d62 100755
GIT binary patch
delta 902
zcmZojX-Jt+!^FU|v2GQkjxaX^gSCqaOA&|V3H~NlAg`N+{l6Meh=afR8yB+Vi^(BO
zYjmtZVj*A+r}&$6fxJ!@aiE3}kOnyvNrA~a%;^>@IFSvR1>}Kk2<-M_x%{B{7zg8p
zNQiCqC<+TVpJw)A<o?AD)a?T_yPs{c0;{~x1t7mWM@67JSH?0&g@wOId~zVGlGhxd
z@PD;#8UE&jEZrs`(z--NguiJ6NPCHj1b_1~AgfbGh4D8wWu0(k^_%yyDlrPoV`E@w
zKF0F>?|(JUxBM;rli#x`iRC~Azy4S2Jlc6d^AboZe6u?HCdQN`7Gz(BfOy~#@q(~G
z;R_5d8z8UqD03c*uXPS6ymUaaKyLtL&+<3Pfn={DWcg5J8CWLUa%v=AV@9^<1c(Q=
zXdi?HwP*v7hiuUTkSyGyNkE?FQO2tfN3@{Gl}$dzX{_Z05`)LG36SRtQ?8DpTynB9
zS2VvUP^>$T1sI!_FZkP!PVVK3Wn4M=HCK$N4--%(L`9)nMy1<F1swb@J0{0)+cSDh
zp2K}dX!bmQ7giAl1_pk2RtXU0w7HW<jdAh@UKvL7&1ZR)nHV2#{>VRBp#C8+Z9xDd
z!%ral3lg6bm~Qoe7$z?cWSb-Lm4IwtB)&F~os7gc1+puV_)b7}KN3HHo56@-DUv`m
oki8p;pAKYSMB*0#+0QqdDk}2`o&~y-5g3zKp!Ds{nYz<i0P}dwrvLx|

delta 903
zcmZojX-Jt+!}OnfW8Er79U*Q825T1;mLd+z6Z}mqKwdWs`+qf{5C?zrS1x49=aWO2
z*63J)#6rLtPVqPC0C}A(;y?`{APur8lKhi(nA0tmb0Qlu6UYPG5ZLX<a`{2?F%HHH
zkr3PJP!twyKF#dK$o-QYsM`l<c0cQ61y*^X^FV%gj*38cu8d`l3JZUa*yKP~C9l~)
z;s0vgGW^X4S-MR?q;-jk2!GRhkoFQ43I67#Kvt)W3gd5V$~xf6>Nf9XRbmvF%f`Ua
ze2nG$-~VcyZ~0sLCckG>63d1Pe*Lf3d9?F_<|U9+*k*P1O^hjtEXckL2Jyfl;t64a
z!WS4^)<9n8QRX}rU+WxDcxi)Vf!+Yhp5<?n1<77T$nv7d{%4+S%c+rgl^NNh;~*Z`
zqP-9n)S~r39<oLAL9%d*CIWeyM;Wg|9MOy-S33C^r?HkJNDLm!#z3AgOt~70a*4^x
zT+#d@K(X#T7GP{zzTj^^GP##4mT|@8*IY58-b_H55EX@P8I^7y6>#vsY@Zy%ZO`aF
zc@Fm-!Fl{HtRf5y4E+AA5+KTFa~F>qBO}A)4ZJdpW}DCQDl;)Y*!+=yvOxU<VB&%R
zMuwk2_GctMCotja0x?Wp9LP39;wu5!K1h6RAUg?(Zwh2rAn~1m>^>xZ05^jX!xAKc
qXdrtR5<eZtzJSCp0<xcNHdR#S5j+EQCnGQ_FGJ~Dn=^H%vj70~xX#!B

diff --git a/amxmodx/JIT/amxexecn.obj b/amxmodx/JIT/amxexecn.obj
index 9d3e301055ec2b2d5fbd6a9cc9ae2c5fee7ebad0..5240c7940c14c460742f748cbe19b951ced6997c 100755
GIT binary patch
delta 972
zcmY+CO=uHA6vt=M*<?2fnOGAOF%(JH#7ZiPg&I;7Yrzr{QHT_=Qe#>~h=GPE=p~R8
zYTQbQ10GbWAWDTEihC4950N4U;z#vRk@jQ-6$C#((e+JIx7mf=o&WFu-n^N4b2+Ib
zr5HA$@bH%d*DBH`3E2@EMetU-J?psO&q)(PQ!xHiIXW3yZ$l_DAd{>Zo~H!?ltL_8
z0FX$FKdi0h3KQ{cD8gByk?@Qbx<QqQ2NDuIp~GN0*%Cgzdq!%V<T|KEg(J!#@@lF0
zRK)dT&1!i=;JBJMMRDIR3uMP&?y^}#2*S01k|7E#fTyNqa^=k9F#Kq_4v|V)b}DCm
z4KU?l0`Yg=1PnPoT6{v39{!EwWEU;W@riS?mlp4_DDl}!y3VWP#E+fRW?ql{{G$b=
z&vc^9?g;)3=~eh$3zVv*de=*C4XKO513Y?)v~D!PRpU^i%@IFhII%uZrD|J-#3N~b
zWFhXt2EeV+LI-yj)?A0dMTC8|Y)!stYb`X-Rin_O=4iFh9H`bpx4Ekqx(ceRiWi!T
zm@s(f*+p^Jwtmj^M)!b<{|^ru!Z)(F;&JK*2AzSfgjeWfmF<^K;QQ>BH0+MSeS?N=
zR(!G&lV$u{3w*r9oYsAKkR7(ZYrio~2Lu;fOnOl8@?XEY$F>8zYjBxh`^b!5>!U?h
zuy4V=>Wsb9gqPLl4oxs2yIOO3+w;p1g&`gm0?%LQ=Qjg!zy;b47kn+o2c%agW7+IT
zDw$5lb;9QfLQKj)b^^IzAbWw72Ms6&=&peb0eNU3DIhO&GLjw3oy%s>2X!|1Ui=3i
CL)yv!

delta 971
zcmeB9>`LVHVPs;+?|th$bt0!U=YMVnh7<+{hUAI5;({O!2qZ8uFm&@UFua}^+O8u6
z6ts3xVJYIUJi*_@0_1hGu>V&B3UTl^f8|1!d_I|jagB}@NGt@b;S_(94v^Q$A`a9L
z0@5IhBFR7b0b{zwa!zDJW&(L&8v?uiSS~+kKE}a#ArfL+9g4z&&Gk%Pj5a^nfx3Nw
zX7{slFfag>|5xkIW9bGu0HifXg{3$1fF+RP?>`Sz*`1>z(48v-7U&V1%*vvqJR2ws
z)FZ>+e2}Hv1VmbwsEF`4tp^!gq9VcHymYb`iwt)MoL{%OkVT16U@jZTK9=u)|EqDn
z<!|YmyqHx<EE_8L^}kx@(asB+mq1csn{TsjVoXV7LH1}chzAZ7PY4SX#J~`<2J$+O
zGUu`QTIYa*OdBK%^Z-!yEPs<MNcJj1mKR0#Kl9{|>>7zznUO6z4&s3=+6!SpEm{xc
zAzL&bBn!7_B9Nzfl<_LW5zQ!arIV{TjI|s=V(^GI2J(Di%GFSmOH97b5zQ|G6a&T#
zFjg#I@V6hC?8q6*xMK2r&KOZ|P<jhdQRtRY>Gn}kVf_7H?PdF90WNz+_sIcVcLeA0
zyReD?(<Q$@s|1Mh*=)ycz$khKn3jOPXJBKv3}@Y%+{~lOXtsGJk1`YEgUx68{<AXu
z=iYoyL_(<k0Z<hqP(9EcK=2P3ou5%e_<-q07nr^gYGi;SW^j?zqN4cZ#GD)-xCqD`
zb)cFg6cIz9NCk?B9Z;mt14YOOD6|AcBpfKR3q>RuC~^TV5?_>BQd*S9@NDy1^?Muu
D*=pWh

diff --git a/amxmodx/JIT/amxjitsn.o b/amxmodx/JIT/amxjitsn.o
index 8090ed547202b0637c5936be21b54b8df4b4746c..16f99f6635ab611a6cfbb1aa710cbd3f1b560407 100755
GIT binary patch
delta 177
zcmeycpXtMXrVTR`85Jip+DT1*Z^xlHdmg_F>jx<Y27Y(eFCfZ^^$n2P!N$PA5EmaA
zdwB94#T>?_&7Ml#GGu9UX4-th(MA$z1Z%XireFcka7GpehH@xfx7o5~x|rY^bBOR}
MD7|a*!&&^S06nNMFaQ7m

delta 177
zcmeycpXtMXrVTR`85Jfo+DT1*Z^xlHkKcv$gA@Y;zd!325aq-A21xB-V_;y2i;s*w
zJYn)3#T>@Q&7Ml#GGu9UX4-th(MA$z1Z%XireHqMbVe2ihB7E!yV<g3x|rZ<bBORJ
MD7|y@!&&^S04u~WGXMYp

diff --git a/amxmodx/JIT/amxjitsn.obj b/amxmodx/JIT/amxjitsn.obj
index 00b317fda4b575e1ffd4dd11f3ce7be7b2f6b6bd..084f68f037f46aa832aae4aad1dc8b442d631390 100755
GIT binary patch
delta 194
zcmex!p6SndCUzf2CI-gXcN^KI6&V#LD{@IpwpQd)oIQ`<h4q6J0|UQ1>lYB^#QFwE
z?O<bIV2F#4j6FO#O)-bDX*0jQGt*`<6%Q%0^y*587646U0UFB2P!4C+Z4L~#l@VQI
W4wKppXYJa&xVTygXtDgXyMh3-xGqls

delta 194
zcmex!p6SndCUzf2CWf5ew;S1|6&V#KD{@IpwpQd)oX79N`az0;f#09?3yAVzeFLO+
zurV+&#KlL(9-c5cO)-bDaWlWYGt*`<6%Q%0^y*58<^zpo0h-FjPzGn!ZVn8$l@VQS
W4wKphXYJg)xVTygXtDgXyMh1@?k?;A

diff --git a/amxmodx/amxexecn.asm b/amxmodx/amxexecn.asm
index d0f16e14..49494396 100755
--- a/amxmodx/amxexecn.asm
+++ b/amxmodx/amxexecn.asm
@@ -1492,10 +1492,11 @@ OP_FLOAT_CMP:
 		fld     dword [edi+ecx+4]
 		fucompp
 		fnstsw  ax
+		fwait
 		sahf
 		cmovz   eax, [g_flags+4]
-		cmovg   eax, [g_flags+8]
-		cmovl   eax, [g_flags+0]
+		cmova   eax, [g_flags+8]
+		cmovb   eax, [g_flags+0]
 		GO_ON
 		
 OP_BREAK:
diff --git a/amxmodx/amxjitsn.asm b/amxmodx/amxjitsn.asm
index c6571257..4ccec44a 100755
--- a/amxmodx/amxjitsn.asm
+++ b/amxmodx/amxjitsn.asm
@@ -1982,10 +1982,11 @@ OP_FLOAT_CMP:
 		fld     dword [esi+4]
 		fucompp
 		fnstsw  ax
+		fwait
 		sahf
 		cmovz   eax, [g_flagsjit+4]
-		cmovg   eax, [g_flagsjit+8]
-		cmovl   eax, [g_flagsjit+0]
+		cmova   eax, [g_flagsjit+8]
+		cmovb   eax, [g_flagsjit+0]
 	CHECKCODESIZE j_float_cmp
 
 OP_INVALID:                     ; break from the compiler with an error code
diff --git a/amxmodx/amxmodx.cpp b/amxmodx/amxmodx.cpp
index 7a59a5fd..81cd6fe6 100755
--- a/amxmodx/amxmodx.cpp
+++ b/amxmodx/amxmodx.cpp
@@ -3468,7 +3468,7 @@ static cell AMX_NATIVE_CALL find_plugin_byfile(AMX *amx, cell *params)
 
 static cell AMX_NATIVE_CALL int3(AMX *amx, cell *params)
 {
-#ifdef DEBUG
+#if defined _DEBUG || defined DEBUG
 #if defined WIN32
 	__asm
 	{