From: Florian Krohm <florian@eich-krohm.de>
Date: Thu, 3 May 2012 01:30:48 +0000 (+0000)
Subject: Add ETF3 facility (VEX bits). Part of fixing Bugzilla #289839.
X-Git-Tag: svn/VALGRIND_3_8_1^2~159
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e8f3bea0549f6c44f8fdf877d47029f8a7f53400;p=thirdparty%2Fvalgrind.git

Add ETF3 facility (VEX bits). Part of fixing Bugzilla #289839.
Patch by Divya Vyas (divyvyas@linux.vnet.ibm.com)


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

diff --git a/VEX/priv/host_s390_defs.h b/VEX/priv/host_s390_defs.h
index ba3b327893..a953b4356b 100644
--- a/VEX/priv/host_s390_defs.h
+++ b/VEX/priv/host_s390_defs.h
@@ -564,6 +564,8 @@ extern UInt s390_host_hwcaps;
                       (s390_host_hwcaps & (VEX_HWCAPS_S390X_ETF2))
 #define s390_host_has_stfle \
                       (s390_host_hwcaps & (VEX_HWCAPS_S390X_STFLE))
+#define s390_host_has_etf3 \
+                      (s390_host_hwcaps & (VEX_HWCAPS_S390X_ETF3))
 
 #endif /* ndef __VEX_HOST_S390_DEFS_H */
 
diff --git a/VEX/priv/main_main.c b/VEX/priv/main_main.c
index 4d11a671d9..83a93e59ca 100644
--- a/VEX/priv/main_main.c
+++ b/VEX/priv/main_main.c
@@ -1178,6 +1178,7 @@ static HChar* show_hwcaps_s390x ( UInt hwcaps )
      { "fgx" },
      { "stfle" },
      { "etf2" },
+     { "etf3" },
    };
    static HChar buf[sizeof facilities + sizeof prefix + 1];
    static HChar *p;
@@ -1201,6 +1202,8 @@ static HChar* show_hwcaps_s390x ( UInt hwcaps )
      p = p + vex_sprintf(p, "-%s", facilities[5]);
    if (hwcaps & VEX_HWCAPS_S390X_ETF2)
      p = p + vex_sprintf(p, "-%s", facilities[6]);
+   if (hwcaps & VEX_HWCAPS_S390X_ETF3)
+     p = p + vex_sprintf(p, "-%s", facilities[7]);
 
    /* If there are no facilities, add "zarch" */
    if (hwcaps == 0)
diff --git a/VEX/pub/libvex.h b/VEX/pub/libvex.h
index 51495e1862..1e7b66f2cf 100644
--- a/VEX/pub/libvex.h
+++ b/VEX/pub/libvex.h
@@ -134,6 +134,7 @@ typedef
 #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 */
+#define VEX_HWCAPS_S390X_ETF3  (1<<13)  /* ETF3-enhancement facility */
 
 /* Special value representing all available s390x hwcaps */
 #define VEX_HWCAPS_S390X_ALL   (VEX_HWCAPS_S390X_LDISP | \
@@ -142,6 +143,7 @@ typedef
                                 VEX_HWCAPS_S390X_DFP   | \
                                 VEX_HWCAPS_S390X_FGX   | \
                                 VEX_HWCAPS_S390X_STFLE | \
+                                VEX_HWCAPS_S390X_ETF3  | \
                                 VEX_HWCAPS_S390X_ETF2)
 
 #define VEX_HWCAPS_S390X(x)  ((x) & ~VEX_S390X_MODEL_MASK)