From c0b912efd981410ceb76bc6192b0372f51027f57 Mon Sep 17 00:00:00 2001
From: Rolland Dudemaine <rolland@ghs.com>
Date: Tue, 27 Oct 2015 02:24:23 +0100
Subject: Use intrinsics for GHS toolchain for CPU feature detection.

cpuid and cpuidex are available as intrinsics, but the GNU-style
assembly is needed for xgetbv.

Change-Id: Ib9f280ac6b69b7ffb9c39289b52fa4af5e2de9ba
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
---
 src/corelib/tools/qsimd.cpp | 27 ++++++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/src/corelib/tools/qsimd.cpp b/src/corelib/tools/qsimd.cpp
index 0b3b84a302..171e87df05 100644
--- a/src/corelib/tools/qsimd.cpp
+++ b/src/corelib/tools/qsimd.cpp
@@ -68,6 +68,8 @@
 // copied from <linux/auxvec.h>
 #define AT_HWCAP  16    /* arch dependent hints at CPU capabilities */
 
+#elif defined(Q_CC_GHS)
+#include <INTEGRITY_types.h>
 #endif
 
 QT_BEGIN_NAMESPACE
@@ -179,6 +181,10 @@ static int maxBasicCpuidSupported()
     int info[4];
     __cpuid(info, 0);
     return info[0];
+#elif defined(Q_CC_GHS)
+    unsigned int info[4];
+    __CPUID(0, info);
+    return info[0];
 #else
     return 0;
 #endif
@@ -198,6 +204,11 @@ static void cpuidFeatures01(uint &ecx, uint &edx)
     __cpuid(info, 1);
     ecx = info[2];
     edx = info[3];
+#elif defined(Q_CC_GHS)
+    unsigned int info[4];
+    __CPUID(1, info);
+    ecx = info[2];
+    edx = info[3];
 #endif
 }
 
@@ -223,6 +234,11 @@ static void cpuidFeatures07_00(uint &ebx, uint &ecx)
     __cpuidex(info, 7, 0);
     ebx = info[1];
     ecx = info[2];
+#elif defined(Q_CC_GHS)
+    unsigned int info[4];
+    __CPUIDEX(7, 0, info);
+    ebx = info[1];
+    ecx = info[2];
 #endif
 }
 
@@ -232,7 +248,7 @@ inline quint64 _xgetbv(__int64) { return 0; }
 #endif
 static void xgetbv(uint in, uint &eax, uint &edx)
 {
-#if defined(Q_CC_GNU)
+#if defined(Q_CC_GNU) || defined(Q_CC_GHS)
     asm (".byte 0x0F, 0x01, 0xD0" // xgetbv instruction
         : "=a" (eax), "=d" (edx)
         : "c" (in));
@@ -638,6 +654,15 @@ int ffsll(quint64 i)
 #endif
 #elif defined(Q_OS_ANDROID) || defined(Q_OS_QNX) || defined(Q_OS_OSX)
 # define ffsll __builtin_ffsll
+#elif defined(Q_OS_INTEGRITY)
+int ffsll(quint64 i)
+{
+    unsigned long result;
+    result = __CLZ32(i);
+    if (!result)
+        result = 32 + __CLZ32(i >> 32);
+    return result;
+}
 #endif
 
 #ifdef Q_ATOMIC_INT64_IS_SUPPORTED
-- 
cgit v1.2.3