Add LIKELY/UNLIKELY macros for general use, replacing s390x-specific
versions. See #271504. (Florian Krohm, britzel@acm.org)
git-svn-id: svn://svn.valgrind.org/vex/trunk@2150 8f6e269a-dfd6-0310-a8e1-e2731360e62c
diff --git a/priv/guest_s390_toIR.c b/priv/guest_s390_toIR.c
index 2cd353e..7200069 100644
--- a/priv/guest_s390_toIR.c
+++ b/priv/guest_s390_toIR.c
@@ -45,12 +45,6 @@
#include "host_s390_disasm.h"
#include "host_s390_defs.h" /* S390_ROUND_xyzzy */
-#undef likely
-#undef unlikely
-#define likely(x) __builtin_expect(!!(x), 1)
-#define unlikely(x) __builtin_expect(!!(x), 0)
-
-
/*------------------------------------------------------------*/
/*--- Globals ---*/
@@ -1269,7 +1263,7 @@
{
HChar *mnm = irgen(i);
- if (unlikely(vex_traceflags & VEX_TRACE_FE))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_FE))
s390_disasm(ENC2(MNM, UINT), mnm, i);
}
@@ -1286,7 +1280,7 @@
{
HChar *mnm = irgen(r1, i2);
- if (unlikely(vex_traceflags & VEX_TRACE_FE))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_FE))
s390_disasm(ENC3(MNM, GPR, UINT), mnm, r1, i2);
}
@@ -1296,7 +1290,7 @@
{
HChar *mnm = irgen(r1, i2);
- if (unlikely(vex_traceflags & VEX_TRACE_FE))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_FE))
s390_disasm(ENC3(MNM, GPR, INT), mnm, r1, (Int)(Short)i2);
}
@@ -1306,7 +1300,7 @@
{
HChar *mnm = irgen(r1, i2);
- if (unlikely(vex_traceflags & VEX_TRACE_FE))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_FE))
s390_disasm(ENC3(MNM, GPR, PCREL), mnm, r1, (Int)(Short)i2);
}
@@ -1316,7 +1310,7 @@
{
HChar *mnm = irgen(r1, r3, i2);
- if (unlikely(vex_traceflags & VEX_TRACE_FE))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_FE))
s390_disasm(ENC4(MNM, GPR, GPR, PCREL), mnm, r1, r3, (Int)(Short)i2);
}
@@ -1326,7 +1320,7 @@
{
HChar *mnm = irgen(r1, r3, i2);
- if (unlikely(vex_traceflags & VEX_TRACE_FE))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_FE))
s390_disasm(ENC4(MNM, GPR, GPR, INT), mnm, r1, r3, (Int)(Short)i2);
}
@@ -1337,7 +1331,7 @@
{
HChar *mnm = irgen(r1, r2, i3, i4, i5);
- if (unlikely(vex_traceflags & VEX_TRACE_FE))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_FE))
s390_disasm(ENC6(MNM, GPR, GPR, UINT, UINT, UINT), mnm, r1, r2, i3, i4,
i5);
}
@@ -1348,7 +1342,7 @@
{
HChar *mnm = irgen(r1, r2, i4, m3);
- if (unlikely(vex_traceflags & VEX_TRACE_FE))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_FE))
s390_disasm(ENC5(XMNM, GPR, GPR, CABM, PCREL), S390_XMNM_CAB, mnm, m3, r1,
r2, m3, (Int)(Short)i4);
}
@@ -1359,7 +1353,7 @@
{
HChar *mnm = irgen(r1, m3, i4, i2);
- if (unlikely(vex_traceflags & VEX_TRACE_FE))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_FE))
s390_disasm(ENC5(XMNM, GPR, UINT, CABM, PCREL), S390_XMNM_CAB, mnm, m3,
r1, i2, m3, (Int)(Short)i4);
}
@@ -1370,7 +1364,7 @@
{
HChar *mnm = irgen(r1, m3, i4, i2);
- if (unlikely(vex_traceflags & VEX_TRACE_FE))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_FE))
s390_disasm(ENC5(XMNM, GPR, INT, CABM, PCREL), S390_XMNM_CAB, mnm, m3, r1,
(Int)(Char)i2, m3, (Int)(Short)i4);
}
@@ -1388,7 +1382,7 @@
{
HChar *mnm = irgen(r1, i2);
- if (unlikely(vex_traceflags & VEX_TRACE_FE))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_FE))
s390_disasm(ENC3(MNM, GPR, UINT), mnm, r1, i2);
}
@@ -1398,7 +1392,7 @@
{
HChar *mnm = irgen(r1, i2);
- if (unlikely(vex_traceflags & VEX_TRACE_FE))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_FE))
s390_disasm(ENC3(MNM, GPR, INT), mnm, r1, i2);
}
@@ -1408,7 +1402,7 @@
{
HChar *mnm = irgen(r1, i2);
- if (unlikely(vex_traceflags & VEX_TRACE_FE))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_FE))
s390_disasm(ENC3(MNM, GPR, PCREL), mnm, r1, i2);
}
@@ -1418,7 +1412,7 @@
{
HChar *mnm = irgen();
- if (unlikely(vex_traceflags & VEX_TRACE_FE))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_FE))
s390_disasm(ENC3(MNM, UINT, PCREL), mnm, r1, i2);
}
@@ -1435,7 +1429,7 @@
mnm = irgen(r1, m3, i2, op4addr);
- if (unlikely(vex_traceflags & VEX_TRACE_FE))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_FE))
s390_disasm(ENC5(XMNM, GPR, INT, CABM, UDXB), S390_XMNM_CAB, mnm, m3, r1,
(Int)(Char)i2, m3, d4, 0, b4);
}
@@ -1453,7 +1447,7 @@
mnm = irgen(r1, m3, i2, op4addr);
- if (unlikely(vex_traceflags & VEX_TRACE_FE))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_FE))
s390_disasm(ENC5(XMNM, GPR, UINT, CABM, UDXB), S390_XMNM_CAB, mnm, m3, r1,
i2, m3, d4, 0, b4);
}
@@ -1471,7 +1465,7 @@
{
HChar *mnm = irgen(r1, r2);
- if (unlikely(vex_traceflags & VEX_TRACE_FE))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_FE))
s390_disasm(ENC3(MNM, GPR, GPR), mnm, r1, r2);
}
@@ -1481,7 +1475,7 @@
{
HChar *mnm = irgen(r1, r2);
- if (unlikely(vex_traceflags & VEX_TRACE_FE))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_FE))
s390_disasm(ENC3(MNM, FPR, FPR), mnm, r1, r2);
}
@@ -1498,7 +1492,7 @@
{
HChar *mnm = irgen(r1, r2);
- if (unlikely(vex_traceflags & VEX_TRACE_FE))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_FE))
s390_disasm(ENC3(MNM, GPR, GPR), mnm, r1, r2);
}
@@ -1508,7 +1502,7 @@
{
HChar *mnm = irgen(r1, r2);
- if (unlikely(vex_traceflags & VEX_TRACE_FE))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_FE))
s390_disasm(ENC3(MNM, FPR, FPR), mnm, r1, r2);
}
@@ -1518,7 +1512,7 @@
{
HChar *mnm = irgen(r1, r2);
- if (unlikely(vex_traceflags & VEX_TRACE_FE))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_FE))
s390_disasm(ENC3(MNM, GPR, FPR), mnm, r1, r2);
}
@@ -1528,7 +1522,7 @@
{
HChar *mnm = irgen(r1, r2);
- if (unlikely(vex_traceflags & VEX_TRACE_FE))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_FE))
s390_disasm(ENC3(MNM, FPR, GPR), mnm, r1, r2);
}
@@ -1538,7 +1532,7 @@
{
HChar *mnm = irgen(r1);
- if (unlikely(vex_traceflags & VEX_TRACE_FE))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_FE))
s390_disasm(ENC2(MNM, GPR), mnm, r1);
}
@@ -1548,7 +1542,7 @@
{
HChar *mnm = irgen(r1);
- if (unlikely(vex_traceflags & VEX_TRACE_FE))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_FE))
s390_disasm(ENC2(MNM, FPR), mnm, r1);
}
@@ -1558,7 +1552,7 @@
{
HChar *mnm = irgen(r1, r3, r2);
- if (unlikely(vex_traceflags & VEX_TRACE_FE))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_FE))
s390_disasm(ENC4(MNM, FPR, FPR, FPR), mnm, r1, r3, r2);
}
@@ -1568,7 +1562,7 @@
{
irgen(m3, r1, r2);
- if (unlikely(vex_traceflags & VEX_TRACE_FE))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_FE))
s390_disasm(ENC3(XMNM, GPR, GPR), xmnm_kind, m3, r1, r2);
}
@@ -1578,7 +1572,7 @@
{
HChar *mnm = irgen(r3, r1, r2);
- if (unlikely(vex_traceflags & VEX_TRACE_FE))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_FE))
s390_disasm(ENC4(MNM, GPR, UINT, FPR), mnm, r1, r3, r2);
}
@@ -1588,7 +1582,7 @@
{
HChar *mnm = irgen(r3, r1, r2);
- if (unlikely(vex_traceflags & VEX_TRACE_FE))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_FE))
s390_disasm(ENC4(MNM, FPR, FPR, FPR), mnm, r1, r3, r2);
}
@@ -1598,7 +1592,7 @@
{
HChar *mnm = irgen(r3, r1, r2);
- if (unlikely(vex_traceflags & VEX_TRACE_FE))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_FE))
s390_disasm(ENC4(MNM, GPR, GPR, GPR), mnm, r1, r2, r3);
}
@@ -1614,7 +1608,7 @@
mnm = irgen(r1, r2, m3, op4addr);
- if (unlikely(vex_traceflags & VEX_TRACE_FE))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_FE))
s390_disasm(ENC5(XMNM, GPR, GPR, CABM, UDXB), S390_XMNM_CAB, mnm, m3, r1,
r2, m3, d4, 0, b4);
}
@@ -1631,7 +1625,7 @@
mnm = irgen(r1, op2addr);
- if (unlikely(vex_traceflags & VEX_TRACE_FE))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_FE))
s390_disasm(ENC3(MNM, GPR, UDXB), mnm, r1, d2, 0, b2);
}
@@ -1647,7 +1641,7 @@
mnm = irgen(r1, r3, op2addr);
- if (unlikely(vex_traceflags & VEX_TRACE_FE))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_FE))
s390_disasm(ENC4(MNM, GPR, GPR, UDXB), mnm, r1, r3, d2, 0, b2);
}
@@ -1663,7 +1657,7 @@
mnm = irgen(r1, r3, op2addr);
- if (unlikely(vex_traceflags & VEX_TRACE_FE))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_FE))
s390_disasm(ENC4(MNM, GPR, UINT, UDXB), mnm, r1, r3, d2, 0, b2);
}
@@ -1679,7 +1673,7 @@
mnm = irgen(r1, r3, op2addr);
- if (unlikely(vex_traceflags & VEX_TRACE_FE))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_FE))
s390_disasm(ENC4(MNM, AR, AR, UDXB), mnm, r1, r3, d2, 0, b2);
}
@@ -1689,7 +1683,7 @@
{
HChar *mnm = irgen(r1, r3, i2);
- if (unlikely(vex_traceflags & VEX_TRACE_FE))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_FE))
s390_disasm(ENC4(MNM, GPR, GPR, PCREL), mnm, r1, r3, (Int)(Short)i2);
}
@@ -1707,7 +1701,7 @@
mnm = irgen(r1, r3, op2addr);
- if (unlikely(vex_traceflags & VEX_TRACE_FE))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_FE))
s390_disasm(ENC4(MNM, GPR, GPR, SDXB), mnm, r1, r3, dh2, dl2, 0, b2);
}
@@ -1725,7 +1719,7 @@
mnm = irgen(r1, r3, op2addr);
- if (unlikely(vex_traceflags & VEX_TRACE_FE))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_FE))
s390_disasm(ENC4(MNM, AR, AR, SDXB), mnm, r1, r3, dh2, dl2, 0, b2);
}
@@ -1743,7 +1737,7 @@
mnm = irgen(r1, r3, op2addr);
- if (unlikely(vex_traceflags & VEX_TRACE_FE))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_FE))
s390_disasm(ENC4(MNM, GPR, UINT, SDXB), mnm, r1, r3, dh2, dl2, 0, b2);
}
@@ -1763,7 +1757,7 @@
irgen(r1, op2addr);
- if (unlikely(vex_traceflags & VEX_TRACE_FE))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_FE))
s390_disasm(ENC3(XMNM, GPR, SDXB), xmnm_kind, m3, r1, dh2, dl2, 0, b2);
}
@@ -1794,7 +1788,7 @@
mnm = irgen(r1, op2addr);
- if (unlikely(vex_traceflags & VEX_TRACE_FE))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_FE))
s390_disasm(ENC3(MNM, GPR, UDXB), mnm, r1, d2, x2, b2);
}
@@ -1811,7 +1805,7 @@
mnm = irgen(r1, op2addr);
- if (unlikely(vex_traceflags & VEX_TRACE_FE))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_FE))
s390_disasm(ENC3(MNM, FPR, UDXB), mnm, r1, d2, x2, b2);
}
@@ -1828,7 +1822,7 @@
mnm = irgen(r1, op2addr);
- if (unlikely(vex_traceflags & VEX_TRACE_FE))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_FE))
s390_disasm(ENC3(MNM, FPR, UDXB), mnm, r1, d2, x2, b2);
}
@@ -1845,7 +1839,7 @@
mnm = irgen(r3, op2addr, r1);
- if (unlikely(vex_traceflags & VEX_TRACE_FE))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_FE))
s390_disasm(ENC4(MNM, FPR, FPR, UDXB), mnm, r1, r3, d2, x2, b2);
}
@@ -1864,7 +1858,7 @@
mnm = irgen(r1, op2addr);
- if (unlikely(vex_traceflags & VEX_TRACE_FE))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_FE))
s390_disasm(ENC3(MNM, GPR, SDXB), mnm, r1, dh2, dl2, x2, b2);
}
@@ -1883,7 +1877,7 @@
mnm = irgen(r1, op2addr);
- if (unlikely(vex_traceflags & VEX_TRACE_FE))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_FE))
s390_disasm(ENC3(MNM, FPR, SDXB), mnm, r1, dh2, dl2, x2, b2);
}
@@ -1902,7 +1896,7 @@
mnm = irgen();
- if (unlikely(vex_traceflags & VEX_TRACE_FE))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_FE))
s390_disasm(ENC3(MNM, UINT, SDXB), mnm, r1, dh2, dl2, x2, b2);
}
@@ -1918,7 +1912,7 @@
mnm = irgen(op2addr);
- if (unlikely(vex_traceflags & VEX_TRACE_FE))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_FE))
s390_disasm(ENC2(MNM, UDXB), mnm, d2, 0, b2);
}
@@ -1934,7 +1928,7 @@
mnm = irgen(i2, op1addr);
- if (unlikely(vex_traceflags & VEX_TRACE_FE))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_FE))
s390_disasm(ENC3(MNM, UDXB, UINT), mnm, d1, 0, b1, i2);
}
@@ -1952,7 +1946,7 @@
mnm = irgen(i2, op1addr);
- if (unlikely(vex_traceflags & VEX_TRACE_FE))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_FE))
s390_disasm(ENC3(MNM, SDXB, UINT), mnm, dh1, dl1, 0, b1, i2);
}
@@ -1970,7 +1964,7 @@
mnm = irgen(i2, op1addr);
- if (unlikely(vex_traceflags & VEX_TRACE_FE))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_FE))
s390_disasm(ENC3(MNM, SDXB, INT), mnm, dh1, dl1, 0, b1, (Int)(Char)i2);
}
@@ -1989,7 +1983,7 @@
mnm = irgen(l, op1addr, op2addr);
- if (unlikely(vex_traceflags & VEX_TRACE_FE))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_FE))
s390_disasm(ENC3(MNM, UDLB, UDXB), mnm, d1, l, b1, d2, 0, b2);
}
@@ -2005,7 +1999,7 @@
mnm = irgen(i2, op1addr);
- if (unlikely(vex_traceflags & VEX_TRACE_FE))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_FE))
s390_disasm(ENC3(MNM, UDXB, INT), mnm, d1, 0, b1, (Int)(Short)i2);
}
@@ -2021,7 +2015,7 @@
mnm = irgen(i2, op1addr);
- if (unlikely(vex_traceflags & VEX_TRACE_FE))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_FE))
s390_disasm(ENC3(MNM, UDXB, UINT), mnm, d1, 0, b1, i2);
}
@@ -3072,7 +3066,7 @@
mkU32(0)), get_gpr_dw0(r2));
}
}
- if (unlikely(vex_traceflags & VEX_TRACE_FE))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_FE))
s390_disasm(ENC2(XMNM, GPR), S390_XMNM_BCR, r1, r2);
return "bcr";
@@ -3093,7 +3087,7 @@
mkU32(0)), mkexpr(op2addr));
}
}
- if (unlikely(vex_traceflags & VEX_TRACE_FE))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_FE))
s390_disasm(ENC2(XMNM, UDXB), S390_XMNM_BC, r1, d2, x2, b2);
return "bc";
@@ -3230,7 +3224,7 @@
}
}
- if (unlikely(vex_traceflags & VEX_TRACE_FE))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_FE))
s390_disasm(ENC2(XMNM, PCREL), S390_XMNM_BRC, r1, (Int)(Short)i2);
return "brc";
@@ -3251,7 +3245,7 @@
guest_IA_curr_instr + ((ULong)(Long)(Int)i2 << 1));
}
}
- if (unlikely(vex_traceflags & VEX_TRACE_FE))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_FE))
s390_disasm(ENC2(XMNM, PCREL), S390_XMNM_BRCL, r1, i2);
return "brcl";
@@ -4630,7 +4624,7 @@
s390_irgen_CPYA(UChar r1, UChar r2)
{
put_ar_w0(r1, get_ar_w0(r2));
- if (unlikely(vex_traceflags & VEX_TRACE_FE))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_FE))
s390_disasm(ENC3(MNM, AR, AR), "cpya", r1, r2);
return "cpya";
@@ -4824,7 +4818,7 @@
s390_irgen_EAR(UChar r1, UChar r2)
{
put_gpr_w1(r1, get_ar_w0(r2));
- if (unlikely(vex_traceflags & VEX_TRACE_FE))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_FE))
s390_disasm(ENC3(MNM, GPR, AR), "ear", r1, r2);
return "ear";
@@ -6785,7 +6779,7 @@
s390_irgen_SAR(UChar r1, UChar r2)
{
put_ar_w0(r1, get_gpr_w1(r2));
- if (unlikely(vex_traceflags & VEX_TRACE_FE))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_FE))
s390_disasm(ENC3(MNM, AR, GPR), "sar", r1, r2);
return "sar";
@@ -8857,7 +8851,7 @@
bytes = (UChar *) &last_execute_target;
s390_decode_and_irgen(bytes, ((((bytes[0] >> 6) + 1) >> 1) + 1) << 1,
dis_res);
- if (unlikely(vex_traceflags & VEX_TRACE_FE))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_FE))
vex_printf(" which was executed by\n");
/* dont make useless translations in the next execute */
last_execute_target = 0;
@@ -9235,7 +9229,7 @@
s390_cc_thunk_put1(S390_CC_OP_BITWISE, mktemp(Ity_I32, mkU32(0)), False);
- if (unlikely(vex_traceflags & VEX_TRACE_FE))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_FE))
s390_disasm(ENC3(MNM, UDLB, UDXB), "xc", d, length, b, d, 0, b);
}