Retro/pcem
Watch
1
0
Fork
You've already forked pcem
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Corrected effective address for POP 0x8f. Windows 95 now works on recompiler.

Browse source
This commit is contained in:
SarahW 2018-07-18 22:19:09 +01:00
commit 4e7a13f452
1 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/codegen.c
View file

@ -110,7 +110,7 @@ static x86seg *codegen_generate_ea_16_long(ir_data_t *ir, x86seg *op_ea_seg, uin
return op_ea_seg; return op_ea_seg;
} }
static x86seg *codegen_generate_ea_32_long(ir_data_t *ir, x86seg *op_ea_seg, uint32_t fetchdat, int op_ssegs, uint32_t *op_pc) static x86seg *codegen_generate_ea_32_long(ir_data_t *ir, x86seg *op_ea_seg, uint32_t fetchdat, int op_ssegs, uint32_t *op_pc, int stack_offset)
{ {
uint32_t new_eaaddr; uint32_t new_eaaddr;
@ -146,11 +146,12 @@ static x86seg *codegen_generate_ea_32_long(ir_data_t *ir, x86seg *op_ea_seg, uin
(*op_pc) += 4; (*op_pc) += 4;
break; break;
} }
// if (stack_offset && (sib & 7) == 4 && (cpu_mod || (sib & 7) != 5)) /*ESP*/ if (stack_offset && (sib & 7) == 4 && (cpu_mod || (sib & 7) != 5)) /*ESP*/
// { {
uop_ADD_IMM(ir, IREG_eaaddr, IREG_eaaddr, stack_offset);
// addbyte(0x05); // addbyte(0x05);
// addlong(stack_offset); // addlong(stack_offset);
// } }
if (((sib & 7) == 4 || (cpu_mod && (sib & 7) == 5)) && !op_ssegs) if (((sib & 7) == 4 || (cpu_mod && (sib & 7) == 5)) && !op_ssegs)
op_ea_seg = &_ss; op_ea_seg = &_ss;
if (((sib >> 3) & 7) != 4) if (((sib >> 3) & 7) != 4)
@ -444,10 +445,10 @@ generate_call:
(op_table == x86_dynarec_opcodes && opcode_modrm[opcode]) || (op_table == x86_dynarec_opcodes && opcode_modrm[opcode]) ||
(op_table == x86_dynarec_opcodes_0f && opcode_0f_modrm[opcode])) (op_table == x86_dynarec_opcodes_0f && opcode_0f_modrm[opcode]))
{ {
//int stack_offset = 0; int stack_offset = 0;
// if (op_table == x86_dynarec_opcodes && opcode == 0x8f) /*POP*/ if (op_table == x86_dynarec_opcodes && opcode == 0x8f) /*POP*/
// stack_offset = (op_32 & 0x100) ? 4 : 2; stack_offset = (op_32 & 0x100) ? 4 : 2;
cpu_mod = (fetchdat >> 6) & 3; cpu_mod = (fetchdat >> 6) & 3;
cpu_reg = (fetchdat >> 3) & 7; cpu_reg = (fetchdat >> 3) & 7;
@ -463,7 +464,7 @@ generate_call:
} }
if (cpu_mod != 3 && (op_32 & 0x200)) if (cpu_mod != 3 && (op_32 & 0x200))
{ {
op_ea_seg = codegen_generate_ea_32_long(ir, op_ea_seg, fetchdat, op_ssegs, &op_pc); op_ea_seg = codegen_generate_ea_32_long(ir, op_ea_seg, fetchdat, op_ssegs, &op_pc, stack_offset);
// has_ea = 1; // has_ea = 1;
} }
// op_ea_seg = codegen_generate_ea_32_long(op_ea_seg, fetchdat, op_ssegs, &op_pc, stack_offset); // op_ea_seg = codegen_generate_ea_32_long(op_ea_seg, fetchdat, op_ssegs, &op_pc, stack_offset);