Index: ops.c
===================================================================
RCS file: /cvs/XF4/xc/extras/x86emu/src/x86emu/ops.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ops.c	2 Nov 2004 23:27:07 -0000	1.2
+++ ops.c	5 Apr 2005 21:14:09 -0000	1.3
@@ -9650,14 +9650,15 @@
 ****************************************************************************/
 static void x86emuOp_call_near_IMM(u8 X86EMU_UNUSED(op1))
 {
-    s16 ip;
+    s32 ip;
 
     START_OF_INSTR();
-	DECODE_PRINTF("CALL\t");
-	ip = (s16) fetch_word_imm();
-	ip += (s16) M.x86.R_IP;    /* CHECK SIGN */
-	DECODE_PRINTF2("%04x\n", (u16)ip);
-	CALL_TRACE(M.x86.saved_cs, M.x86.saved_ip, M.x86.R_CS, ip, "");
+    DECODE_PRINTF("CALL\t");
+    ip = M.x86.mode & SYSMODE_PREFIX_DATA?
+	fetch_long_imm() : (s16)fetch_word_imm();
+    ip += (s16) M.x86.R_IP;    /* CHECK SIGN */
+    DECODE_PRINTF2("%04x\n", (u16)ip);
+    CALL_TRACE(M.x86.saved_cs, M.x86.saved_ip, M.x86.R_CS, ip, "");
     TRACE_AND_STEP();
     push_word(M.x86.R_IP);
     M.x86.R_IP = ip;
@@ -9671,11 +9672,12 @@
 ****************************************************************************/
 static void x86emuOp_jump_near_IMM(u8 X86EMU_UNUSED(op1))
 {
-    int ip;
+    s32 ip;
 
     START_OF_INSTR();
     DECODE_PRINTF("JMP\t");
-    ip = (s16)fetch_word_imm();
+    ip = M.x86.mode & SYSMODE_PREFIX_DATA?
+	fetch_long_imm() : (s16)fetch_word_imm();
     ip += (s16)M.x86.R_IP;
     DECODE_PRINTF2("%04x\n", (u16)ip);
     TRACE_AND_STEP();