summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu/cpu/i86
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2011-06-07 16:32:56 +0000
committer Miodrag Milanovic <mmicko@gmail.com>2011-06-07 16:32:56 +0000
commit302cef2ab16a5da89ce6bb314810a956cb7b8b8c (patch)
tree2cb144073f4ea5325d75767ef850f2e9e284ef38 /src/emu/cpu/i86
parent8ed23fe94562b0e0991d0ebdc1d0c703c5bc3bf0 (diff)
286 - fixes the DOS/16M dos extender that comes with Lotus 123r3 [Carl]
Diffstat (limited to 'src/emu/cpu/i86')
-rw-r--r--src/emu/cpu/i86/instr186.c12
-rw-r--r--src/emu/cpu/i86/instr86.c20
2 files changed, 20 insertions, 12 deletions
diff --git a/src/emu/cpu/i86/instr186.c b/src/emu/cpu/i86/instr186.c
index 4ab64b35bf5..cc0fea3d299 100644
--- a/src/emu/cpu/i86/instr186.c
+++ b/src/emu/cpu/i86/instr186.c
@@ -129,17 +129,19 @@ static void PREFIX186(_outsw)(i8086_state *cpustate) /* Opcode 0x6f */
static void PREFIX186(_rotshft_bd8)(i8086_state *cpustate) /* Opcode 0xc0 */
{
unsigned ModRM = FETCH;
+ unsigned src = GetRMByte(ModRM);
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 */
{
unsigned ModRM = FETCH;
+ unsigned src = GetRMWord(ModRM);
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 */
@@ -166,10 +168,12 @@ static void PREFIX186(_leave)(i8086_state *cpustate) /* Opcode 0xc9 */
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 */
{
- 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));
}
diff --git a/src/emu/cpu/i86/instr86.c b/src/emu/cpu/i86/instr86.c
index f05daf8f710..ed56b2cb5ad 100644
--- a/src/emu/cpu/i86/instr86.c
+++ b/src/emu/cpu/i86/instr86.c
@@ -70,9 +70,9 @@ static void PREFIX86(_trap)(i8086_state *cpustate)
#endif
#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;
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;
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 */
{
- 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 */
{
- PREFIX(_rotate_shift_Word)(cpustate,FETCHOP,1);
+ unsigned ModRM = FETCHOP;
+ PREFIX(_rotate_shift_Word)(cpustate,ModRM,1,GetRMWord(ModRM));
}
#ifdef I8086
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 */
{
- 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