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

Fixed x86-64 recompiler versions of JBE/JNBE/JLE/JNLE.

Browse source
This commit is contained in:
SarahW 2017-01-12 19:40:27 +00:00
commit bb625f4fcf
1 changed files with 16 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/codegen_ops_x86-64.h
View file

@ -3188,6 +3188,8 @@ static void TEST_NONZERO_JUMP_L(int host_reg, uint32_t new_pc, int taken_cycles)
static int BRANCH_COND_BE(int pc_offset, uint32_t op_pc, uint32_t offset, int not) static int BRANCH_COND_BE(int pc_offset, uint32_t op_pc, uint32_t offset, int not)
{ {
uint8_t *jump1;
if (codegen_flags_changed && cpu_state.flags_op != FLAGS_UNKNOWN) if (codegen_flags_changed && cpu_state.flags_op != FLAGS_UNKNOWN)
{ {
addbyte(0x83); /*CMP flags_res, 0*/ addbyte(0x83); /*CMP flags_res, 0*/
@ -3203,10 +3205,8 @@ static int BRANCH_COND_BE(int pc_offset, uint32_t op_pc, uint32_t offset, int no
addbyte(0xc0); addbyte(0xc0);
addbyte(0x75); /*JNZ +*/ addbyte(0x75); /*JNZ +*/
} }
if (not) jump1 = &codeblock[block_current].data[block_pos];
addbyte(12+2+2+7+5+(timing_bt ? 8 : 0)); addbyte(0);
else
addbyte(12+2+2);
CALL_FUNC(CF_SET); CALL_FUNC(CF_SET);
addbyte(0x85); /*TEST EAX,EAX*/ addbyte(0x85); /*TEST EAX,EAX*/
addbyte(0xc0); addbyte(0xc0);
@ -3215,6 +3215,9 @@ static int BRANCH_COND_BE(int pc_offset, uint32_t op_pc, uint32_t offset, int no
else else
addbyte(0x74); /*JZ +*/ addbyte(0x74); /*JZ +*/
addbyte(7+5+(timing_bt ? 4 : 0)); addbyte(7+5+(timing_bt ? 4 : 0));
if (!not)
*jump1 = (uintptr_t)&codeblock[block_current].data[block_pos] - (uintptr_t)jump1 - 1;
addbyte(0xC7); /*MOVL [pc], new_pc*/ addbyte(0xC7); /*MOVL [pc], new_pc*/
addbyte(0x45); addbyte(0x45);
addbyte(cpu_state_offset(pc)); addbyte(cpu_state_offset(pc));
@ -3228,6 +3231,8 @@ static int BRANCH_COND_BE(int pc_offset, uint32_t op_pc, uint32_t offset, int no
} }
addbyte(0xe9); /*JMP end*/ addbyte(0xe9); /*JMP end*/
addlong(BLOCK_EXIT_OFFSET - (block_pos + 4)); addlong(BLOCK_EXIT_OFFSET - (block_pos + 4));
if (not)
*jump1 = (uintptr_t)&codeblock[block_current].data[block_pos] - (uintptr_t)jump1 - 1;
} }
static int BRANCH_COND_L(int pc_offset, uint32_t op_pc, uint32_t offset, int not) static int BRANCH_COND_L(int pc_offset, uint32_t op_pc, uint32_t offset, int not)
@ -3268,6 +3273,7 @@ static int BRANCH_COND_L(int pc_offset, uint32_t op_pc, uint32_t offset, int not
static int BRANCH_COND_LE(int pc_offset, uint32_t op_pc, uint32_t offset, int not) static int BRANCH_COND_LE(int pc_offset, uint32_t op_pc, uint32_t offset, int not)
{ {
uint8_t *jump1;
if (codegen_flags_changed && cpu_state.flags_op != FLAGS_UNKNOWN) if (codegen_flags_changed && cpu_state.flags_op != FLAGS_UNKNOWN)
{ {
addbyte(0x83); /*CMP flags_res, 0*/ addbyte(0x83); /*CMP flags_res, 0*/
@ -3283,11 +3289,8 @@ static int BRANCH_COND_LE(int pc_offset, uint32_t op_pc, uint32_t offset, int no
addbyte(0xc0); addbyte(0xc0);
addbyte(0x75); /*JNZ +*/ addbyte(0x75); /*JNZ +*/
} }
if (not) jump1 = &codeblock[block_current].data[block_pos];
addbyte(12+2+3+12+2+3+2+2+7+5+(timing_bt ? 8 : 0)); addbyte(0);
else
addbyte(12+2+3+12+2+3+2+2);
CALL_FUNC(NF_SET); CALL_FUNC(NF_SET);
addbyte(0x85); /*TEST EAX,EAX*/ addbyte(0x85); /*TEST EAX,EAX*/
addbyte(0xc0); addbyte(0xc0);
@ -3307,6 +3310,8 @@ static int BRANCH_COND_LE(int pc_offset, uint32_t op_pc, uint32_t offset, int no
else else
addbyte(0x74); /*JZ +*/ addbyte(0x74); /*JZ +*/
addbyte(7+5+(timing_bt ? 4 : 0)); addbyte(7+5+(timing_bt ? 4 : 0));
if (!not)
*jump1 = (uintptr_t)&codeblock[block_current].data[block_pos] - (uintptr_t)jump1 - 1;
addbyte(0xC7); /*MOVL [pc], new_pc*/ addbyte(0xC7); /*MOVL [pc], new_pc*/
addbyte(0x45); addbyte(0x45);
addbyte(cpu_state_offset(pc)); addbyte(cpu_state_offset(pc));
@ -3320,6 +3325,8 @@ static int BRANCH_COND_LE(int pc_offset, uint32_t op_pc, uint32_t offset, int no
} }
addbyte(0xe9); /*JMP end*/ addbyte(0xe9); /*JMP end*/
addlong(BLOCK_EXIT_OFFSET - (block_pos + 4)); addlong(BLOCK_EXIT_OFFSET - (block_pos + 4));
if (not)
*jump1 = (uintptr_t)&codeblock[block_current].data[block_pos] - (uintptr_t)jump1 - 1;
} }
static int LOAD_VAR_W(uintptr_t addr) static int LOAD_VAR_W(uintptr_t addr)