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

Fixed issue with recompiled FCOMPP where the incorrect number of registers could be popped.

Browse source
This commit is contained in:
SarahW 2016-12-10 18:44:45 +00:00
commit 3a72cc9593
3 changed files with 57 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/codegen_ops_fpu.h
View file

@ -481,8 +481,7 @@ static uint32_t ropFCOMPP(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uin
{ {
FP_ENTER(); FP_ENTER();
FP_COMPARE_REG(0, 1); FP_COMPARE_REG(0, 1);
FP_POP(); FP_POP2();
FP_POP();
return op_pc; return op_pc;
} }

20
src/codegen_ops_x86-64.h
View file

@ -3908,6 +3908,26 @@ static void FP_POP()
addbyte(0x45); addbyte(0x45);
addbyte(cpu_state_offset(TOP)); addbyte(cpu_state_offset(TOP));
} }
static void FP_POP2()
{
addbyte(0x8b); /*MOV EAX, [TOP]*/
addbyte(0x45);
addbyte(cpu_state_offset(TOP));
addbyte(0xc6); /*MOVB tag[EAX], 3*/
addbyte(0x44);
addbyte(0x05);
addbyte(cpu_state_offset(tag));
addbyte(3);
addbyte(0x83); /*ADD AL, 2*/
addbyte(0xc0);
addbyte(2);
addbyte(0x83); /*AND AL, 7*/
addbyte(0xe0);
addbyte(7);
addbyte(0x89); /*MOV [TOP], EAX*/
addbyte(0x45);
addbyte(cpu_state_offset(TOP));
}
static void FP_LOAD_S() static void FP_LOAD_S()
{ {

36
src/codegen_ops_x86.h
View file

@ -2503,6 +2503,42 @@ static void FP_POP()
addbyte(cpu_state_offset(TOP)); addbyte(cpu_state_offset(TOP));
} }
} }
static void FP_POP2()
{
if (codeblock[block_current].flags & CODEBLOCK_STATIC_TOP)
{
addbyte(0xc6); /*MOVB tag[0][EBP], 3*/
addbyte(0x45);
addbyte(cpu_state_offset(tag[cpu_state.TOP]));
addbyte(3);
addbyte(0xc6); /*MOVB tag[1][EBP], 3*/
addbyte(0x45);
addbyte(cpu_state_offset(tag[(cpu_state.TOP+1)&7]));
addbyte(3);
addbyte(0xc6); /*MOVB TOP[EBP], (TOP+2) & 7*/
addbyte(0x45);
addbyte(cpu_state_offset(TOP));
addbyte((cpu_state.TOP + 2) & 7);
}
else
{
addbyte(0x8b); /*MOV EAX, TOP*/
addbyte(0x45);
addbyte(cpu_state_offset(TOP));
addbyte(0xc6); /*MOVB tag[EAX], 3*/
addbyte(0x44);
addbyte(0x05);
addbyte(cpu_state_offset(tag[0]));
addbyte(3);
addbyte(0x04); /*ADD AL, 2*/
addbyte(2);
addbyte(0x24); /*AND AL, 7*/
addbyte(7);
addbyte(0x88); /*MOV TOP, AL*/
addbyte(0x45);
addbyte(cpu_state_offset(TOP));
}
}
#define FPU_ADD 0x00 #define FPU_ADD 0x00
#define FPU_DIV 0x30 #define FPU_DIV 0x30