|
From: <sv...@va...> - 2012-05-03 01:31:31
|
florian 2012-05-03 02:31:24 +0100 (Thu, 03 May 2012)
New Revision: 12550
Log:
Add ETF3 facility (valgrind bits). Part of fixing Bugzilla #289839.
Patch by Divya Vyas (div...@li...)
Modified files:
trunk/coregrind/m_machine.c
Modified: trunk/coregrind/m_machine.c (+7 -3)
===================================================================
--- trunk/coregrind/m_machine.c 2012-05-01 21:21:30 +01:00 (rev 12549)
+++ trunk/coregrind/m_machine.c 2012-05-03 02:31:24 +01:00 (rev 12550)
@@ -1014,7 +1014,7 @@
vki_sigaction_toK_t tmp_sigill_act;
volatile Bool have_LDISP, have_EIMM, have_GIE, have_DFP, have_FGX;
- volatile Bool have_STFLE, have_ETF2;
+ volatile Bool have_STFLE, have_ETF2, have_ETF3;
Int r, model;
/* Unblock SIGILL and stash away the old action for that signal */
@@ -1087,6 +1087,7 @@
time, so the absence of STLFE implies the absence of ETF2. */
have_STFLE = True;
have_ETF2 = False;
+ have_ETF3 = False;
if (VG_MINIMAL_SETJMP(env_unsup_insn)) {
have_STFLE = False;
} else {
@@ -1098,6 +1099,8 @@
: : "cc", "memory");
if (hoststfle[0] & (1ULL << (63 - 24)))
have_ETF2 = True;
+ if (hoststfle[0] & (1ULL << (63 - 30)))
+ have_ETF3 = True;
}
/* Restore signals */
@@ -1114,8 +1117,8 @@
identification yet. Keeping fingers crossed. */
VG_(debugLog)(1, "machine", "machine %d LDISP %d EIMM %d GIE %d DFP %d "
- "FGX %d STFLE %d ETF2 %d\n", model, have_LDISP, have_EIMM,
- have_GIE, have_DFP, have_FGX, have_STFLE, have_ETF2);
+ "FGX %d STFLE %d ETF2 %d ETF3 %d\n", model, have_LDISP, have_EIMM,
+ have_GIE, have_DFP, have_FGX, have_STFLE, have_ETF2, have_ETF3);
vai.hwcaps = model;
if (have_LDISP) {
@@ -1129,6 +1132,7 @@
if (have_DFP) vai.hwcaps |= VEX_HWCAPS_S390X_DFP;
if (have_FGX) vai.hwcaps |= VEX_HWCAPS_S390X_FGX;
if (have_ETF2) vai.hwcaps |= VEX_HWCAPS_S390X_ETF2;
+ if (have_ETF3) vai.hwcaps |= VEX_HWCAPS_S390X_ETF3;
if (have_STFLE) vai.hwcaps |= VEX_HWCAPS_S390X_STFLE;
VG_(debugLog)(1, "machine", "hwcaps = 0x%x\n", vai.hwcaps);
|