Skip to content

[DYNAREC] Hard reset x87 state in EMMS #4226

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ptitSeb merged 1 commit into from
Aug 10, 2026
+10 −3
Merged

[DYNAREC] Hard reset x87 state in EMMS #4226

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/dynarec/la64/dynarec_la64_0f.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1393,6 +1393,11 @@ uintptr_t dynarec64_0F(dynarec_la64_t* dyn, uintptr_t addr, uintptr_t ip, int ni
INST_NAME("EMMS");
// empty MMX, FPU now usable
mmx_purgecache(dyn, ninst, 0, x1);
x87_purgecache(dyn, ninst, 0, x1, x2, x3); // also purge x87 and hard reset it
ST_W(xZR, xEmu, offsetof(x64emu_t, top));
ST_W(xZR, xEmu, offsetof(x64emu_t, fpu_stack));
MOV32w(x1, TAGS_EMPTY);
ST_D(x1, xEmu, offsetof(x64emu_t, fpu_tags));
break;
case 0x7E:
INST_NAME("MOVD Ed, Gm");
Expand Down
8 changes: 5 additions & 3 deletions src/dynarec/rv64/dynarec_rv64_0f.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1822,9 +1822,11 @@ uintptr_t dynarec64_0F(dynarec_rv64_t* dyn, uintptr_t addr, uintptr_t ip, int ni
INST_NAME("EMMS");
// empty MMX, FPU now usable
mmx_purgecache(dyn, ninst, 0, x1);
/*emu->top = 0;
emu->fpu_stack = 0;*/
// TODO: Check if something is needed here?
x87_purgecache(dyn, ninst, 0, x1, x2, x3); // also purge x87 and hard reset it
SW(xZR, xEmu, offsetof(x64emu_t, top));
SW(xZR, xEmu, offsetof(x64emu_t, fpu_stack));
MOV32w(x1, TAGS_EMPTY);
SD(x1, xEmu, offsetof(x64emu_t, fpu_tags));
break;
case 0x7E:
INST_NAME("MOVD Ed, Gm");
Expand Down
Loading