commit 90ece048e612e0b1a2e567cc0a2b58a2ac3b8d27
author florian <florian@8f6e269a-dfd6-0310-a8e1-e2731360e62c> Sat Apr 21 15:41:51 2012 +0000
committer florian <florian@8f6e269a-dfd6-0310-a8e1-e2731360e62c> Sat Apr 21 15:41:51 2012 +0000
tree bf886870c12ed4a2967f84fada6a6ae48c105561
parent 39aacda15b762b6deefc0322095ec6d4992823f4

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 8f6e269a-dfd6-0310-a8e1-e2731360e62c

priv/host_s390_defs.h

diff --git a/priv/host_s390_defs.h b/priv/host_s390_defs.h
index ce4a197..ba3b327 100644
--- a/priv/host_s390_defs.h
+++ b/priv/host_s390_defs.h
@@ -562,6 +562,8 @@
                       (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 */
 

priv/main_main.c

diff --git a/priv/main_main.c b/priv/main_main.c
index cf6e2f5..a8c3968 100644
--- a/priv/main_main.c
+++ b/priv/main_main.c
@@ -1168,6 +1168,8 @@
      { "gie" },
      { "dfp" },
      { "fgx" },
+     { "stfle" },
+     { "etf2" },
    };
    static HChar buf[sizeof facilities + sizeof prefix + 1];
    static HChar *p;
@@ -1187,6 +1189,10 @@
      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)

pub/libvex.h

diff --git a/pub/libvex.h b/pub/libvex.h
index 0466801..e229562 100644
--- a/pub/libvex.h
+++ b/pub/libvex.h
@@ -132,6 +132,7 @@
 #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 @@
                                 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)