|
From: <sv...@va...> - 2012-04-21 15:41:57
|
florian 2012-04-21 16:41:51 +0100 (Sat, 21 Apr 2012)
New Revision: 2303
Log:
Fix debug print for hwcaps adding stfle ad etf2.
Add VEX_HWCAPS_S390X_STFLE. This should have been part of r2237.
Modified files:
trunk/priv/host_s390_defs.h
trunk/priv/main_main.c
trunk/pub/libvex.h
Modified: trunk/pub/libvex.h (+2 -0)
===================================================================
--- trunk/pub/libvex.h 2012-04-21 16:34:25 +01:00 (rev 2302)
+++ trunk/pub/libvex.h 2012-04-21 16:41:51 +01:00 (rev 2303)
@@ -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)
Modified: trunk/priv/main_main.c (+6 -0)
===================================================================
--- trunk/priv/main_main.c 2012-04-21 16:34:25 +01:00 (rev 2302)
+++ trunk/priv/main_main.c 2012-04-21 16:41:51 +01:00 (rev 2303)
@@ -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)
Modified: trunk/priv/host_s390_defs.h (+2 -0)
===================================================================
--- trunk/priv/host_s390_defs.h 2012-04-21 16:34:25 +01:00 (rev 2302)
+++ trunk/priv/host_s390_defs.h 2012-04-21 16:41:51 +01:00 (rev 2303)
@@ -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 */
|