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

Fixed x86-32 recompiler MMX entry code

Browse source 
Fixed FPU tag resetting in EMMS instruction
Clear MMX state in FINIT
Reset FPU state in FSAVE/FNSAVE
Fixes issues with MMX when more than one MMX program is running
This commit is contained in:
SarahW 2017-01-13 21:31:42 +00:00
commit 9167b3a71f
3 changed files with 13 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/codegen_ops_x86.h
View file

@ -3460,13 +3460,13 @@ static void MMX_ENTER()
addbyte(0x45); addbyte(0x45);
addbyte(cpu_state_offset(ismmx)); addbyte(cpu_state_offset(ismmx));
addbyte(1); addbyte(1);
addbyte(0x8b); /*MOV TOP, EAX*/ addbyte(0x89); /*MOV TOP, EAX*/
addbyte(0x45); addbyte(0x45);
addbyte(cpu_state_offset(TOP)); addbyte(cpu_state_offset(TOP));
addbyte(0x8b); /*MOV tag, EAX*/ addbyte(0x89); /*MOV tag, EAX*/
addbyte(0x45); addbyte(0x45);
addbyte(cpu_state_offset(tag[0])); addbyte(cpu_state_offset(tag[0]));
addbyte(0x8b); /*MOV tag+4, EAX*/ addbyte(0x89); /*MOV tag+4, EAX*/
addbyte(0x45); addbyte(0x45);
addbyte(cpu_state_offset(tag[4])); addbyte(cpu_state_offset(tag[4]));

2
src/x87_ops.h
View file

@ -41,7 +41,7 @@ static inline void x87_set_mmx()
static inline void x87_emms() static inline void x87_emms()
{ {
*cpu_state.tag = 0x0303030303030303ll; *(uint64_t *)cpu_state.tag = 0x0303030303030303ll;
cpu_state.ismmx = 0; cpu_state.ismmx = 0;
} }

9
src/x87_ops_misc.h
View file

@ -36,6 +36,7 @@ static int opFINIT(uint32_t fetchdat)
cpu_state.npxs = 0; cpu_state.npxs = 0;
*(uint64_t *)cpu_state.tag = 0x0303030303030303ll; *(uint64_t *)cpu_state.tag = 0x0303030303030303ll;
cpu_state.TOP = 0; cpu_state.TOP = 0;
cpu_state.ismmx = 0;
CLOCK_CYCLES(17); CLOCK_CYCLES(17);
return 0; return 0;
} }
@ -272,6 +273,14 @@ static int FSAVE()
} }
break; break;
} }
cpu_state.npxc = 0x37F;
cpu_state.new_npxc = (cpu_state.old_npxc & ~0xc00);
cpu_state.npxs = 0;
*(uint64_t *)cpu_state.tag = 0x0303030303030303ll;
cpu_state.TOP = 0;
cpu_state.ismmx = 0;
CLOCK_CYCLES((cr0 & 1) ? 56 : 67); CLOCK_CYCLES((cr0 & 1) ? 56 : 67);
return cpu_state.abrt; return cpu_state.abrt;
} }