From: Florian Krohm <florian@eich-krohm.de>
Date: Sun, 26 Aug 2012 04:22:33 +0000 (+0000)
Subject: s390: Add STCKF hardware facility to hwcaps.
X-Git-Tag: svn/VALGRIND_3_9_0^2~275
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cd1cba86ff6d35f6db709de65949f4a7a1ef4e1e;p=thirdparty%2Fvalgrind.git

s390: Add STCKF hardware facility to hwcaps.


git-svn-id: svn://svn.valgrind.org/vex/trunk@2486
---

diff --git a/VEX/priv/host_s390_defs.h b/VEX/priv/host_s390_defs.h
index 5c457973b5..fc0b86325e 100644
--- a/VEX/priv/host_s390_defs.h
+++ b/VEX/priv/host_s390_defs.h
@@ -581,6 +581,8 @@ extern UInt s390_host_hwcaps;
                       (s390_host_hwcaps & (VEX_HWCAPS_S390X_STFLE))
 #define s390_host_has_etf3 \
                       (s390_host_hwcaps & (VEX_HWCAPS_S390X_ETF3))
+#define s390_host_has_stckf \
+                      (s390_host_hwcaps & (VEX_HWCAPS_S390X_STCKF))
 
 #endif /* ndef __VEX_HOST_S390_DEFS_H */
 
diff --git a/VEX/priv/main_main.c b/VEX/priv/main_main.c
index 33c362e85c..12946d8172 100644
--- a/VEX/priv/main_main.c
+++ b/VEX/priv/main_main.c
@@ -1247,6 +1247,7 @@ static HChar* show_hwcaps_s390x ( UInt hwcaps )
      { "stfle" },
      { "etf2" },
      { "etf3" },
+     { "stckf" },
    };
    static HChar buf[sizeof facilities + sizeof prefix + 1];
    static HChar *p;
@@ -1272,6 +1273,8 @@ static HChar* show_hwcaps_s390x ( UInt hwcaps )
      p = p + vex_sprintf(p, "-%s", facilities[6]);
    if (hwcaps & VEX_HWCAPS_S390X_ETF3)
      p = p + vex_sprintf(p, "-%s", facilities[7]);
+   if (hwcaps & VEX_HWCAPS_S390X_STCKF)
+     p = p + vex_sprintf(p, "-%s", facilities[8]);
 
    /* If there are no facilities, add "zarch" */
    if (hwcaps == 0)
diff --git a/VEX/pub/libvex.h b/VEX/pub/libvex.h
index a66a399801..1b32c70f5e 100644
--- a/VEX/pub/libvex.h
+++ b/VEX/pub/libvex.h
@@ -130,6 +130,7 @@ typedef
 #define VEX_HWCAPS_S390X_ETF2  (1<<11)  /* ETF2-enhancement facility */
 #define VEX_HWCAPS_S390X_STFLE (1<<12)  /* STFLE facility */
 #define VEX_HWCAPS_S390X_ETF3  (1<<13)  /* ETF3-enhancement facility */
+#define VEX_HWCAPS_S390X_STCKF (1<<14)  /* STCKF facility */
 
 /* Special value representing all available s390x hwcaps */
 #define VEX_HWCAPS_S390X_ALL   (VEX_HWCAPS_S390X_LDISP | \
@@ -138,6 +139,7 @@ typedef
                                 VEX_HWCAPS_S390X_DFP   | \
                                 VEX_HWCAPS_S390X_FGX   | \
                                 VEX_HWCAPS_S390X_STFLE | \
+                                VEX_HWCAPS_S390X_STCKF | \
                                 VEX_HWCAPS_S390X_ETF3  | \
                                 VEX_HWCAPS_S390X_ETF2)