mirror/libcpuid
1
0
Fork 0
mirror of https://github.com/anrieff/libcpuid synced 2025-06-07 00:51:40 +00:00
Code Issues Releases Wiki Activity

Simplify exec_cpuid to use constraints

Browse source 
The existing implementation does not work when using the x32 ABI, which
has 32-bit addresses but otherwise can use 64-bit registers.

Use constraints to specify cpuid input and output instead, which is much
simpler anyway.
This commit is contained in:
dramforever 2025-04-16 22:33:51 +08:00 • committed by The Tumultuous Unicorn Of Darkness
parent ab2bb1e2a5
commit 86c2bef72a
1 changed files with 4 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
libcpuid/asm-bits.c
View file

@ -84,57 +84,10 @@ int cpuid_exists_by_eflags(void)
void exec_cpuid(uint32_t *regs) void exec_cpuid(uint32_t *regs)
{ {
# if defined(COMPILER_GCC) || defined(COMPILER_CLANG) # if defined(COMPILER_GCC) || defined(COMPILER_CLANG)
# ifdef PLATFORM_X64 # if defined(PLATFORM_X86) || defined(PLATFORM_X64)
__asm __volatile ( __asm __volatile (
" mov %0, %%rdi\n" "cpuid"
: "+a"(regs[0]), "+b"(regs[1]), "+c"(regs[2]), "+d"(regs[3])::
" push %%rbx\n"
" push %%rcx\n"
" push %%rdx\n"
" mov (%%rdi), %%eax\n"
" mov 4(%%rdi), %%ebx\n"
" mov 8(%%rdi), %%ecx\n"
" mov 12(%%rdi), %%edx\n"
" cpuid\n"
" movl %%eax, (%%rdi)\n"
" movl %%ebx, 4(%%rdi)\n"
" movl %%ecx, 8(%%rdi)\n"
" movl %%edx, 12(%%rdi)\n"
" pop %%rdx\n"
" pop %%rcx\n"
" pop %%rbx\n"
:
:"m"(regs)
:"memory", "eax", "rdi"
);
# elif defined(PLATFORM_X86)
__asm __volatile(
" mov %0, %%edi\n"
" push %%ebx\n"
" push %%ecx\n"
" push %%edx\n"
" mov (%%edi), %%eax\n"
" mov 4(%%edi), %%ebx\n"
" mov 8(%%edi), %%ecx\n"
" mov 12(%%edi), %%edx\n"
" cpuid\n"
" mov %%eax, (%%edi)\n"
" mov %%ebx, 4(%%edi)\n"
" mov %%ecx, 8(%%edi)\n"
" mov %%edx, 12(%%edi)\n"
" pop %%edx\n"
" pop %%ecx\n"
" pop %%ebx\n"
:
:"m"(regs)
:"memory", "eax", "edi"
); );
# else # else
UNUSED(regs); UNUSED(regs);