From: Florian Krohm <florian@eich-krohm.de>
Date: Sat, 21 Apr 2012 15:41:51 +0000 (+0000)
Subject: Fix debug print for hwcaps adding stfle ad etf2.
X-Git-Tag: svn/VALGRIND_3_8_1^2~175
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c07ea34bbe92bd85e7c960b680c002345d31d545;p=thirdparty%2Fvalgrind.git

Fix debug print for hwcaps adding stfle ad etf2.
Add VEX_HWCAPS_S390X_STFLE. This should have been part of r2237.


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

diff --git a/VEX/priv/host_s390_defs.h b/VEX/priv/host_s390_defs.h
index ce4a197260..ba3b327893 100644
--- a/VEX/priv/host_s390_defs.h
+++ b/VEX/priv/host_s390_defs.h
@@ -562,6 +562,8 @@ extern UInt s390_host_hwcaps;
                       (s390_host_hwcaps & (VEX_HWCAPS_S390X_FGX))
 #define s390_host_has_etf2 \
                       (s390_host_hwcaps & (VEX_HWCAPS_S390X_ETF2))
+#define s390_host_has_stfle \
+                      (s390_host_hwcaps & (VEX_HWCAPS_S390X_STFLE))
 
 #endif /* ndef __VEX_HOST_S390_DEFS_H */
 
diff --git a/VEX/priv/main_main.c b/VEX/priv/main_main.c
index cf6e2f5c61..a8c396816c 100644
--- a/VEX/priv/main_main.c
+++ b/VEX/priv/main_main.c
@@ -1168,6 +1168,8 @@ static HChar* show_hwcaps_s390x ( UInt hwcaps )
      { "gie" },
      { "dfp" },
      { "fgx" },
+     { "stfle" },
+     { "etf2" },
    };
    static HChar buf[sizeof facilities + sizeof prefix + 1];
    static HChar *p;
@@ -1187,6 +1189,10 @@ static HChar* show_hwcaps_s390x ( UInt hwcaps )
      p = p + vex_sprintf(p, "-%s", facilities[3]);
    if (hwcaps & VEX_HWCAPS_S390X_FGX)
      p = p + vex_sprintf(p, "-%s", facilities[4]);
+   if (hwcaps & VEX_HWCAPS_S390X_STFLE)
+     p = p + vex_sprintf(p, "-%s", facilities[5]);
+   if (hwcaps & VEX_HWCAPS_S390X_ETF2)
+     p = p + vex_sprintf(p, "-%s", facilities[6]);
 
    /* If there are no facilities, add "zarch" */
    if (hwcaps == 0)
diff --git a/VEX/pub/libvex.h b/VEX/pub/libvex.h
index 04668014c6..e229562173 100644
--- a/VEX/pub/libvex.h
+++ b/VEX/pub/libvex.h
@@ -132,6 +132,7 @@ typedef
 #define VEX_HWCAPS_S390X_DFP   (1<<9)   /* Decimal floating point facility */
 #define VEX_HWCAPS_S390X_FGX   (1<<10)  /* FPR-GR transfer facility */
 #define VEX_HWCAPS_S390X_ETF2  (1<<11)  /* ETF2-enhancement facility */
+#define VEX_HWCAPS_S390X_STFLE (1<<12)  /* STFLE facility */
 
 /* Special value representing all available s390x hwcaps */
 #define VEX_HWCAPS_S390X_ALL   (VEX_HWCAPS_S390X_LDISP | \
@@ -139,6 +140,7 @@ typedef
                                 VEX_HWCAPS_S390X_GIE   | \
                                 VEX_HWCAPS_S390X_DFP   | \
                                 VEX_HWCAPS_S390X_FGX   | \
+                                VEX_HWCAPS_S390X_STFLE | \
                                 VEX_HWCAPS_S390X_ETF2)
 
 #define VEX_HWCAPS_S390X(x)  ((x) & ~VEX_S390X_MODEL_MASK)