Skip to content

[EMU] Fix ABI issue in my_cpuid leaf detection #3394

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

Open
yzewei wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[EMU] Fix ABI issue in my_cpuid leaf detection #3394

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
15 changes: 7 additions & 8 deletions src/dynarec/arm64/dynarec_arm64_0f.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1789,14 +1789,13 @@ uintptr_t dynarec64_0F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nin
MOV32w(x1, _FS);
CALL(const_getsegmentbase, -1);
break;
case 0xA2:
INST_NAME("CPUID");
NOTEST(x1);
GETIP(ip); // sync RIP for easier debugging
STRx_U12(xRIP, xEmu, offsetof(x64emu_t, ip));
MOVx_REG(x1, xRAX);
CALL_(const_cpuid, -1, 0);
break;
case 0xA2:
INST_NAME("CPUID");
NOTEST(x1);
GETIP(ip); // sync RIP for easier debugging
STRx_U12(xRIP, xEmu, offsetof(x64emu_t, ip));
CALL(const_cpuid, -1);
break;
case 0xA3:
INST_NAME("BT Ed, Gd");
if (!BOX64DRENV(dynarec_safeflags)) {
Expand Down
2 changes: 1 addition & 1 deletion src/dynarec/la64/dynarec_la64_0f.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1425,7 +1425,7 @@ uintptr_t dynarec64_0F(dynarec_la64_t* dyn, uintptr_t addr, uintptr_t ip, int ni
case 0xA2:
INST_NAME("CPUID");
NOTEST(x1);
CALL_(const_cpuid, -1, 0, xRAX, 0);
CALL(const_cpuid, -1, 0, 0);
// BX and DX are not synchronized durring the call, so need to force the update
LD_D(xRDX, xEmu, offsetof(x64emu_t, regs[_DX]));
LD_D(xRBX, xEmu, offsetof(x64emu_t, regs[_BX]));
Expand Down
2 changes: 1 addition & 1 deletion src/dynarec/rv64/dynarec_rv64_0f.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1851,7 +1851,7 @@ uintptr_t dynarec64_0F(dynarec_rv64_t* dyn, uintptr_t addr, uintptr_t ip, int ni
case 0xA2:
INST_NAME("CPUID");
NOTEST(x1);
CALL_(const_cpuid, -1, 0, xRAX, 0);
CALL(const_cpuid, -1, 0, 0);
// BX and DX are not synchronized during the call, so need to force the update
LD(xRDX, xEmu, offsetof(x64emu_t, regs[_DX]));
LD(xRBX, xEmu, offsetof(x64emu_t, regs[_BX]));
Expand Down
3 changes: 1 addition & 2 deletions src/emu/x64run0f.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1182,8 +1182,7 @@ uintptr_t Run0F(x64emu_t *emu, rex_t rex, uintptr_t addr, int *step)
GetSegmentBaseEmu(emu, _FS); // refresh segs_offs
break;
case 0xA2: /* CPUID */
tmp32u = R_EAX;
my_cpuid(emu, tmp32u);
my_cpuid(emu);
break;
case 0xA3: /* BT Ed,Gd */
CHECK_FLAGS(emu);
Expand Down
2 changes: 1 addition & 1 deletion src/include/my_cpuid.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#include <stdint.h>
typedef struct x64emu_s x64emu_t;

void my_cpuid(x64emu_t* emu, uint32_t tmp32u);
void my_cpuid(x64emu_t* emu);
uint32_t helper_getcpu(x64emu_t* emu); // get the numa/cpu id actually running
uint32_t get_random32();
uint64_t get_random64();
Expand Down
9 changes: 5 additions & 4 deletions src/os/my_cpuid_common.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#include "debug.h"
#include "freq.h"

void my_cpuid(x64emu_t* emu, uint32_t tmp32u)
void my_cpuid(x64emu_t* emu)
{
emu->regs[_AX].dword[1] = emu->regs[_DX].dword[1] = emu->regs[_CX].dword[1] = emu->regs[_BX].dword[1] = 0;
int ncpu = getNCpu();
Expand Down Expand Up @@ -39,9 +39,10 @@ void my_cpuid(x64emu_t* emu, uint32_t tmp32u)
branding[0] = ' ';
}
}
uint32_t leaf = (uint32_t)R_EAX;
uint32_t subleaf = R_ECX;
//printf_log(LOG_INFO, "%04d|%p: cpuid leaf=0x%x (subleaf=0x%x)", GetTID(), (void*)R_RIP, tmp32u, subleaf);
switch(tmp32u) {
//printf_log(LOG_INFO, "%04d|%p: cpuid leaf=0x%x (subleaf=0x%x)", GetTID(), (void*)R_RIP, leaf, subleaf);
switch(leaf) {
case 0x0:
// emulate a P4. TODO: Emulate a Core2?
R_RAX = BOX64ENV(cputype)?0x0000000f:0x00000016;
Expand Down Expand Up @@ -558,7 +559,7 @@ void my_cpuid(x64emu_t* emu, uint32_t tmp32u)
break;
default:
if(warned) {
printf_log(LOG_INFO, "Warning, CPUID command %X unsupported (ECX=%08x)\n", tmp32u, R_RCX);
printf_log(LOG_INFO, "Warning, CPUID command %X unsupported (ECX=%08x)\n", leaf, R_RCX);
--warned;
if(!warned)
printf_log(LOG_INFO, "Stopped logging CPUID issues\n");
Expand Down
Loading