From 93a94c5b045f2f3206aeb71bedff1d5475b07265 Mon Sep 17 00:00:00 2001
From: Sjoerd van der Berg <harekiet@users.sourceforge.net>
Date: Wed, 27 Apr 2005 19:57:37 +0000
Subject: [PATCH] Fix a bug with eip being set with wrong size on block ending
 Add linking to fpu opcodes in fpu emulator

Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@2196
---
 src/cpu/core_dyn_x86/decoder.h | 59 ++++++++++++++++++++++++++--------
 1 file changed, 45 insertions(+), 14 deletions(-)

diff --git a/src/cpu/core_dyn_x86/decoder.h b/src/cpu/core_dyn_x86/decoder.h
index 03781b4e..3b3750c9 100644
--- a/src/cpu/core_dyn_x86/decoder.h
+++ b/src/cpu/core_dyn_x86/decoder.h
@@ -16,6 +16,18 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
+#include "fpu.h"
+#define DYN_FPU_ESC(code) {					\
+	dyn_get_modrm(); \
+	if (decode.modrm.val >= 0xc0) { \
+		gen_call_function((void*)&FPU_ESC ## code ## _Normal,"%Id",decode.modrm.val); \
+	} else { \
+		dyn_fill_ea(); \
+		gen_call_function((void*)&FPU_ESC ## code ## _EA,"%Id%Dd",decode.modrm.val,DREG(EA)); \
+		gen_releasereg(DREG(EA)); \
+	}																		\
+}
+
 enum REP_Type {
 	REP_NONE=0,REP_NZ,REP_Z
 };
@@ -133,14 +145,14 @@ static void dyn_set_eip_last_end(DynReg * endreg) {
 	gen_dop_word_imm(DOP_ADD,decode.big_op,DREG(EIP),decode.op_start-decode.code_start);
 }
 
-static INLINE void dyn_set_eip_end(void) {
-	gen_protectflags();
-	gen_dop_word_imm(DOP_ADD,decode.big_op,DREG(EIP),decode.code-decode.code_start);
-}
-
-static INLINE void dyn_set_eip_last(void) {
-	gen_protectflags();
-	gen_dop_word_imm(DOP_ADD,decode.big_op,DREG(EIP),decode.op_start-decode.code_start);
+ static INLINE void dyn_set_eip_end(void) {
+ 	gen_protectflags();
+	gen_dop_word_imm(DOP_ADD,cpu.code.big,DREG(EIP),decode.code-decode.code_start);
+ }
+ 
+ static INLINE void dyn_set_eip_last(void) {
+ 	gen_protectflags();
+	gen_dop_word_imm(DOP_ADD,cpu.code.big,DREG(EIP),decode.op_start-decode.code_start);
 }
 
 static void dyn_push(DynReg * dynreg) {
@@ -706,11 +718,6 @@ static void dyn_mov_ev_seg(void) {
 	gen_releasereg(DREG(TMPW));
 }
 
-static void dyn_synch_eip(void) {
-	gen_protectflags();
-	gen_dop_word_imm(DOP_ADD,decode.big_op,DREG(EIP),decode.code-decode.code_start);
-}
-
 static void dyn_load_seg(SegNames seg,DynReg * src) {
 	if (cpu.pmode) {
 		gen_call_function((void *)&CPU_SetSegGeneral,"%Rd%Id%Drw",DREG(TMPB),seg,src);
@@ -1331,7 +1338,31 @@ restart_prefix:
 		//GRP2 Eb/Ev,CL
 		case 0xd2:dyn_grp2_eb(grp2_cl);break;
 		case 0xd3:dyn_grp2_ev(grp2_cl);break;
-
+		//FPU
+		case 0xd8:
+			DYN_FPU_ESC(0);
+			break;
+		case 0xd9:
+			DYN_FPU_ESC(1);
+			break;
+		case 0xda:
+			DYN_FPU_ESC(2);
+			break;
+		case 0xdb:
+			DYN_FPU_ESC(3);
+			break;
+		case 0xdc:
+			DYN_FPU_ESC(4);
+			break;
+		case 0xdd:
+			DYN_FPU_ESC(5);
+			break;
+		case 0xde:
+			DYN_FPU_ESC(6);
+			break;
+		case 0xdf:
+			DYN_FPU_ESC(7);
+			break;
 		//Loop's 
 		case 0xe2:dyn_loop(LOOP_NONE);goto finish_block;
 		case 0xe3:dyn_loop(LOOP_JCXZ);goto finish_block;