diff --git a/crypto/x86cpuid.pl b/crypto/x86cpuid.pl index e8a75181afce09206f72fd82bb77db5f7b1493ab..ef1216a8b2ed4cc8ee5fc35667114ce36017b1aa 100644 --- a/crypto/x86cpuid.pl +++ b/crypto/x86cpuid.pl @@ -81,6 +81,16 @@ for (@ARGV) { $sse2=1 if (/-DOPENSSL_IA32_SSE2/); } &jmp (&label("generic")); &set_label("intel"); + &cmp ("edi",7); + &jb (&label("cacheinfo")); + + &mov ("esi",&wparam(0)); + &mov ("eax",7); + &xor ("ecx","ecx"); + &cpuid (); + &mov (&DWP(8,"esi"),"ebx"); + +&set_label("cacheinfo"); &cmp ("edi",4); &mov ("edi",-1); &jb (&label("nocacheinfo")); @@ -92,15 +102,6 @@ for (@ARGV) { $sse2=1 if (/-DOPENSSL_IA32_SSE2/); } &shr ("edi",14); &and ("edi",0xfff); # number of cores -1 per L1D - &cmp ("edi",7); - &jb (&label("nocacheinfo")); - - &mov ("esi",&wparam(0)); - &mov ("eax",7); - &xor ("ecx","ecx"); - &cpuid (); - &mov (&DWP(8,"esi"),"ebx"); - &set_label("nocacheinfo"); &mov ("eax",1); &xor ("ecx","ecx");