deduplication in CPUDetect logic

Author: Xor-el

HashLib/src/Include/Simd/CpuDetect/CpuIdQuery.inc

@@ -1,11 +1,26 @@
 // CPUID query: executes CPUID with leaf=ALeaf, subleaf=ASubLeaf,
 // stores EAX/EBX/ECX/EDX into the TCpuIdResult record at AResult.
-// RBX must be preserved (CPUID clobbers it).
-// Expects MS x64 ABI: ecx = ALeaf, edx = ASubLeaf, r8 = AResult.
-// On FPC non-Windows (System V ABI), remaps edi,esi,rdx -> ecx,edx,r8.
+// IA-32 (HASHLIB_I386_ASM): preserves EBX; ESI = AResult, ECX = ASubLeaf, EAX = ALeaf.
+// x86-64: preserves RBX; MS ABI ecx=ALeaf, edx=ASubLeaf, r8=AResult;
+//   FPC non-Windows remaps edi, esi, rdx -> leaf, subleaf, result.
 {$IFDEF FPC}
   assembler; nostackframe;
+{$ENDIF}
 asm
+{$IFDEF HASHLIB_I386_ASM}
+  push ebx
+  push esi
+  mov esi, ecx
+  mov ecx, edx
+  cpuid
+  mov [esi], eax
+  mov [esi + 4], ebx
+  mov [esi + 8], ecx
+  mov [esi + 12], edx
+  pop esi
+  pop ebx
+{$ELSE}
+  {$IFDEF FPC}
   push rbx
   {$IFDEF MSWINDOWS}
   mov eax, ecx
@@ -26,8 +41,7 @@ asm
   mov dword ptr [r8 + 12], edx
   {$ENDIF}
   pop rbx
-{$ELSE}
-asm
+  {$ELSE}
   .PUSHNV RBX
   mov eax, ecx
   mov ecx, edx
@@ -36,4 +50,5 @@ asm
   mov dword ptr [r8 + 4], ebx
   mov dword ptr [r8 + 8], ecx
   mov dword ptr [r8 + 12], edx
+  {$ENDIF}
 {$ENDIF}

HashLib/src/Include/Simd/CpuDetect/CpuIdQuery_i386.inc

@@ -1,25 +1,36 @@
 // XGETBV query: executes XGETBV with ECX=0, stores EAX:EDX into the
 // UInt64 at AResult.
-// Expects MS x64 ABI: rcx = AResult.
-// On FPC non-Windows (System V ABI), remaps rdi -> rcx.
+// IA-32: AResult in EAX at asm entry (Windows and Unix).
+// x86-64: MS ABI rcx=AResult; FPC non-Windows remaps rdi -> r8.
 {$IFDEF FPC}
   assembler; nostackframe;
+{$ENDIF}
 asm
+{$IFDEF HASHLIB_I386_ASM}
+  push ebx
+  mov ebx, eax
+  xor ecx, ecx
+  db $0F, $01, $D0 // xgetbv
+  mov [ebx], eax
+  mov [ebx + 4], edx
+  pop ebx
+{$ELSE}
+  {$IFDEF FPC}
   {$IFDEF MSWINDOWS}
   mov r8, rcx
   {$ELSE}
   mov r8, rdi
   {$ENDIF}
   xor ecx, ecx
-  xgetbv
+  db $0F, $01, $D0 // xgetbv
   mov dword ptr [r8], eax
   mov dword ptr [r8 + 4], edx
-{$ELSE}
-asm
+  {$ELSE}
   .noframe
   mov r8, rcx
   xor ecx, ecx
-  xgetbv
+  db $0F, $01, $D0 // xgetbv
   mov dword ptr [r8], eax
   mov dword ptr [r8 + 4], edx
+  {$ENDIF}
 {$ENDIF}

HashLib/src/Include/Simd/CpuDetect/XGetBvQuery.inc

@@ -36,18 +36,6 @@   TCpuIdResult = record
     RegEAX, RegEBX, RegECX, RegEDX: UInt32;
   end;
 
-{$IFDEF HASHLIB_I386_ASM}
-
-procedure CpuIdQuery(ALeaf, ASubLeaf: UInt32; AResult: Pointer);
-  {$I ..\Include\Simd\CpuDetect\CpuIdQuery_i386.inc}
-end;
-
-procedure XGetBvQuery(AResult: Pointer);
-  {$I ..\Include\Simd\CpuDetect\XGetBvQuery_i386.inc}
-end;
-
-{$ELSE}
-
 procedure CpuIdQuery(ALeaf, ASubLeaf: UInt32; AResult: Pointer);
   {$I ..\Include\Simd\CpuDetect\CpuIdQuery.inc}
 end;
@@ -56,7 +44,6 @@ procedure XGetBvQuery(AResult: Pointer);
   {$I ..\Include\Simd\CpuDetect\XGetBvQuery.inc}
 end;
 
-{$ENDIF}
 {$ENDIF}
 
 { TSimd }