286 - fixes the DOS/16M dos extender that comes with Lotus 123r3 [Carl]

This commit is contained in:
Miodrag Milanovic 2011-06-07 16:32:56 +00:00
parent 8ed23fe945
commit 302cef2ab1
2 changed files with 20 additions and 12 deletions

View File

@ -129,17 +129,19 @@ static void PREFIX186(_outsw)(i8086_state *cpustate) /* Opcode 0x6f */
static void PREFIX186(_rotshft_bd8)(i8086_state *cpustate) /* Opcode 0xc0 */ static void PREFIX186(_rotshft_bd8)(i8086_state *cpustate) /* Opcode 0xc0 */
{ {
unsigned ModRM = FETCH; unsigned ModRM = FETCH;
unsigned src = GetRMByte(ModRM);
unsigned count = FETCH; unsigned count = FETCH;
PREFIX86(_rotate_shift_Byte)(cpustate,ModRM,count & 0x1f); PREFIX86(_rotate_shift_Byte)(cpustate,ModRM,count & 0x1f,src);
} }
static void PREFIX186(_rotshft_wd8)(i8086_state *cpustate) /* Opcode 0xc1 */ static void PREFIX186(_rotshft_wd8)(i8086_state *cpustate) /* Opcode 0xc1 */
{ {
unsigned ModRM = FETCH; unsigned ModRM = FETCH;
unsigned src = GetRMWord(ModRM);
unsigned count = FETCH; unsigned count = FETCH;
PREFIX86(_rotate_shift_Word)(cpustate,ModRM,count & 0x1f); PREFIX86(_rotate_shift_Word)(cpustate,ModRM,count & 0x1f,src);
} }
static void PREFIX186(_enter)(i8086_state *cpustate) /* Opcode 0xc8 */ static void PREFIX186(_enter)(i8086_state *cpustate) /* Opcode 0xc8 */
@ -166,10 +168,12 @@ static void PREFIX186(_leave)(i8086_state *cpustate) /* Opcode 0xc9 */
static void PREFIX186(_rotshft_bcl)(i8086_state *cpustate) /* Opcode 0xd2 */ static void PREFIX186(_rotshft_bcl)(i8086_state *cpustate) /* Opcode 0xd2 */
{ {
PREFIX86(_rotate_shift_Byte)(cpustate,FETCHOP,cpustate->regs.b[CL] & 0x1f); unsigned ModRM = FETCHOP;
PREFIX86(_rotate_shift_Byte)(cpustate,ModRM,cpustate->regs.b[CL] & 0x1f,GetRMByte(ModRM));
} }
static void PREFIX186(_rotshft_wcl)(i8086_state *cpustate) /* Opcode 0xd3 */ static void PREFIX186(_rotshft_wcl)(i8086_state *cpustate) /* Opcode 0xd3 */
{ {
PREFIX86(_rotate_shift_Word)(cpustate,FETCHOP,cpustate->regs.b[CL] & 0x1f); unsigned ModRM = FETCHOP;
PREFIX86(_rotate_shift_Word)(cpustate,ModRM,cpustate->regs.b[CL] & 0x1f,GetRMWord(ModRM));
} }

View File

@ -70,9 +70,9 @@ static void PREFIX86(_trap)(i8086_state *cpustate)
#endif #endif
#ifndef I80186 #ifndef I80186
static void PREFIX86(_rotate_shift_Byte)(i8086_state *cpustate, unsigned ModRM, unsigned count) static void PREFIX86(_rotate_shift_Byte)(i8086_state *cpustate, unsigned ModRM, unsigned count, unsigned src)
{ {
unsigned src = (unsigned)GetRMByte(ModRM); // unsigned src = (unsigned)GetRMByte(ModRM);
unsigned dst=src; unsigned dst=src;
if (count==0) if (count==0)
@ -203,9 +203,9 @@ static void PREFIX86(_rotate_shift_Byte)(i8086_state *cpustate, unsigned ModRM,
} }
} }
static void PREFIX86(_rotate_shift_Word)(i8086_state *cpustate, unsigned ModRM, unsigned count) static void PREFIX86(_rotate_shift_Word)(i8086_state *cpustate, unsigned ModRM, unsigned count, unsigned src)
{ {
unsigned src = GetRMWord(ModRM); // unsigned src = GetRMWord(ModRM);
unsigned dst=src; unsigned dst=src;
if (count==0) if (count==0)
@ -2403,25 +2403,29 @@ static void PREFIX86(_iret)(i8086_state *cpustate) /* Opcode 0xcf */
static void PREFIX86(_rotshft_b)(i8086_state *cpustate) /* Opcode 0xd0 */ static void PREFIX86(_rotshft_b)(i8086_state *cpustate) /* Opcode 0xd0 */
{ {
PREFIX(_rotate_shift_Byte)(cpustate,FETCHOP,1); unsigned ModRM = FETCHOP;
PREFIX(_rotate_shift_Byte)(cpustate,ModRM,1,GetRMByte(ModRM));
} }
static void PREFIX86(_rotshft_w)(i8086_state *cpustate) /* Opcode 0xd1 */ static void PREFIX86(_rotshft_w)(i8086_state *cpustate) /* Opcode 0xd1 */
{ {
PREFIX(_rotate_shift_Word)(cpustate,FETCHOP,1); unsigned ModRM = FETCHOP;
PREFIX(_rotate_shift_Word)(cpustate,ModRM,1,GetRMWord(ModRM));
} }
#ifdef I8086 #ifdef I8086
static void PREFIX86(_rotshft_bcl)(i8086_state *cpustate) /* Opcode 0xd2 */ static void PREFIX86(_rotshft_bcl)(i8086_state *cpustate) /* Opcode 0xd2 */
{ {
PREFIX(_rotate_shift_Byte)(cpustate,FETCHOP,cpustate->regs.b[CL]); unsigned ModRM = FETCHOP;
PREFIX(_rotate_shift_Byte)(cpustate,ModRM,cpustate->regs.b[CL],GetRMByte(ModRM));
} }
static void PREFIX86(_rotshft_wcl)(i8086_state *cpustate) /* Opcode 0xd3 */ static void PREFIX86(_rotshft_wcl)(i8086_state *cpustate) /* Opcode 0xd3 */
{ {
PREFIX(_rotate_shift_Word)(cpustate,FETCHOP,cpustate->regs.b[CL]); unsigned ModRM = FETCHOP;
PREFIX(_rotate_shift_Word)(cpustate,ModRM,cpustate->regs.b[CL],GetRMWord(ModRM));
} }
#endif #endif