Fix a few other static code checker spotted "issues"

[fio.git] / crc / crc32c-intel.c

diff --git a/crc/crc32c-intel.c b/crc/crc32c-intel.c
index fc106fa5a9755348e97b5e7dd631267b911061f0..5040efeae9030005af296bfa72c07414535144a4 100644 (file)
--- a/crc/crc32c-intel.c
+++ b/crc/crc32c-intel.c
@@ -18,7 +18,7 @@
  * Volume 2A: Instruction Set Reference, A-M
  */
 
-#ifdef ARCH_HAVE_SSE
+#ifdef ARCH_HAVE_SSE4_2
 
 #if BITS_PER_LONG == 64
 #define REX_PRE "0x48, "
@@ -28,8 +28,8 @@
 #define SCALE_F 4
 #endif
 
-uint32_t crc32c_intel_le_hw_byte(uint32_t crc, unsigned char const *data,
-                                unsigned long length)
+static uint32_t crc32c_intel_le_hw_byte(uint32_t crc, unsigned char const *data,
+                                       unsigned long length)
 {
        while (length--) {
                __asm__ __volatile__(
@@ -74,37 +74,30 @@ uint32_t crc32c_intel(unsigned char const *data, unsigned long length)
        return crc;
 }
 
-static void sig_ill(int sig)
+static void do_cpuid(unsigned int *eax, unsigned int *ebx, unsigned int *ecx,
+                    unsigned int *edx)
 {
-}
-
-static void crc32c_test(void)
-{
-       unsigned char buf[4] = { 1, 2, 3, 4 };
-       struct sigaction act;
-
-       /*
-        * Check if hw accelerated crc32c is available
-        */
-       memset(&act, 0, sizeof(act));
-       act.sa_handler = sig_ill;
-       act.sa_flags = SA_RESETHAND;
-       sigaction(SIGILL, &act, NULL);
-
-       (void) crc32c_intel(buf, sizeof(buf));
+       int id = *eax;
+
+       asm("movl %4, %%eax;"
+           "cpuid;"
+           "movl %%eax, %0;"
+           "movl %%ebx, %1;"
+           "movl %%ecx, %2;"
+           "movl %%edx, %3;"
+               : "=r" (*eax), "=r" (*ebx), "=r" (*ecx), "=r" (*edx)
+               : "r" (id)
+               : "eax", "ebx", "ecx", "edx");
 }
 
 int crc32c_intel_works(void)
 {
-       if (!fork()) {
-               crc32c_test();
-               exit(0);
-       } else {
-               int status;
+       unsigned int eax, ebx, ecx, edx;
 
-               wait(&status);
-               return !WIFSIGNALED(status);
-       }
+       eax = 1;
+
+       do_cpuid(&eax, &ebx, &ecx, &edx);
+       return (ecx & (1 << 20)) != 0;
 }
 
 #endif /* ARCH_HAVE_SSE */