aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUros Bizjak <ubizjak@gmail.com>2017-09-04 20:34:06 +0200
committerUros Bizjak <uros@gcc.gnu.org>2017-09-04 20:34:06 +0200
commitbc394e5a2d2bc99591281b505695994a84c97607 (patch)
treeadef80adbad2a4c58286d5057b56080e77fe37ac
parentfc3664b1ca571b89c2100d9f44f7d9ff70778a75 (diff)
downloadgcc-bc394e5a2d2bc99591281b505695994a84c97607.zip
gcc-bc394e5a2d2bc99591281b505695994a84c97607.tar.gz
gcc-bc394e5a2d2bc99591281b505695994a84c97607.tar.bz2
mpx-os-support.h: New file.
* gcc.target/i386/mpx/mpx-os-support.h: New file. * gcc.target/i386/mpx/mpx-check.h: Include mpx-os-support.h. From-SVN: r251683
-rw-r--r--gcc/testsuite/ChangeLog5
-rw-r--r--gcc/testsuite/gcc.target/i386/mpx/mpx-check.h14
-rw-r--r--gcc/testsuite/gcc.target/i386/mpx/mpx-os-support.h16
3 files changed, 23 insertions, 12 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 940c0db..91aa16f 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2017-09-04 Uros Bizjak <ubizjak@gmail.com>
+
+ * gcc.target/i386/mpx/mpx-os-support.h: New file.
+ * gcc.target/i386/mpx/mpx-check.h: Include mpx-os-support.h.
+
2017-09-04 Bernd Edlinger <bernd.edlinger@hotmail.de>
PR target/77308
diff --git a/gcc/testsuite/gcc.target/i386/mpx/mpx-check.h b/gcc/testsuite/gcc.target/i386/mpx/mpx-check.h
index d84b8bf..e622934 100644
--- a/gcc/testsuite/gcc.target/i386/mpx/mpx-check.h
+++ b/gcc/testsuite/gcc.target/i386/mpx/mpx-check.h
@@ -1,8 +1,8 @@
#include <stdio.h>
#include <stdlib.h>
#include <assert.h>
-
#include "cpuid.h"
+#include "mpx-os-support.h"
static int
__attribute__ ((noinline))
@@ -16,16 +16,6 @@ mpx_test (int, const char **);
#define DEBUG
-#define XSTATE_BNDREGS (1 << 3)
-
-/* This should be an intrinsic, but isn't. */
-static int xgetbv (unsigned x)
-{
- unsigned eax, edx;
- asm ("xgetbv" : "=a" (eax), "=d" (edx) : "c" (x));
- return eax;
-}
-
static int
check_osxsave (void)
{
@@ -44,7 +34,7 @@ main (int argc, const char **argv)
return NORUNRES;
/* Run MPX test only if host has MPX support. */
- if (check_osxsave () && (ebx & bit_MPX) && (xgetbv (0) & XSTATE_BNDREGS))
+ if (check_osxsave () && (ebx & bit_MPX) && mpx_os_support ())
mpx_test (argc, argv);
else
{
diff --git a/gcc/testsuite/gcc.target/i386/mpx/mpx-os-support.h b/gcc/testsuite/gcc.target/i386/mpx/mpx-os-support.h
new file mode 100644
index 0000000..8c9294d
--- /dev/null
+++ b/gcc/testsuite/gcc.target/i386/mpx/mpx-os-support.h
@@ -0,0 +1,16 @@
+/* Check if the OS supports executing MPX instructions. */
+
+#define XCR_XFEATURE_ENABLED_MASK 0x0
+
+#define XSTATE_BNDREGS 0x8
+
+static int
+mpx_os_support (void)
+{
+ unsigned int eax, edx;
+ unsigned int ecx = XCR_XFEATURE_ENABLED_MASK;
+
+ __asm__ ("xgetbv" : "=a" (eax), "=d" (edx) : "c" (ecx));
+
+ return (eax & XSTATE_BNDREGS) != 0;
+}