You can subscribe to this list here.
| 2002 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(1) |
Oct
(122) |
Nov
(152) |
Dec
(69) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2003 |
Jan
(6) |
Feb
(25) |
Mar
(73) |
Apr
(82) |
May
(24) |
Jun
(25) |
Jul
(10) |
Aug
(11) |
Sep
(10) |
Oct
(54) |
Nov
(203) |
Dec
(182) |
| 2004 |
Jan
(307) |
Feb
(305) |
Mar
(430) |
Apr
(312) |
May
(187) |
Jun
(342) |
Jul
(487) |
Aug
(637) |
Sep
(336) |
Oct
(373) |
Nov
(441) |
Dec
(210) |
| 2005 |
Jan
(385) |
Feb
(480) |
Mar
(636) |
Apr
(544) |
May
(679) |
Jun
(625) |
Jul
(810) |
Aug
(838) |
Sep
(634) |
Oct
(521) |
Nov
(965) |
Dec
(543) |
| 2006 |
Jan
(494) |
Feb
(431) |
Mar
(546) |
Apr
(411) |
May
(406) |
Jun
(322) |
Jul
(256) |
Aug
(401) |
Sep
(345) |
Oct
(542) |
Nov
(308) |
Dec
(481) |
| 2007 |
Jan
(427) |
Feb
(326) |
Mar
(367) |
Apr
(255) |
May
(244) |
Jun
(204) |
Jul
(223) |
Aug
(231) |
Sep
(354) |
Oct
(374) |
Nov
(497) |
Dec
(362) |
| 2008 |
Jan
(322) |
Feb
(482) |
Mar
(658) |
Apr
(422) |
May
(476) |
Jun
(396) |
Jul
(455) |
Aug
(267) |
Sep
(280) |
Oct
(253) |
Nov
(232) |
Dec
(304) |
| 2009 |
Jan
(486) |
Feb
(470) |
Mar
(458) |
Apr
(423) |
May
(696) |
Jun
(461) |
Jul
(551) |
Aug
(575) |
Sep
(134) |
Oct
(110) |
Nov
(157) |
Dec
(102) |
| 2010 |
Jan
(226) |
Feb
(86) |
Mar
(147) |
Apr
(117) |
May
(107) |
Jun
(203) |
Jul
(193) |
Aug
(238) |
Sep
(300) |
Oct
(246) |
Nov
(23) |
Dec
(75) |
| 2011 |
Jan
(133) |
Feb
(195) |
Mar
(315) |
Apr
(200) |
May
(267) |
Jun
(293) |
Jul
(353) |
Aug
(237) |
Sep
(278) |
Oct
(611) |
Nov
(274) |
Dec
(260) |
| 2012 |
Jan
(303) |
Feb
(391) |
Mar
(417) |
Apr
(441) |
May
(488) |
Jun
(655) |
Jul
(590) |
Aug
(610) |
Sep
(526) |
Oct
(478) |
Nov
(359) |
Dec
(372) |
| 2013 |
Jan
(467) |
Feb
(226) |
Mar
(391) |
Apr
(281) |
May
(299) |
Jun
(252) |
Jul
(311) |
Aug
(352) |
Sep
(481) |
Oct
(571) |
Nov
(222) |
Dec
(231) |
| 2014 |
Jan
(185) |
Feb
(329) |
Mar
(245) |
Apr
(238) |
May
(281) |
Jun
(399) |
Jul
(382) |
Aug
(500) |
Sep
(579) |
Oct
(435) |
Nov
(487) |
Dec
(256) |
| 2015 |
Jan
(338) |
Feb
(357) |
Mar
(330) |
Apr
(294) |
May
(191) |
Jun
(108) |
Jul
(142) |
Aug
(261) |
Sep
(190) |
Oct
(54) |
Nov
(83) |
Dec
(22) |
| 2016 |
Jan
(49) |
Feb
(89) |
Mar
(33) |
Apr
(50) |
May
(27) |
Jun
(34) |
Jul
(53) |
Aug
(53) |
Sep
(98) |
Oct
(206) |
Nov
(93) |
Dec
(53) |
| 2017 |
Jan
(65) |
Feb
(82) |
Mar
(102) |
Apr
(86) |
May
(187) |
Jun
(67) |
Jul
(23) |
Aug
(93) |
Sep
(65) |
Oct
(45) |
Nov
(35) |
Dec
(17) |
| 2018 |
Jan
(26) |
Feb
(35) |
Mar
(38) |
Apr
(32) |
May
(8) |
Jun
(43) |
Jul
(27) |
Aug
(30) |
Sep
(43) |
Oct
(42) |
Nov
(38) |
Dec
(67) |
| 2019 |
Jan
(32) |
Feb
(37) |
Mar
(53) |
Apr
(64) |
May
(49) |
Jun
(18) |
Jul
(14) |
Aug
(53) |
Sep
(25) |
Oct
(30) |
Nov
(49) |
Dec
(31) |
| 2020 |
Jan
(87) |
Feb
(45) |
Mar
(37) |
Apr
(51) |
May
(99) |
Jun
(36) |
Jul
(11) |
Aug
(14) |
Sep
(20) |
Oct
(24) |
Nov
(40) |
Dec
(23) |
| 2021 |
Jan
(14) |
Feb
(53) |
Mar
(85) |
Apr
(15) |
May
(19) |
Jun
(3) |
Jul
(14) |
Aug
(1) |
Sep
(57) |
Oct
(73) |
Nov
(56) |
Dec
(22) |
| 2022 |
Jan
(3) |
Feb
(22) |
Mar
(6) |
Apr
(55) |
May
(46) |
Jun
(39) |
Jul
(15) |
Aug
(9) |
Sep
(11) |
Oct
(34) |
Nov
(20) |
Dec
(36) |
| 2023 |
Jan
(79) |
Feb
(41) |
Mar
(99) |
Apr
(169) |
May
(48) |
Jun
(16) |
Jul
(16) |
Aug
(57) |
Sep
(32) |
Oct
|
Nov
|
Dec
|
| S | M | T | W | T | F | S |
|---|---|---|---|---|---|---|
|
1
(9) |
2
(2) |
3
(9) |
4
(19) |
5
(4) |
6
(1) |
7
(6) |
|
8
(11) |
9
(30) |
10
(12) |
11
(25) |
12
(7) |
13
(5) |
14
|
|
15
(17) |
16
(15) |
17
(20) |
18
(17) |
19
(5) |
20
(4) |
21
|
|
22
|
23
|
24
|
25
|
26
|
27
(4) |
28
(15) |
|
29
(10) |
30
(9) |
31
(11) |
|
|
|
|
|
From: <sv...@va...> - 2011-05-09 22:51:22
|
Author: sewardj
Date: 2011-05-09 23:51:14 +0100 (Mon, 09 May 2011)
New Revision: 11738
Log:
Back out r11705, which was an attempt to make reading of line number
info created by LLVM 2.9 work properly. As per long discussion in
#272189, this isn't actually possible -- LLVM 2.9 creates bogus line
number info, and the bogusness can't be worked around at the Valgrind
end.
Modified:
trunk/coregrind/m_debuginfo/readdwarf.c
Modified: trunk/coregrind/m_debuginfo/readdwarf.c
===================================================================
--- trunk/coregrind/m_debuginfo/readdwarf.c 2011-05-09 22:42:06 UTC (rev 11737)
+++ trunk/coregrind/m_debuginfo/readdwarf.c 2011-05-09 22:51:14 UTC (rev 11738)
@@ -1110,16 +1110,8 @@
/* perhaps should assign
unconditionally to cval? */
- case 0x01: /* FORM_addr */ if (addr_size == 4) {
- cval = *(UInt*)p;
- } else if (addr_size == 8) {
- cval = *(ULong*)p;
- } else {
- /* wtf, Houston? */
- }
- p += addr_size; break;
-
/* TODO : Following ones just skip data - implement if you need */
+ case 0x01: /* FORM_addr */ p += addr_size; break;
case 0x03: /* FORM_block2 */ p += *((UShort*)p) + 2; break;
case 0x04: /* FORM_block4 */ p += *((UInt*)p) + 4; break;
case 0x09: /* FORM_block */ p += read_leb128U( &p ); break;
|
|
From: Philippe W. <phi...@sk...> - 2011-05-09 22:51:21
|
>> From what I can see, depending on the OS and the arch, we can have: >> PTRACE_GETREGS not defined >> PTRACE_GETREGS defined, but returning an error at runtime if used. >> PTRACE_GETREGS defined and working. >> >> I will update vgdb.c so that it handles the above 3 cases (doing checks at compile time >> and/or at runtime), which should solve the vgdb.c compilation problem for all linux platforms. I have just uploaded under https://bugs.kde.org/show_bug.cgi?id=214909 under the comment 69 a patch that improves the situation of the gdbserver tests on some platforms and a fix to vgdb.c that should make it compîle on all platforms. Together with (r11735) , when the patch in comment 69 is committed, valgrind should be buildable again on linux and darwin platforms. Philippe |
|
From: <sv...@va...> - 2011-05-09 22:42:17
|
Author: sewardj
Date: 2011-05-09 23:42:06 +0100 (Mon, 09 May 2011)
New Revision: 11737
Log:
VG_(mkstemp): fix infinite loop in the case where /tmp isn't
writable. Fixes #223249. (Florian Krohm, br...@ac...)
Modified:
trunk/coregrind/m_libcfile.c
Modified: trunk/coregrind/m_libcfile.c
===================================================================
--- trunk/coregrind/m_libcfile.c 2011-05-09 21:54:44 UTC (rev 11736)
+++ trunk/coregrind/m_libcfile.c 2011-05-09 22:42:06 UTC (rev 11737)
@@ -641,7 +641,7 @@
tries = 0;
while (True) {
- if (tries > 10)
+ if (tries++ > 10)
return -1;
VG_(sprintf)( buf, "/tmp/valgrind_%s_%08x",
part_of_name, VG_(random)( &seed ));
|
|
From: <sv...@va...> - 2011-05-09 21:54:53
|
Author: sewardj
Date: 2011-05-09 22:54:44 +0100 (Mon, 09 May 2011)
New Revision: 11736
Log:
Tidying up of branch-predict hint macros LIKELY/UNLIKELY. Fixes
#271504. (Florian Krohm, br...@ac...)
Modified:
trunk/coregrind/pub_core_libcassert.h
trunk/include/pub_tool_basics.h
trunk/include/pub_tool_libcassert.h
Modified: trunk/coregrind/pub_core_libcassert.h
===================================================================
--- trunk/coregrind/pub_core_libcassert.h 2011-05-09 21:33:32 UTC (rev 11735)
+++ trunk/coregrind/pub_core_libcassert.h 2011-05-09 21:54:44 UTC (rev 11736)
@@ -47,14 +47,14 @@
"valgrind", VG_BUGS_TO, "")
#define vg_assert(expr) \
- ((void) ((expr) ? 0 : \
+ ((void) (LIKELY(expr) ? 0 : \
(VG_(assert_fail) (/*isCore*/True, #expr, \
__FILE__, __LINE__, __PRETTY_FUNCTION__, \
""), \
0)))
#define vg_assert2(expr, format, args...) \
- ((void) ((expr) ? 0 : \
+ ((void) (LIKELY(expr) ? 0 : \
(VG_(assert_fail) (/*isCore*/True, #expr, \
__FILE__, __LINE__, __PRETTY_FUNCTION__, \
format, ##args), \
Modified: trunk/include/pub_tool_basics.h
===================================================================
--- trunk/include/pub_tool_basics.h 2011-05-09 21:33:32 UTC (rev 11735)
+++ trunk/include/pub_tool_basics.h 2011-05-09 21:54:44 UTC (rev 11736)
@@ -316,9 +316,9 @@
#define VG_BUGS_TO "www.valgrind.org"
/* Branch prediction hints. */
-#if 1 /*HAVE_BUILTIN_EXPECT*/
+#if defined(__GNUC__)
# define LIKELY(x) __builtin_expect(!!(x), 1)
-# define UNLIKELY(x) __builtin_expect((x), 0)
+# define UNLIKELY(x) __builtin_expect(!!(x), 0)
#else
# define LIKELY(x) (x)
# define UNLIKELY(x) (x)
Modified: trunk/include/pub_tool_libcassert.h
===================================================================
--- trunk/include/pub_tool_libcassert.h 2011-05-09 21:33:32 UTC (rev 11735)
+++ trunk/include/pub_tool_libcassert.h 2011-05-09 21:54:44 UTC (rev 11736)
@@ -32,7 +32,7 @@
#define __PUB_TOOL_LIBCBASSERT_H
#define tl_assert(expr) \
- ((void) ((expr) ? 0 : \
+ ((void) (LIKELY(expr) ? 0 : \
(VG_(assert_fail) (/*isCore?*/False, (const Char*)#expr, \
(const Char*)__FILE__, __LINE__, \
(const Char*)__PRETTY_FUNCTION__, \
@@ -40,7 +40,7 @@
0)))
#define tl_assert2(expr, format, args...) \
- ((void) ((expr) ? 0 : \
+ ((void) (LIKELY(expr) ? 0 : \
(VG_(assert_fail) (/*isCore?*/False, (const Char*)#expr, \
(const Char*)__FILE__, __LINE__, \
(const Char*)__PRETTY_FUNCTION__, \
|
|
From: <sv...@va...> - 2011-05-09 21:45:18
|
Author: sewardj
Date: 2011-05-09 22:45:04 +0100 (Mon, 09 May 2011)
New Revision: 2150
Log:
Add LIKELY/UNLIKELY macros for general use, replacing s390x-specific
versions. See #271504. (Florian Krohm, br...@ac...)
Modified:
trunk/priv/guest_s390_toIR.c
trunk/priv/host_s390_defs.c
trunk/priv/main_util.h
Modified: trunk/priv/guest_s390_toIR.c
===================================================================
--- trunk/priv/guest_s390_toIR.c 2011-05-09 20:35:41 UTC (rev 2149)
+++ trunk/priv/guest_s390_toIR.c 2011-05-09 21:45:04 UTC (rev 2150)
@@ -45,13 +45,7 @@
#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);
}
Modified: trunk/priv/host_s390_defs.c
===================================================================
--- trunk/priv/host_s390_defs.c 2011-05-09 20:35:41 UTC (rev 2149)
+++ trunk/priv/host_s390_defs.c 2011-05-09 21:45:04 UTC (rev 2150)
@@ -928,11 +928,6 @@
}
-#undef likely
-#undef unlikely
-#define likely(x) __builtin_expect(!!(x), 1)
-#define unlikely(x) __builtin_expect(!!(x), 0)
-
/*------------------------------------------------------------*/
/*--- Functions to emit a sequence of bytes ---*/
/*------------------------------------------------------------*/
@@ -1116,7 +1111,7 @@
static UChar *
s390_emit_AR(UChar *p, UChar r1, UChar r2)
{
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC3(MNM, GPR, GPR), "ar", r1, r2);
return emit_RR(p, 0x1a00, r1, r2);
@@ -1126,7 +1121,7 @@
static UChar *
s390_emit_AGR(UChar *p, UChar r1, UChar r2)
{
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC3(MNM, GPR, GPR), "agr", r1, r2);
return emit_RRE(p, 0xb9080000, r1, r2);
@@ -1136,7 +1131,7 @@
static UChar *
s390_emit_A(UChar *p, UChar r1, UChar x2, UChar b2, UShort d2)
{
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC3(MNM, GPR, UDXB), "a", r1, d2, x2, b2);
return emit_RX(p, 0x5a000000, r1, x2, b2, d2);
@@ -1148,7 +1143,7 @@
{
vassert(s390_host_has_ldisp);
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC3(MNM, GPR, SDXB), "ay", r1, dh2, dl2, x2, b2);
return emit_RXY(p, 0xe3000000005aULL, r1, x2, b2, dl2, dh2);
@@ -1160,7 +1155,7 @@
{
vassert(s390_host_has_ldisp || dh2 == 0);
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC3(MNM, GPR, SDXB), "ag", r1, dh2, dl2, x2, b2);
return emit_RXY(p, 0xe30000000008ULL, r1, x2, b2, dl2, dh2);
@@ -1172,7 +1167,7 @@
{
vassert(s390_host_has_eimm);
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC3(MNM, GPR, INT), "afi", r1, i2);
return emit_RIL(p, 0xc20900000000ULL, r1, i2);
@@ -1184,7 +1179,7 @@
{
vassert(s390_host_has_eimm);
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC3(MNM, GPR, INT), "agfi", r1, i2);
return emit_RIL(p, 0xc20800000000ULL, r1, i2);
@@ -1194,7 +1189,7 @@
static UChar *
s390_emit_AH(UChar *p, UChar r1, UChar x2, UChar b2, UShort d2)
{
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC3(MNM, GPR, UDXB), "ah", r1, d2, x2, b2);
return emit_RX(p, 0x4a000000, r1, x2, b2, d2);
@@ -1206,7 +1201,7 @@
{
vassert(s390_host_has_ldisp);
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC3(MNM, GPR, SDXB), "ahy", r1, dh2, dl2, x2, b2);
return emit_RXY(p, 0xe3000000007aULL, r1, x2, b2, dl2, dh2);
@@ -1216,7 +1211,7 @@
static UChar *
s390_emit_AHI(UChar *p, UChar r1, UShort i2)
{
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC3(MNM, GPR, INT), "ahi", r1, (Int)(Short)i2);
return emit_RI(p, 0xa70a0000, r1, i2);
@@ -1226,7 +1221,7 @@
static UChar *
s390_emit_AGHI(UChar *p, UChar r1, UShort i2)
{
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC3(MNM, GPR, INT), "aghi", r1, (Int)(Short)i2);
return emit_RI(p, 0xa70b0000, r1, i2);
@@ -1236,7 +1231,7 @@
static UChar *
s390_emit_NR(UChar *p, UChar r1, UChar r2)
{
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC3(MNM, GPR, GPR), "nr", r1, r2);
return emit_RR(p, 0x1400, r1, r2);
@@ -1246,7 +1241,7 @@
static UChar *
s390_emit_NGR(UChar *p, UChar r1, UChar r2)
{
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC3(MNM, GPR, GPR), "ngr", r1, r2);
return emit_RRE(p, 0xb9800000, r1, r2);
@@ -1256,7 +1251,7 @@
static UChar *
s390_emit_N(UChar *p, UChar r1, UChar x2, UChar b2, UShort d2)
{
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC3(MNM, GPR, UDXB), "n", r1, d2, x2, b2);
return emit_RX(p, 0x54000000, r1, x2, b2, d2);
@@ -1268,7 +1263,7 @@
{
vassert(s390_host_has_ldisp);
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC3(MNM, GPR, SDXB), "ny", r1, dh2, dl2, x2, b2);
return emit_RXY(p, 0xe30000000054ULL, r1, x2, b2, dl2, dh2);
@@ -1280,7 +1275,7 @@
{
vassert(s390_host_has_ldisp || dh2 == 0);
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC3(MNM, GPR, SDXB), "ng", r1, dh2, dl2, x2, b2);
return emit_RXY(p, 0xe30000000080ULL, r1, x2, b2, dl2, dh2);
@@ -1292,7 +1287,7 @@
{
vassert(s390_host_has_eimm);
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC3(MNM, GPR, UINT), "nihf", r1, i2);
return emit_RIL(p, 0xc00a00000000ULL, r1, i2);
@@ -1304,7 +1299,7 @@
{
vassert(s390_host_has_eimm);
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC3(MNM, GPR, UINT), "nilf", r1, i2);
return emit_RIL(p, 0xc00b00000000ULL, r1, i2);
@@ -1314,7 +1309,7 @@
static UChar *
s390_emit_NILL(UChar *p, UChar r1, UShort i2)
{
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC3(MNM, GPR, UINT), "nill", r1, i2);
return emit_RI(p, 0xa5070000, r1, i2);
@@ -1324,7 +1319,7 @@
static UChar *
s390_emit_BASR(UChar *p, UChar r1, UChar r2)
{
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC3(MNM, GPR, GPR), "basr", r1, r2);
return emit_RR(p, 0x0d00, r1, r2);
@@ -1334,7 +1329,7 @@
static UChar *
s390_emit_BCR(UChar *p, UChar r1, UChar r2)
{
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC2(XMNM, GPR), S390_XMNM_BCR, r1, r2);
return emit_RR(p, 0x0700, r1, r2);
@@ -1344,7 +1339,7 @@
static UChar *
s390_emit_BRC(UChar *p, UChar r1, UShort i2)
{
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC2(XMNM, PCREL), S390_XMNM_BRC, r1, (Int)(Short)i2);
return emit_RI(p, 0xa7040000, r1, i2);
@@ -1354,7 +1349,7 @@
static UChar *
s390_emit_CR(UChar *p, UChar r1, UChar r2)
{
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC3(MNM, GPR, GPR), "cr", r1, r2);
return emit_RR(p, 0x1900, r1, r2);
@@ -1364,7 +1359,7 @@
static UChar *
s390_emit_CGR(UChar *p, UChar r1, UChar r2)
{
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC3(MNM, GPR, GPR), "cgr", r1, r2);
return emit_RRE(p, 0xb9200000, r1, r2);
@@ -1374,7 +1369,7 @@
static UChar *
s390_emit_C(UChar *p, UChar r1, UChar x2, UChar b2, UShort d2)
{
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC3(MNM, GPR, UDXB), "c", r1, d2, x2, b2);
return emit_RX(p, 0x59000000, r1, x2, b2, d2);
@@ -1386,7 +1381,7 @@
{
vassert(s390_host_has_ldisp);
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC3(MNM, GPR, SDXB), "cy", r1, dh2, dl2, x2, b2);
return emit_RXY(p, 0xe30000000059ULL, r1, x2, b2, dl2, dh2);
@@ -1398,7 +1393,7 @@
{
vassert(s390_host_has_ldisp || dh2 == 0);
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC3(MNM, GPR, SDXB), "cg", r1, dh2, dl2, x2, b2);
return emit_RXY(p, 0xe30000000020ULL, r1, x2, b2, dl2, dh2);
@@ -1410,7 +1405,7 @@
{
vassert(s390_host_has_eimm);
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC3(MNM, GPR, INT), "cfi", r1, i2);
return emit_RIL(p, 0xc20d00000000ULL, r1, i2);
@@ -1420,7 +1415,7 @@
static UChar *
s390_emit_CS(UChar *p, UChar r1, UChar r3, UChar b2, UShort d2)
{
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC4(MNM, GPR, GPR, UDXB), "cs", r1, r3, d2, 0, b2);
return emit_RS(p, 0xba000000, r1, r3, b2, d2);
@@ -1432,7 +1427,7 @@
{
vassert(s390_host_has_ldisp);
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC4(MNM, GPR, GPR, SDXB), "csy", r1, r3, dh2, dl2, 0, b2);
return emit_RSY(p, 0xeb0000000014ULL, r1, r3, b2, dl2, dh2);
@@ -1444,7 +1439,7 @@
{
vassert(s390_host_has_ldisp || dh2 == 0);
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC4(MNM, GPR, GPR, SDXB), "csg", r1, r3, dh2, dl2, 0, b2);
return emit_RSY(p, 0xeb0000000030ULL, r1, r3, b2, dl2, dh2);
@@ -1454,7 +1449,7 @@
static UChar *
s390_emit_CLR(UChar *p, UChar r1, UChar r2)
{
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC3(MNM, GPR, GPR), "clr", r1, r2);
return emit_RR(p, 0x1500, r1, r2);
@@ -1464,7 +1459,7 @@
static UChar *
s390_emit_CLGR(UChar *p, UChar r1, UChar r2)
{
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC3(MNM, GPR, GPR), "clgr", r1, r2);
return emit_RRE(p, 0xb9210000, r1, r2);
@@ -1474,7 +1469,7 @@
static UChar *
s390_emit_CL(UChar *p, UChar r1, UChar x2, UChar b2, UShort d2)
{
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC3(MNM, GPR, UDXB), "cl", r1, d2, x2, b2);
return emit_RX(p, 0x55000000, r1, x2, b2, d2);
@@ -1486,7 +1481,7 @@
{
vassert(s390_host_has_ldisp);
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC3(MNM, GPR, SDXB), "cly", r1, dh2, dl2, x2, b2);
return emit_RXY(p, 0xe30000000055ULL, r1, x2, b2, dl2, dh2);
@@ -1498,7 +1493,7 @@
{
vassert(s390_host_has_ldisp || dh2 == 0);
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC3(MNM, GPR, SDXB), "clg", r1, dh2, dl2, x2, b2);
return emit_RXY(p, 0xe30000000021ULL, r1, x2, b2, dl2, dh2);
@@ -1510,7 +1505,7 @@
{
vassert(s390_host_has_eimm);
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC3(MNM, GPR, UINT), "clfi", r1, i2);
return emit_RIL(p, 0xc20f00000000ULL, r1, i2);
@@ -1520,7 +1515,7 @@
static UChar *
s390_emit_DR(UChar *p, UChar r1, UChar r2)
{
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC3(MNM, GPR, GPR), "dr", r1, r2);
return emit_RR(p, 0x1d00, r1, r2);
@@ -1530,7 +1525,7 @@
static UChar *
s390_emit_D(UChar *p, UChar r1, UChar x2, UChar b2, UShort d2)
{
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC3(MNM, GPR, UDXB), "d", r1, d2, x2, b2);
return emit_RX(p, 0x5d000000, r1, x2, b2, d2);
@@ -1540,7 +1535,7 @@
static UChar *
s390_emit_DLR(UChar *p, UChar r1, UChar r2)
{
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC3(MNM, GPR, GPR), "dlr", r1, r2);
return emit_RRE(p, 0xb9970000, r1, r2);
@@ -1550,7 +1545,7 @@
static UChar *
s390_emit_DLGR(UChar *p, UChar r1, UChar r2)
{
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC3(MNM, GPR, GPR), "dlgr", r1, r2);
return emit_RRE(p, 0xb9870000, r1, r2);
@@ -1562,7 +1557,7 @@
{
vassert(s390_host_has_ldisp || dh2 == 0);
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC3(MNM, GPR, SDXB), "dl", r1, dh2, dl2, x2, b2);
return emit_RXY(p, 0xe30000000097ULL, r1, x2, b2, dl2, dh2);
@@ -1574,7 +1569,7 @@
{
vassert(s390_host_has_ldisp || dh2 == 0);
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC3(MNM, GPR, SDXB), "dlg", r1, dh2, dl2, x2, b2);
return emit_RXY(p, 0xe30000000087ULL, r1, x2, b2, dl2, dh2);
@@ -1584,7 +1579,7 @@
static UChar *
s390_emit_DSGR(UChar *p, UChar r1, UChar r2)
{
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC3(MNM, GPR, GPR), "dsgr", r1, r2);
return emit_RRE(p, 0xb90d0000, r1, r2);
@@ -1596,7 +1591,7 @@
{
vassert(s390_host_has_ldisp || dh2 == 0);
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC3(MNM, GPR, SDXB), "dsg", r1, dh2, dl2, x2, b2);
return emit_RXY(p, 0xe3000000000dULL, r1, x2, b2, dl2, dh2);
@@ -1606,7 +1601,7 @@
static UChar *
s390_emit_XR(UChar *p, UChar r1, UChar r2)
{
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC3(MNM, GPR, GPR), "xr", r1, r2);
return emit_RR(p, 0x1700, r1, r2);
@@ -1616,7 +1611,7 @@
static UChar *
s390_emit_XGR(UChar *p, UChar r1, UChar r2)
{
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC3(MNM, GPR, GPR), "xgr", r1, r2);
return emit_RRE(p, 0xb9820000, r1, r2);
@@ -1626,7 +1621,7 @@
static UChar *
s390_emit_X(UChar *p, UChar r1, UChar x2, UChar b2, UShort d2)
{
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC3(MNM, GPR, UDXB), "x", r1, d2, x2, b2);
return emit_RX(p, 0x57000000, r1, x2, b2, d2);
@@ -1638,7 +1633,7 @@
{
vassert(s390_host_has_ldisp);
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC3(MNM, GPR, SDXB), "xy", r1, dh2, dl2, x2, b2);
return emit_RXY(p, 0xe30000000057ULL, r1, x2, b2, dl2, dh2);
@@ -1650,7 +1645,7 @@
{
vassert(s390_host_has_ldisp || dh2 == 0);
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC3(MNM, GPR, SDXB), "xg", r1, dh2, dl2, x2, b2);
return emit_RXY(p, 0xe30000000082ULL, r1, x2, b2, dl2, dh2);
@@ -1662,7 +1657,7 @@
{
vassert(s390_host_has_eimm);
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC3(MNM, GPR, UINT), "xihf", r1, i2);
return emit_RIL(p, 0xc00600000000ULL, r1, i2);
@@ -1674,7 +1669,7 @@
{
vassert(s390_host_has_eimm);
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC3(MNM, GPR, UINT), "xilf", r1, i2);
return emit_RIL(p, 0xc00700000000ULL, r1, i2);
@@ -1686,7 +1681,7 @@
{
vassert(s390_host_has_eimm);
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC3(MNM, GPR, GPR), "flogr", r1, r2);
return emit_RRE(p, 0xb9830000, r1, r2);
@@ -1696,7 +1691,7 @@
static UChar *
s390_emit_IC(UChar *p, UChar r1, UChar x2, UChar b2, UShort d2)
{
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC3(MNM, GPR, UDXB), "ic", r1, d2, x2, b2);
return emit_RX(p, 0x43000000, r1, x2, b2, d2);
@@ -1708,7 +1703,7 @@
{
vassert(s390_host_has_ldisp);
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC3(MNM, GPR, SDXB), "icy", r1, dh2, dl2, x2, b2);
return emit_RXY(p, 0xe30000000073ULL, r1, x2, b2, dl2, dh2);
@@ -1720,7 +1715,7 @@
{
vassert(s390_host_has_eimm);
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC3(MNM, GPR, UINT), "iihf", r1, i2);
return emit_RIL(p, 0xc00800000000ULL, r1, i2);
@@ -1730,7 +1725,7 @@
static UChar *
s390_emit_IIHH(UChar *p, UChar r1, UShort i2)
{
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC3(MNM, GPR, UINT), "iihh", r1, i2);
return emit_RI(p, 0xa5000000, r1, i2);
@@ -1740,7 +1735,7 @@
static UChar *
s390_emit_IIHL(UChar *p, UChar r1, UShort i2)
{
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC3(MNM, GPR, UINT), "iihl", r1, i2);
return emit_RI(p, 0xa5010000, r1, i2);
@@ -1752,7 +1747,7 @@
{
vassert(s390_host_has_eimm);
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC3(MNM, GPR, UINT), "iilf", r1, i2);
return emit_RIL(p, 0xc00900000000ULL, r1, i2);
@@ -1762,7 +1757,7 @@
static UChar *
s390_emit_IILH(UChar *p, UChar r1, UShort i2)
{
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC3(MNM, GPR, UINT), "iilh", r1, i2);
return emit_RI(p, 0xa5020000, r1, i2);
@@ -1772,7 +1767,7 @@
static UChar *
s390_emit_IILL(UChar *p, UChar r1, UShort i2)
{
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC3(MNM, GPR, UINT), "iill", r1, i2);
return emit_RI(p, 0xa5030000, r1, i2);
@@ -1782,7 +1777,7 @@
static UChar *
s390_emit_IPM(UChar *p, UChar r1, UChar r2)
{
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC2(MNM, GPR), "ipm", r1);
return emit_RRE(p, 0xb2220000, r1, r2);
@@ -1792,7 +1787,7 @@
static UChar *
s390_emit_LR(UChar *p, UChar r1, UChar r2)
{
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC3(MNM, GPR, GPR), "lr", r1, r2);
return emit_RR(p, 0x1800, r1, r2);
@@ -1802,7 +1797,7 @@
static UChar *
s390_emit_LGR(UChar *p, UChar r1, UChar r2)
{
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC3(MNM, GPR, GPR), "lgr", r1, r2);
return emit_RRE(p, 0xb9040000, r1, r2);
@@ -1812,7 +1807,7 @@
static UChar *
s390_emit_LGFR(UChar *p, UChar r1, UChar r2)
{
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC3(MNM, GPR, GPR), "lgfr", r1, r2);
return emit_RRE(p, 0xb9140000, r1, r2);
@@ -1822,7 +1817,7 @@
static UChar *
s390_emit_L(UChar *p, UChar r1, UChar x2, UChar b2, UShort d2)
{
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC3(MNM, GPR, UDXB), "l", r1, d2, x2, b2);
return emit_RX(p, 0x58000000, r1, x2, b2, d2);
@@ -1834,7 +1829,7 @@
{
vassert(s390_host_has_ldisp);
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC3(MNM, GPR, SDXB), "ly", r1, dh2, dl2, x2, b2);
return emit_RXY(p, 0xe30000000058ULL, r1, x2, b2, dl2, dh2);
@@ -1846,7 +1841,7 @@
{
vassert(s390_host_has_ldisp || dh2 == 0);
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC3(MNM, GPR, SDXB), "lg", r1, dh2, dl2, x2, b2);
return emit_RXY(p, 0xe30000000004ULL, r1, x2, b2, dl2, dh2);
@@ -1858,7 +1853,7 @@
{
vassert(s390_host_has_ldisp || dh2 == 0);
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC3(MNM, GPR, SDXB), "lgf", r1, dh2, dl2, x2, b2);
return emit_RXY(p, 0xe30000000014ULL, r1, x2, b2, dl2, dh2);
@@ -1870,7 +1865,7 @@
{
vassert(s390_host_has_eimm);
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC3(MNM, GPR, INT), "lgfi", r1, i2);
return emit_RIL(p, 0xc00100000000ULL, r1, i2);
@@ -1880,7 +1875,7 @@
static UChar *
s390_emit_LTR(UChar *p, UChar r1, UChar r2)
{
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC3(MNM, GPR, GPR), "ltr", r1, r2);
return emit_RR(p, 0x1200, r1, r2);
@@ -1890,7 +1885,7 @@
static UChar *
s390_emit_LTGR(UChar *p, UChar r1, UChar r2)
{
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC3(MNM, GPR, GPR), "ltgr", r1, r2);
return emit_RRE(p, 0xb9020000, r1, r2);
@@ -1902,7 +1897,7 @@
{
vassert(s390_host_has_eimm);
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC3(MNM, GPR, SDXB), "lt", r1, dh2, dl2, x2, b2);
return emit_RXY(p, 0xe30000000012ULL, r1, x2, b2, dl2, dh2);
@@ -1914,7 +1909,7 @@
{
vassert(s390_host_has_eimm);
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC3(MNM, GPR, SDXB), "ltg", r1, dh2, dl2, x2, b2);
return emit_RXY(p, 0xe30000000002ULL, r1, x2, b2, dl2, dh2);
@@ -1926,7 +1921,7 @@
{
vassert(s390_host_has_eimm);
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC3(MNM, GPR, GPR), "lbr", r1, r2);
return emit_RRE(p, 0xb9260000, r1, r2);
@@ -1938,7 +1933,7 @@
{
vassert(s390_host_has_eimm);
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC3(MNM, GPR, GPR), "lgbr", r1, r2);
return emit_RRE(p, 0xb9060000, r1, r2);
@@ -1950,7 +1945,7 @@
{
vassert(s390_host_has_ldisp);
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC3(MNM, GPR, SDXB), "lb", r1, dh2, dl2, x2, b2);
return emit_RXY(p, 0xe30000000076ULL, r1, x2, b2, dl2, dh2);
@@ -1962,7 +1957,7 @@
{
vassert(s390_host_has_ldisp);
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC3(MNM, GPR, SDXB), "lgb", r1, dh2, dl2, x2, b2);
return emit_RXY(p, 0xe30000000077ULL, r1, x2, b2, dl2, dh2);
@@ -1972,7 +1967,7 @@
static UChar *
s390_emit_LCR(UChar *p, UChar r1, UChar r2)
{
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC3(MNM, GPR, GPR), "lcr", r1, r2);
return emit_RR(p, 0x1300, r1, r2);
@@ -1982,7 +1977,7 @@
static UChar *
s390_emit_LCGR(UChar *p, UChar r1, UChar r2)
{
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC3(MNM, GPR, GPR), "lcgr", r1, r2);
return emit_RRE(p, 0xb9030000, r1, r2);
@@ -1994,7 +1989,7 @@
{
vassert(s390_host_has_eimm);
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC3(MNM, GPR, GPR), "lhr", r1, r2);
return emit_RRE(p, 0xb9270000, r1, r2);
@@ -2006,7 +2001,7 @@
{
vassert(s390_host_has_eimm);
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC3(MNM, GPR, GPR), "lghr", r1, r2);
return emit_RRE(p, 0xb9070000, r1, r2);
@@ -2016,7 +2011,7 @@
static UChar *
s390_emit_LH(UChar *p, UChar r1, UChar x2, UChar b2, UShort d2)
{
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC3(MNM, GPR, UDXB), "lh", r1, d2, x2, b2);
return emit_RX(p, 0x48000000, r1, x2, b2, d2);
@@ -2028,7 +2023,7 @@
{
vassert(s390_host_has_ldisp);
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC3(MNM, GPR, SDXB), "lhy", r1, dh2, dl2, x2, b2);
return emit_RXY(p, 0xe30000000078ULL, r1, x2, b2, dl2, dh2);
@@ -2040,7 +2035,7 @@
{
vassert(s390_host_has_ldisp || dh2 == 0);
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC3(MNM, GPR, SDXB), "lgh", r1, dh2, dl2, x2, b2);
return emit_RXY(p, 0xe30000000015ULL, r1, x2, b2, dl2, dh2);
@@ -2050,7 +2045,7 @@
static UChar *
s390_emit_LHI(UChar *p, UChar r1, UShort i2)
{
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC3(MNM, GPR, INT), "lhi", r1, (Int)(Short)i2);
return emit_RI(p, 0xa7080000, r1, i2);
@@ -2060,7 +2055,7 @@
static UChar *
s390_emit_LGHI(UChar *p, UChar r1, UShort i2)
{
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC3(MNM, GPR, INT), "lghi", r1, (Int)(Short)i2);
return emit_RI(p, 0xa7090000, r1, i2);
@@ -2070,7 +2065,7 @@
static UChar *
s390_emit_LLGFR(UChar *p, UChar r1, UChar r2)
{
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC3(MNM, GPR, GPR), "llgfr", r1, r2);
return emit_RRE(p, 0xb9160000, r1, r2);
@@ -2082,7 +2077,7 @@
{
vassert(s390_host_has_ldisp || dh2 == 0);
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC3(MNM, GPR, SDXB), "llgf", r1, dh2, dl2, x2, b2);
return emit_RXY(p, 0xe30000000016ULL, r1, x2, b2, dl2, dh2);
@@ -2094,7 +2089,7 @@
{
vassert(s390_host_has_eimm);
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC3(MNM, GPR, GPR), "llcr", r1, r2);
return emit_RRE(p, 0xb9940000, r1, r2);
@@ -2106,7 +2101,7 @@
{
vassert(s390_host_has_eimm);
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC3(MNM, GPR, GPR), "llgcr", r1, r2);
return emit_RRE(p, 0xb9840000, r1, r2);
@@ -2118,7 +2113,7 @@
{
vassert(s390_host_has_eimm);
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC3(MNM, GPR, SDXB), "llc", r1, dh2, dl2, x2, b2);
return emit_RXY(p, 0xe30000000094ULL, r1, x2, b2, dl2, dh2);
@@ -2130,7 +2125,7 @@
{
vassert(s390_host_has_ldisp || dh2 == 0);
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC3(MNM, GPR, SDXB), "llgc", r1, dh2, dl2, x2, b2);
return emit_RXY(p, 0xe30000000090ULL, r1, x2, b2, dl2, dh2);
@@ -2142,7 +2137,7 @@
{
vassert(s390_host_has_eimm);
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC3(MNM, GPR, GPR), "llhr", r1, r2);
return emit_RRE(p, 0xb9950000, r1, r2);
@@ -2154,7 +2149,7 @@
{
vassert(s390_host_has_eimm);
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC3(MNM, GPR, GPR), "llghr", r1, r2);
return emit_RRE(p, 0xb9850000, r1, r2);
@@ -2166,7 +2161,7 @@
{
vassert(s390_host_has_eimm);
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC3(MNM, GPR, SDXB), "llh", r1, dh2, dl2, x2, b2);
return emit_RXY(p, 0xe30000000095ULL, r1, x2, b2, dl2, dh2);
@@ -2178,7 +2173,7 @@
{
vassert(s390_host_has_ldisp || dh2 == 0);
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC3(MNM, GPR, SDXB), "llgh", r1, dh2, dl2, x2, b2);
return emit_RXY(p, 0xe30000000091ULL, r1, x2, b2, dl2, dh2);
@@ -2190,7 +2185,7 @@
{
vassert(s390_host_has_eimm);
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC3(MNM, GPR, UINT), "llilf", r1, i2);
return emit_RIL(p, 0xc00f00000000ULL, r1, i2);
@@ -2200,7 +2195,7 @@
static UChar *
s390_emit_LLILH(UChar *p, UChar r1, UShort i2)
{
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC3(MNM, GPR, UINT), "llilh", r1, i2);
return emit_RI(p, 0xa50e0000, r1, i2);
@@ -2210,7 +2205,7 @@
static UChar *
s390_emit_LLILL(UChar *p, UChar r1, UShort i2)
{
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC3(MNM, GPR, UINT), "llill", r1, i2);
return emit_RI(p, 0xa50f0000, r1, i2);
@@ -2220,7 +2215,7 @@
static UChar *
s390_emit_MR(UChar *p, UChar r1, UChar r2)
{
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC3(MNM, GPR, GPR), "mr", r1, r2);
return emit_RR(p, 0x1c00, r1, r2);
@@ -2230,7 +2225,7 @@
static UChar *
s390_emit_M(UChar *p, UChar r1, UChar x2, UChar b2, UShort d2)
{
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC3(MNM, GPR, UDXB), "m", r1, d2, x2, b2);
return emit_RX(p, 0x5c000000, r1, x2, b2, d2);
@@ -2242,7 +2237,7 @@
{
vassert(s390_host_has_gie);
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC3(MNM, GPR, SDXB), "mfy", r1, dh2, dl2, x2, b2);
return emit_RXY(p, 0xe3000000005cULL, r1, x2, b2, dl2, dh2);
@@ -2252,7 +2247,7 @@
static UChar *
s390_emit_MH(UChar *p, UChar r1, UChar x2, UChar b2, UShort d2)
{
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC3(MNM, GPR, UDXB), "mh", r1, d2, x2, b2);
return emit_RX(p, 0x4c000000, r1, x2, b2, d2);
@@ -2264,7 +2259,7 @@
{
vassert(s390_host_has_gie);
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC3(MNM, GPR, SDXB), "mhy", r1, dh2, dl2, x2, b2);
return emit_RXY(p, 0xe3000000007cULL, r1, x2, b2, dl2, dh2);
@@ -2274,7 +2269,7 @@
static UChar *
s390_emit_MHI(UChar *p, UChar r1, UShort i2)
{
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC3(MNM, GPR, INT), "mhi", r1, (Int)(Short)i2);
return emit_RI(p, 0xa70c0000, r1, i2);
@@ -2284,7 +2279,7 @@
static UChar *
s390_emit_MLR(UChar *p, UChar r1, UChar r2)
{
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC3(MNM, GPR, GPR), "mlr", r1, r2);
return emit_RRE(p, 0xb9960000, r1, r2);
@@ -2294,7 +2289,7 @@
static UChar *
s390_emit_MLGR(UChar *p, UChar r1, UChar r2)
{
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC3(MNM, GPR, GPR), "mlgr", r1, r2);
return emit_RRE(p, 0xb9860000, r1, r2);
@@ -2306,7 +2301,7 @@
{
vassert(s390_host_has_ldisp || dh2 == 0);
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC3(MNM, GPR, SDXB), "ml", r1, dh2, dl2, x2, b2);
return emit_RXY(p, 0xe30000000096ULL, r1, x2, b2, dl2, dh2);
@@ -2318,7 +2313,7 @@
{
vassert(s390_host_has_ldisp || dh2 == 0);
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC3(MNM, GPR, SDXB), "mlg", r1, dh2, dl2, x2, b2);
return emit_RXY(p, 0xe30000000086ULL, r1, x2, b2, dl2, dh2);
@@ -2328,7 +2323,7 @@
static UChar *
s390_emit_MSR(UChar *p, UChar r1, UChar r2)
{
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC3(MNM, GPR, GPR), "msr", r1, r2);
return emit_RRE(p, 0xb2520000, r1, r2);
@@ -2338,7 +2333,7 @@
static UChar *
s390_emit_MSGR(UChar *p, UChar r1, UChar r2)
{
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC3(MNM, GPR, GPR), "msgr", r1, r2);
return emit_RRE(p, 0xb90c0000, r1, r2);
@@ -2348,7 +2343,7 @@
static UChar *
s390_emit_MS(UChar *p, UChar r1, UChar x2, UChar b2, UShort d2)
{
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC3(MNM, GPR, UDXB), "ms", r1, d2, x2, b2);
return emit_RX(p, 0x71000000, r1, x2, b2, d2);
@@ -2360,7 +2355,7 @@
{
vassert(s390_host_has_ldisp);
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC3(MNM, GPR, SDXB), "msy", r1, dh2, dl2, x2, b2);
return emit_RXY(p, 0xe30000000051ULL, r1, x2, b2, dl2, dh2);
@@ -2372,7 +2367,7 @@
{
vassert(s390_host_has_ldisp || dh2 == 0);
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC3(MNM, GPR, SDXB), "msg", r1, dh2, dl2, x2, b2);
return emit_RXY(p, 0xe3000000000cULL, r1, x2, b2, dl2, dh2);
@@ -2384,7 +2379,7 @@
{
vassert(s390_host_has_gie);
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC3(MNM, GPR, INT), "msfi", r1, i2);
return emit_RIL(p, 0xc20100000000ULL, r1, i2);
@@ -2396,7 +2391,7 @@
{
vassert(s390_host_has_gie);
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC3(MNM, GPR, INT), "msgfi", r1, i2);
return emit_RIL(p, 0xc20000000000ULL, r1, i2);
@@ -2406,7 +2401,7 @@
static UChar *
s390_emit_OR(UChar *p, UChar r1, UChar r2)
{
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC3(MNM, GPR, GPR), "or", r1, r2);
return emit_RR(p, 0x1600, r1, r2);
@@ -2416,7 +2411,7 @@
static UChar *
s390_emit_OGR(UChar *p, UChar r1, UChar r2)
{
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC3(MNM, GPR, GPR), "ogr", r1, r2);
return emit_RRE(p, 0xb9810000, r1, r2);
@@ -2426,7 +2421,7 @@
static UChar *
s390_emit_O(UChar *p, UChar r1, UChar x2, UChar b2, UShort d2)
{
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC3(MNM, GPR, UDXB), "o", r1, d2, x2, b2);
return emit_RX(p, 0x56000000, r1, x2, b2, d2);
@@ -2438,7 +2433,7 @@
{
vassert(s390_host_has_ldisp);
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC3(MNM, GPR, SDXB), "oy", r1, dh2, dl2, x2, b2);
return emit_RXY(p, 0xe30000000056ULL, r1, x2, b2, dl2, dh2);
@@ -2450,7 +2445,7 @@
{
vassert(s390_host_has_ldisp || dh2 == 0);
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC3(MNM, GPR, SDXB), "og", r1, dh2, dl2, x2, b2);
return emit_RXY(p, 0xe30000000081ULL, r1, x2, b2, dl2, dh2);
@@ -2462,7 +2457,7 @@
{
vassert(s390_host_has_eimm);
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC3(MNM, GPR, UINT), "oihf", r1, i2);
return emit_RIL(p, 0xc00c00000000ULL, r1, i2);
@@ -2474,7 +2469,7 @@
{
vassert(s390_host_has_eimm);
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC3(MNM, GPR, UINT), "oilf", r1, i2);
return emit_RIL(p, 0xc00d00000000ULL, r1, i2);
@@ -2484,7 +2479,7 @@
static UChar *
s390_emit_OILL(UChar *p, UChar r1, UShort i2)
{
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC3(MNM, GPR, UINT), "oill", r1, i2);
return emit_RI(p, 0xa50b0000, r1, i2);
@@ -2494,7 +2489,7 @@
static UChar *
s390_emit_SLL(UChar *p, UChar r1, UChar b2, UShort d2)
{
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC3(MNM, GPR, UDXB), "sll", r1, d2, 0, b2);
return emit_RS(p, 0x89000000, r1, 0, b2, d2);
@@ -2506,7 +2501,7 @@
{
vassert(s390_host_has_ldisp || dh2 == 0);
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC4(MNM, GPR, GPR, SDXB), "sllg", r1, r3, dh2, dl2, 0, b2);
return emit_RSY(p, 0xeb000000000dULL, r1, r3, b2, dl2, dh2);
@@ -2516,7 +2511,7 @@
static UChar *
s390_emit_SRA(UChar *p, UChar r1, UChar b2, UShort d2)
{
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC3(MNM, GPR, UDXB), "sra", r1, d2, 0, b2);
return emit_RS(p, 0x8a000000, r1, 0, b2, d2);
@@ -2528,7 +2523,7 @@
{
vassert(s390_host_has_ldisp || dh2 == 0);
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC4(MNM, GPR, GPR, SDXB), "srag", r1, r3, dh2, dl2, 0, b2);
return emit_RSY(p, 0xeb000000000aULL, r1, r3, b2, dl2, dh2);
@@ -2538,7 +2533,7 @@
static UChar *
s390_emit_SRL(UChar *p, UChar r1, UChar b2, UShort d2)
{
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC3(MNM, GPR, UDXB), "srl", r1, d2, 0, b2);
return emit_RS(p, 0x88000000, r1, 0, b2, d2);
@@ -2550,7 +2545,7 @@
{
vassert(s390_host_has_ldisp || dh2 == 0);
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC4(MNM, GPR, GPR, SDXB), "srlg", r1, r3, dh2, dl2, 0, b2);
return emit_RSY(p, 0xeb000000000cULL, r1, r3, b2, dl2, dh2);
@@ -2560,7 +2555,7 @@
static UChar *
s390_emit_ST(UChar *p, UChar r1, UChar x2, UChar b2, UShort d2)
{
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC3(MNM, GPR, UDXB), "st", r1, d2, x2, b2);
return emit_RX(p, 0x50000000, r1, x2, b2, d2);
@@ -2572,7 +2567,7 @@
{
vassert(s390_host_has_ldisp);
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC3(MNM, GPR, SDXB), "sty", r1, dh2, dl2, x2, b2);
return emit_RXY(p, 0xe30000000050ULL, r1, x2, b2, dl2, dh2);
@@ -2584,7 +2579,7 @@
{
vassert(s390_host_has_ldisp || dh2 == 0);
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC3(MNM, GPR, SDXB), "stg", r1, dh2, dl2, x2, b2);
return emit_RXY(p, 0xe30000000024ULL, r1, x2, b2, dl2, dh2);
@@ -2594,7 +2589,7 @@
static UChar *
s390_emit_STC(UChar *p, UChar r1, UChar x2, UChar b2, UShort d2)
{
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC3(MNM, GPR, UDXB), "stc", r1, d2, x2, b2);
return emit_RX(p, 0x42000000, r1, x2, b2, d2);
@@ -2606,7 +2601,7 @@
{
vassert(s390_host_has_ldisp);
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC3(MNM, GPR, SDXB), "stcy", r1, dh2, dl2, x2, b2);
return emit_RXY(p, 0xe30000000072ULL, r1, x2, b2, dl2, dh2);
@@ -2616,7 +2611,7 @@
static UChar *
s390_emit_STH(UChar *p, UChar r1, UChar x2, UChar b2, UShort d2)
{
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC3(MNM, GPR, UDXB), "sth", r1, d2, x2, b2);
return emit_RX(p, 0x40000000, r1, x2, b2, d2);
@@ -2628,7 +2623,7 @@
{
vassert(s390_host_has_ldisp);
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC3(MNM, GPR, SDXB), "sthy", r1, dh2, dl2, x2, b2);
return emit_RXY(p, 0xe30000000070ULL, r1, x2, b2, dl2, dh2);
@@ -2638,7 +2633,7 @@
static UChar *
s390_emit_SR(UChar *p, UChar r1, UChar r2)
{
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC3(MNM, GPR, GPR), "sr", r1, r2);
return emit_RR(p, 0x1b00, r1, r2);
@@ -2648,7 +2643,7 @@
static UChar *
s390_emit_SGR(UChar *p, UChar r1, UChar r2)
{
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC3(MNM, GPR, GPR), "sgr", r1, r2);
return emit_RRE(p, 0xb9090000, r1, r2);
@@ -2658,7 +2653,7 @@
static UChar *
s390_emit_S(UChar *p, UChar r1, UChar x2, UChar b2, UShort d2)
{
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC3(MNM, GPR, UDXB), "s", r1, d2, x2, b2);
return emit_RX(p, 0x5b000000, r1, x2, b2, d2);
@@ -2670,7 +2665,7 @@
{
vassert(s390_host_has_ldisp);
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC3(MNM, GPR, SDXB), "sy", r1, dh2, dl2, x2, b2);
return emit_RXY(p, 0xe3000000005bULL, r1, x2, b2, dl2, dh2);
@@ -2682,7 +2677,7 @@
{
vassert(s390_host_has_ldisp || dh2 == 0);
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC3(MNM, GPR, SDXB), "sg", r1, dh2, dl2, x2, b2);
return emit_RXY(p, 0xe30000000009ULL, r1, x2, b2, dl2, dh2);
@@ -2692,7 +2687,7 @@
static UChar *
s390_emit_SH(UChar *p, UChar r1, UChar x2, UChar b2, UShort d2)
{
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC3(MNM, GPR, UDXB), "sh", r1, d2, x2, b2);
return emit_RX(p, 0x4b000000, r1, x2, b2, d2);
@@ -2704,7 +2699,7 @@
{
vassert(s390_host_has_ldisp);
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC3(MNM, GPR, SDXB), "shy", r1, dh2, dl2, x2, b2);
return emit_RXY(p, 0xe3000000007bULL, r1, x2, b2, dl2, dh2);
@@ -2716,7 +2711,7 @@
{
vassert(s390_host_has_eimm);
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC3(MNM, GPR, UINT), "slfi", r1, i2);
return emit_RIL(p, 0xc20500000000ULL, r1, i2);
@@ -2726,7 +2721,7 @@
static UChar *
s390_emit_SLGFI(UChar *p, UChar r1, UInt i2)
{
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC3(MNM, GPR, UINT), "slgfi", r1, i2);
return emit_RIL(p, 0xc20400000000ULL, r1, i2);
@@ -2736,7 +2731,7 @@
static UChar *
s390_emit_LDR(UChar *p, UChar r1, UChar r2)
{
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC3(MNM, FPR, FPR), "ldr", r1, r2);
return emit_RR(p, 0x2800, r1, r2);
@@ -2746,7 +2741,7 @@
static UChar *
s390_emit_LE(UChar *p, UChar r1, UChar x2, UChar b2, UShort d2)
{
- if (unlikely(vex_traceflags & VEX_TRACE_ASM))
+ if (UNLIKELY(vex_traceflags & VEX_TRACE_ASM))
s390_disasm(ENC3(MNM, FPR, UDXB), "le", r1, d2, x2, b2);
return emit_RX(p, 0x78000000, r1, x2, b2, d2);
@@ -2756...
[truncated message content] |
|
From: Julian S. <js...@ac...> - 2011-05-09 21:36:32
|
On Monday, May 09, 2011, Tom Hughes wrote:
> On 09/05/11 21:46, Julian Seward wrote:
> > On Monday, May 09, 2011, Maynard Johnson wrote:
> >> Valgrind builds OK on SLES 11 SP1. Comparing ptrace header files
> >> between SLES 10 and SLES 11 SP1, I see that PTRACE_{GET|SET}REGS is
> >> most assuredly *not* defined in SLES 10. Is this a PowerPC issue only?
> >
> > Maynard, are you 110% sure about that? IIUC, the lack of
> > PTRACE_{GET|SET}REGS functionality would make ptrace() pretty darn
> > useless.
>
> Why? You would still have {PEEK|POKE}USER, you just wouldn't be able to
> do multiple registers at once.
You're right .. I'm ill-informed. (I kinda suspected PTRACE_{GET|SET}REGS
were an en-masse enhancement of {PEEK|POKE}USER, but only after I
sent the above message :-(
J
|
|
From: Julian S. <js...@ac...> - 2011-05-09 21:35:05
|
On Monday, May 09, 2011, Julian Seward wrote: > if VGCONF_PLATFORMS_INCLUDE_X86_DARWIN > vgdb_LDFLAGS += -Wl,-read_only_relocs -Wl,suppress > endif > > Looks like it is missing. Does adding it help? Yeah, that makes it link I think. Committed as r11735. What I infer from this is that the macbook you are using is a 32-bit only machine -- is that correct? J |
|
From: <sv...@va...> - 2011-05-09 21:33:41
|
Author: sewardj Date: 2011-05-09 22:33:32 +0100 (Mon, 09 May 2011) New Revision: 11735 Log: Fix link flags so that 'vgdb' can be built on x86-darwin. Modified: trunk/coregrind/Makefile.am Modified: trunk/coregrind/Makefile.am =================================================================== --- trunk/coregrind/Makefile.am 2011-05-09 10:46:55 UTC (rev 11734) +++ trunk/coregrind/Makefile.am 2011-05-09 21:33:32 UTC (rev 11735) @@ -64,6 +64,9 @@ vgdb_CFLAGS = $(AM_CFLAGS_PRI) vgdb_CCASFLAGS = $(AM_CCASFLAGS_PRI) vgdb_LDFLAGS = $(AM_CFLAGS_PRI) -lpthread +if VGCONF_PLATFORMS_INCLUDE_X86_DARWIN +vgdb_LDFLAGS += -Wl,-read_only_relocs -Wl,suppress +endif no_op_client_for_valgrind_SOURCES = no_op_client_for_valgrind.c no_op_client_for_valgrind_CPPFLAGS = $(AM_CPPFLAGS_PRI) |
|
From: Tom H. <to...@co...> - 2011-05-09 21:12:54
|
On 09/05/11 21:46, Julian Seward wrote:
> On Monday, May 09, 2011, Maynard Johnson wrote:
>
>> Valgrind builds OK on SLES 11 SP1. Comparing ptrace header files between
>> SLES 10 and SLES 11 SP1, I see that PTRACE_{GET|SET}REGS is most assuredly
>> *not* defined in SLES 10. Is this a PowerPC issue only?
>
> Maynard, are you 110% sure about that? IIUC, the lack of PTRACE_{GET|SET}REGS
> functionality would make ptrace() pretty darn useless.
Why? You would still have {PEEK|POKE}USER, you just wouldn't be able to
do multiple registers at once.
The {GET|SET}REGS opcodes were added to the original API to allow
efficient access to multiple registers at once - they are an
optimisation and not essential.
Tom
--
Tom Hughes (to...@co...)
http://compton.nu/
|
|
From: Maynard J. <may...@us...> - 2011-05-09 21:08:11
|
Philippe Waroquiers wrote:
> From: "Maynard Johnson" <may...@us...>
>> I also get compile errors with ppc64, but on older distros like SLES 10 and RHEL 5. The compilation error is different, though:
> ...
>> Valgrind builds OK on SLES 11 SP1. Comparing ptrace header files between SLES 10 and SLES 11 SP1, I see that PTRACE_{GET|SET}REGS
>> is most assuredly *not* defined in SLES 10. Is this a PowerPC issue only?
>
> vgdb.c (and the rest of the gdbserver patch) has been compiled on various combinations of arch and platforms.
> (a.o. on RHEL5 x86_64).
>
> From what I can see, depending on the OS and the arch, we can have:
> PTRACE_GETREGS not defined
> PTRACE_GETREGS defined, but returning an error at runtime if used.
> PTRACE_GETREGS defined and working.
>
> I will update vgdb.c so that it handles the above 3 cases (doing checks at compile time
> and/or at runtime), which should solve the vgdb.c compilation problem for all linux platforms.
Thanks, Philippe, that would be good. Just FYI . . . here's a link to a kernel commit that should provide you with a bit more background regarding the PowerPC part of the story: http://www.mail-archive.com/git...@vg.../msg17265.html.
-Maynard
>
> (there is no compilation problem on Darwin, because the ptrace support has not been
> done for Darwin. There is however a link problem on Darwin/x86 that I do not understand).
>
>
> Philippe
>
|
|
From: Julian S. <js...@ac...> - 2011-05-09 21:07:58
|
On Monday, May 09, 2011, Philippe Waroquiers wrote: > I see vgdb fails to link as indicated below. > I have no idea what could be the cause of the below. vgdb is a normal > executable (so e.g. it can and uses libc). > > Does someone has an idea what is wrong in the below ? Not exactly, but I can offer a some explanation and a suggestion. The main tool executables (memcheck-amd64-linux, etc) have strange constraints: no libc use, statically linked, alternate load address. Hence there are these "funny flags" in the build system for them. But there are also some "normal" programs, with no such constraints: "valgrind" (a small program which selects and starts the main tool exes), "no_op_client_for_valgrind" (a kludge for the AIX port; does nothing), and now "vgdb". Looking at coregrind/Makefile.am near line 67 .. and comparing with the neighbouring valgrind_ and no_op_client_for_valgrind_ above and below .. do you maybe need to add something like this: if VGCONF_PLATFORMS_INCLUDE_X86_DARWIN vgdb_LDFLAGS += -Wl,-read_only_relocs -Wl,suppress endif Looks like it is missing. Does adding it help? (Just a guess.) J |
|
From: Julian S. <js...@ac...> - 2011-05-09 21:00:29
|
On Monday, May 09, 2011, Maynard Johnson wrote:
> Valgrind builds OK on SLES 11 SP1. Comparing ptrace header files between
> SLES 10 and SLES 11 SP1, I see that PTRACE_{GET|SET}REGS is most assuredly
> *not* defined in SLES 10. Is this a PowerPC issue only?
Maynard, are you 110% sure about that? IIUC, the lack of PTRACE_{GET|SET}REGS
functionality would make ptrace() pretty darn useless.
Also .. if you try Christian's suggestion ..
> Can you include linux/ptrace.h in vgdb.c? That should work
> on the old RHEL4 as well as on newer systems.
.. does that help?
FWIW (probably not much), I had no problems this morning building on a
970 box running F11 (I think).
J
|
|
From: <sv...@va...> - 2011-05-09 20:35:50
|
Author: sewardj
Date: 2011-05-09 21:35:41 +0100 (Mon, 09 May 2011)
New Revision: 2149
Log:
s390x: fix DISP20 macro. Remove duplicate defn and avoid problems of
right-shifting negative values. Fixes #272067.
(Florian Krohm, br...@ac...)
Modified:
trunk/priv/host_s390_defs.c
Modified: trunk/priv/host_s390_defs.c
===================================================================
--- trunk/priv/host_s390_defs.c 2011-05-08 22:05:10 UTC (rev 2148)
+++ trunk/priv/host_s390_defs.c 2011-05-09 20:35:41 UTC (rev 2149)
@@ -3400,7 +3400,7 @@
/* Split up a 20-bit displacement into its high and low piece
suitable for passing as function arguments */
-#define DISP20(d) ((d) & 0xFFF), (((d) >> 12) & 0xFF)
+#define DISP20(d) (((UInt)d) & 0xFFF), ((((UInt)d) >> 12) & 0xFF)
/*---------------------------------------------------------------*/
/*--- Helper functions ---*/
@@ -3932,10 +3932,6 @@
}
-/* Split up a 20-bit displacement into its high and low piece
- suitable for passing as function arguments */
-#define DISP20(d) ((d) & 0xFFF), (((d) >> 12) & 0xFF)
-
/*---------------------------------------------------------------*/
/*--- Constructors for the various s390_insn kinds ---*/
/*---------------------------------------------------------------*/
|
|
From: Surya K. <jsk...@gm...> - 2011-05-09 20:27:44
|
Hi, I was going through the paper "Valgrind: A framework for heavyweight dynamic binary instrumentation" (PLDI '07)and I have a few questions regarding Valgrind and the D&R approach: 1. Why is Valgrind linked to load at a specific address? Is this to allow the client executable to be loaded at the standrd address? Can you provide more information on the address layout? Where is the client's text, data, stack situated with respect to Valgrind's text and data, and where is the shadow memory & code cache situated? Also, since Valgrind loads the client executable, I assume it also loads any shared libraries that the client depends upon, and Valgrind also does symbol resolution? 2. I understand that DynamoRio is faster than Valgrind, in part due to the C&A approach adopted by it. Do you feel that if certain optimizations like traces, skipping shadow operations, inlining shadow load instead of calling C function, etc, would result in a performance comparable with DynamoRio? Your paper mentions the advantages of D&R over C&A approach. In addition to these, do you believe that tools that use the C&A approach would not be able to find as many errors in the client as Valgrind can? 3. In the 2006 Gelato ICE talk on porting Valgrind to Itanium, it is mentioned that porting would require ALAT simulation. Can you elaborate more on why the ALAT needs to be simulated? Can't the speculative load instructions operate directly on the h/w ALAT structure? What are the advantages of simulation? 4. It has been mentioned in the PLDI paper that the reason for thread serialization is to avoid a situation where a thread switch occurs between the original load/store and the shadow load/store instruction, since this can result in concurrent memory accesses to the same memory location to complete in a different order to their corresponding shadow memory accesses. But doesn't such a situation arise only if there is a data race in the original code, in which case why should we be concerned with a thread switch occurring between a client load/store and shadow load/store? Thanks, Surya |
|
From: Florian K. <br...@ac...> - 2011-05-09 20:15:21
|
On 05/08/2011 04:09 PM, Christian Borntraeger wrote:
> On 08/05/11 09:47, Philippe Waroquiers wrote:
>> Christian/Florian, With reference to the below build failure I have seen:
>>> vgdb.c: In function 'getregs':
>>> vgdb.c:637:30: error: 'PT_ENDREGS' undeclared (first use in this function)
>>> vgdb.c: In function 'setregs':
>>> vgdb.c:669:30: error: 'PT_ENDREGS' undeclared (first use in this function)
>>
>> vgdb.c does not compile on
>> Fedora 13/14/15 mix with gcc 3.5.3 on z196 (s390x)
>> SUSE Linux Enterprise Server 11 SP1 gcc 4.3.4 on z196 (s390x)
>> On Linux 2.6.9-42.EL s390x RH EL AS release 4 (Nahant Update 4),
>> it is defined with the following chain of include:
>> vgdb.c:#include <sys/user.h>
>> sys/user.h:#include <asm/user.h>
>> asm/user.h:# include <asm-s390x/user.h>
>> asm-s390x/user.h:#include <linux/ptrace.h>
>> linux/ptrace.h:#include <asm/ptrace.h>
>> asm/ptrace.h:# include <asm-s390x/ptrace.h>
>> asm-s390x/ptrace.h:#define PT_ENDREGS 0x1B0-1
>
>
>
> Can you include linux/ptrace.h in vgdb.c? That should work
> on the old RHEL4 as well as on newer systems.
>
On my system Red Hat Enterprise Linux AS release 4 (Nahant Update 4)
(vmlinuz-2.6.9-42.EL) with glibc-2.3.4-2.25 the symbol PT_ENDREGS
is found here:
florian@l005036:/usr/include> find . -exec grep -H PT_ENDREGS {} \;
./asm-s390/ptrace.h:#define PT_ENDREGS 0x140-1
./asm-s390x/ptrace.h:#define PT_ENDREGS 0x1B0-1
So your suggestion would probably not work.
Florian
|
|
From: Christian B. <bor...@de...> - 2011-05-09 20:12:43
|
Nightly build on fedora390 ( Fedora 13/14/15 mix with gcc 3.5.3 on z196 (s390x) ) Started at 2011-05-09 22:10:02 CEST Ended at 2011-05-09 22:11:56 CEST Results differ from 24 hours ago Checking out valgrind source tree ... done Configuring valgrind ... done Building valgrind ... failed Last 20 lines of verbose log follow echo mv -f .deps/libreplacemalloc_toolpreload_s390x_linux_a-vg_replace_malloc.Tpo .deps/libreplacemalloc_toolpreload_s390x_linux_a-vg_replace_malloc.Po gcc -DHAVE_CONFIG_H -I. -I.. -I.. -I../include -I../VEX/pub -DVGA_s390x=1 -DVGO_linux=1 -DVGP_s390x_linux=1 -I../coregrind -DVG_LIBDIR="\"/home/cborntra/valgrind-nightly/valgrind-new/Inst/lib/valgrind"\" -DVG_PLATFORM="\"s390x-linux\"" -m64 -O2 -g -Wall -Wmissing-prototypes -Wshadow -Wpointer-arith -Wstrict-prototypes -Wmissing-declarations -Wno-format-zero-length -fno-strict-aliasing -Wno-long-long -Wno-pointer-sign -fno-stack-protector -MT vgdb-vgdb.o -MD -MP -MF .deps/vgdb-vgdb.Tpo -c -o vgdb-vgdb.o `test -f 'vgdb.c' || echo './'`vgdb.c vgdb.c: In function 'getregs': vgdb.c:637:30: error: 'PT_ENDREGS' undeclared (first use in this function) vgdb.c:637:30: note: each undeclared identifier is reported only once for each function it appears in vgdb.c: In function 'setregs': vgdb.c:669:30: error: 'PT_ENDREGS' undeclared (first use in this function) vgdb.c: At top level: vgdb.c:298:5: warning: 'ptrace_write_memory' defined but not used make[3]: *** [vgdb-vgdb.o] Error 1 make[3]: *** Waiting for unfinished jobs.... mv -f .deps/valgrind-m_debuglog.Tpo .deps/valgrind-m_debuglog.Po mv -f .deps/libcoregrind_s390x_linux_a-syswrap-generic.Tpo .deps/libcoregrind_s390x_linux_a-syswrap-generic.Po mv -f .deps/libcoregrind_s390x_linux_a-syswrap-linux.Tpo .deps/libcoregrind_s390x_linux_a-syswrap-linux.Po make[3]: Leaving directory `/home/cborntra/valgrind-nightly/valgrind-new/coregrind' make[2]: *** [all] Error 2 make[2]: Leaving directory `/home/cborntra/valgrind-nightly/valgrind-new/coregrind' make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory `/home/cborntra/valgrind-nightly/valgrind-new' make: *** [all] Error 2 ================================================= == Results from 24 hours ago == ================================================= Checking out valgrind source tree ... done Configuring valgrind ... done Building valgrind ... failed Last 20 lines of verbose log follow echo mv -f .deps/libreplacemalloc_toolpreload_s390x_linux_a-vg_replace_malloc.Tpo .deps/libreplacemalloc_toolpreload_s390x_linux_a-vg_replace_malloc.Po gcc -DHAVE_CONFIG_H -I. -I.. -I.. -I../include -I../VEX/pub -DVGA_s390x=1 -DVGO_linux=1 -DVGP_s390x_linux=1 -I../coregrind -DVG_LIBDIR="\"/home/cborntra/valgrind-nightly/valgrind-old/Inst/lib/valgrind"\" -DVG_PLATFORM="\"s390x-linux\"" -m64 -O2 -g -Wall -Wmissing-prototypes -Wshadow -Wpointer-arith -Wstrict-prototypes -Wmissing-declarations -Wno-format-zero-length -fno-strict-aliasing -Wno-long-long -Wno-pointer-sign -fno-stack-protector -MT vgdb-vgdb.o -MD -MP -MF .deps/vgdb-vgdb.Tpo -c -o vgdb-vgdb.o `test -f 'vgdb.c' || echo './'`vgdb.c vgdb.c: In function 'getregs': vgdb.c:637:30: error: 'PT_ENDREGS' undeclared (first use in this function) vgdb.c:637:30: note: each undeclared identifier is reported only once for each function it appears in vgdb.c: In function 'setregs': vgdb.c:669:30: error: 'PT_ENDREGS' undeclared (first use in this function) vgdb.c: At top level: vgdb.c:298:5: warning: 'ptrace_write_memory' defined but not used make[3]: *** [vgdb-vgdb.o] Error 1 make[3]: *** Waiting for unfinished jobs.... mv -f .deps/valgrind-m_debuglog.Tpo .deps/valgrind-m_debuglog.Po mv -f .deps/libcoregrind_s390x_linux_a-syswrap-generic.Tpo .deps/libcoregrind_s390x_linux_a-syswrap-generic.Po mv -f .deps/libcoregrind_s390x_linux_a-syswrap-linux.Tpo .deps/libcoregrind_s390x_linux_a-syswrap-linux.Po make[3]: Leaving directory `/home/cborntra/valgrind-nightly/valgrind-old/coregrind' make[2]: *** [all] Error 2 make[2]: Leaving directory `/home/cborntra/valgrind-nightly/valgrind-old/coregrind' make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory `/home/cborntra/valgrind-nightly/valgrind-old' make: *** [all] Error 2 ================================================= == Difference between 24 hours ago and now == ================================================= *** old.short Mon May 9 22:10:58 2011 --- new.short Mon May 9 22:11:56 2011 *************** *** 7,9 **** mv -f .deps/libreplacemalloc_toolpreload_s390x_linux_a-vg_replace_malloc.Tpo .deps/libreplacemalloc_toolpreload_s390x_linux_a-vg_replace_malloc.Po ! gcc -DHAVE_CONFIG_H -I. -I.. -I.. -I../include -I../VEX/pub -DVGA_s390x=1 -DVGO_linux=1 -DVGP_s390x_linux=1 -I../coregrind -DVG_LIBDIR="\"/home/cborntra/valgrind-nightly/valgrind-old/Inst/lib/valgrind"\" -DVG_PLATFORM="\"s390x-linux\"" -m64 -O2 -g -Wall -Wmissing-prototypes -Wshadow -Wpointer-arith -Wstrict-prototypes -Wmissing-declarations -Wno-format-zero-length -fno-strict-aliasing -Wno-long-long -Wno-pointer-sign -fno-stack-protector -MT vgdb-vgdb.o -MD -MP -MF .deps/vgdb-vgdb.Tpo -c -o vgdb-vgdb.o `test -f 'vgdb.c' || echo './'`vgdb.c vgdb.c: In function 'getregs': --- 7,9 ---- mv -f .deps/libreplacemalloc_toolpreload_s390x_linux_a-vg_replace_malloc.Tpo .deps/libreplacemalloc_toolpreload_s390x_linux_a-vg_replace_malloc.Po ! gcc -DHAVE_CONFIG_H -I. -I.. -I.. -I../include -I../VEX/pub -DVGA_s390x=1 -DVGO_linux=1 -DVGP_s390x_linux=1 -I../coregrind -DVG_LIBDIR="\"/home/cborntra/valgrind-nightly/valgrind-new/Inst/lib/valgrind"\" -DVG_PLATFORM="\"s390x-linux\"" -m64 -O2 -g -Wall -Wmissing-prototypes -Wshadow -Wpointer-arith -Wstrict-prototypes -Wmissing-declarations -Wno-format-zero-length -fno-strict-aliasing -Wno-long-long -Wno-pointer-sign -fno-stack-protector -MT vgdb-vgdb.o -MD -MP -MF .deps/vgdb-vgdb.Tpo -c -o vgdb-vgdb.o `test -f 'vgdb.c' || echo './'`vgdb.c vgdb.c: In function 'getregs': *************** *** 20,26 **** mv -f .deps/libcoregrind_s390x_linux_a-syswrap-linux.Tpo .deps/libcoregrind_s390x_linux_a-syswrap-linux.Po ! make[3]: Leaving directory `/home/cborntra/valgrind-nightly/valgrind-old/coregrind' make[2]: *** [all] Error 2 ! make[2]: Leaving directory `/home/cborntra/valgrind-nightly/valgrind-old/coregrind' make[1]: *** [all-recursive] Error 1 ! make[1]: Leaving directory `/home/cborntra/valgrind-nightly/valgrind-old' make: *** [all] Error 2 --- 20,26 ---- mv -f .deps/libcoregrind_s390x_linux_a-syswrap-linux.Tpo .deps/libcoregrind_s390x_linux_a-syswrap-linux.Po ! make[3]: Leaving directory `/home/cborntra/valgrind-nightly/valgrind-new/coregrind' make[2]: *** [all] Error 2 ! make[2]: Leaving directory `/home/cborntra/valgrind-nightly/valgrind-new/coregrind' make[1]: *** [all-recursive] Error 1 ! make[1]: Leaving directory `/home/cborntra/valgrind-nightly/valgrind-new' make: *** [all] Error 2 |
|
From: Christian B. <bor...@de...> - 2011-05-09 20:11:55
|
Nightly build on sless390 ( SUSE Linux Enterprise Server 11 SP1 gcc 4.3.4 on z196 (s390x) ) Started at 2011-05-09 22:10:01 CEST Ended at 2011-05-09 22:11:40 CEST Results differ from 24 hours ago Checking out valgrind source tree ... done Configuring valgrind ... done Building valgrind ... failed Last 20 lines of verbose log follow echo vgdb.c:637: error: for each function it appears in.) vgdb.c: In function 'setregs': vgdb.c:669: error: 'PT_ENDREGS' undeclared (first use in this function) mv -f .deps/no_op_client_for_valgrind-no_op_client_for_valgrind.Tpo .deps/no_op_client_for_valgrind-no_op_client_for_valgrind.Po gcc -DHAVE_CONFIG_H -I. -I.. -I.. -I../include -I../VEX/pub -DVGA_s390x=1 -DVGO_linux=1 -DVGP_s390x_linux=1 -I../coregrind -DVG_LIBDIR="\"/home/cborntra/valgrind-nightly/valgrind-new/Inst/lib/valgrind"\" -DVG_PLATFORM="\"s390x-linux\"" -m64 -O2 -g -Wall -Wmissing-prototypes -Wshadow -Wpointer-arith -Wstrict-prototypes -Wmissing-declarations -Wno-format-zero-length -fno-strict-aliasing -fpic -O -g -fno-omit-frame-pointer -fno-strict-aliasing -Wno-long-long -Wno-pointer-sign -fno-stack-protector -MT vgpreload_core_s390x_linux_so-vg_preloaded.o -MD -MP -MF .deps/vgpreload_core_s390x_linux_so-vg_preloaded.Tpo -c -o vgpreload_core_s390x_linux_so-vg_preloaded.o `test -f 'vg_preloaded.c' || echo './'`vg_preloaded.c make[3]: *** [vgdb-vgdb.o] Error 1 make[3]: *** Waiting for unfinished jobs.... mv -f .deps/valgrind-launcher-linux.Tpo .deps/valgrind-launcher-linux.Po mv -f .deps/vgpreload_core_s390x_linux_so-vg_preloaded.Tpo .deps/vgpreload_core_s390x_linux_so-vg_preloaded.Po mv -f .deps/libreplacemalloc_toolpreload_s390x_linux_a-vg_replace_malloc.Tpo .deps/libreplacemalloc_toolpreload_s390x_linux_a-vg_replace_malloc.Po mv -f .deps/valgrind-m_debuglog.Tpo .deps/valgrind-m_debuglog.Po mv -f .deps/libcoregrind_s390x_linux_a-syswrap-s390x-linux.Tpo .deps/libcoregrind_s390x_linux_a-syswrap-s390x-linux.Po mv -f .deps/libcoregrind_s390x_linux_a-syswrap-generic.Tpo .deps/libcoregrind_s390x_linux_a-syswrap-generic.Po mv -f .deps/libcoregrind_s390x_linux_a-syswrap-linux.Tpo .deps/libcoregrind_s390x_linux_a-syswrap-linux.Po make[3]: Leaving directory `/home0/cborntra/valgrind-nightly/valgrind-new/coregrind' make[2]: *** [all] Error 2 make[2]: Leaving directory `/home0/cborntra/valgrind-nightly/valgrind-new/coregrind' make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory `/home0/cborntra/valgrind-nightly/valgrind-new' make: *** [all] Error 2 ================================================= == Results from 24 hours ago == ================================================= Checking out valgrind source tree ... done Configuring valgrind ... done Building valgrind ... failed Last 20 lines of verbose log follow echo vgdb.c:637: error: 'PT_ENDREGS' undeclared (first use in this function) vgdb.c:637: error: (Each undeclared identifier is reported only once vgdb.c:637: error: for each function it appears in.) vgdb.c: In function 'setregs': vgdb.c:669: error: 'PT_ENDREGS' undeclared (first use in this function) make[3]: *** [vgdb-vgdb.o] Error 1 make[3]: *** Waiting for unfinished jobs.... mv -f .deps/vgpreload_core_s390x_linux_so-vg_preloaded.Tpo .deps/vgpreload_core_s390x_linux_so-vg_preloaded.Po mv -f .deps/valgrind-launcher-linux.Tpo .deps/valgrind-launcher-linux.Po mv -f .deps/libreplacemalloc_toolpreload_s390x_linux_a-vg_replace_malloc.Tpo .deps/libreplacemalloc_toolpreload_s390x_linux_a-vg_replace_malloc.Po mv -f .deps/valgrind-m_debuglog.Tpo .deps/valgrind-m_debuglog.Po mv -f .deps/libcoregrind_s390x_linux_a-syswrap-s390x-linux.Tpo .deps/libcoregrind_s390x_linux_a-syswrap-s390x-linux.Po mv -f .deps/libcoregrind_s390x_linux_a-syswrap-generic.Tpo .deps/libcoregrind_s390x_linux_a-syswrap-generic.Po mv -f .deps/libcoregrind_s390x_linux_a-syswrap-linux.Tpo .deps/libcoregrind_s390x_linux_a-syswrap-linux.Po make[3]: Leaving directory `/home0/cborntra/valgrind-nightly/valgrind-old/coregrind' make[2]: *** [all] Error 2 make[2]: Leaving directory `/home0/cborntra/valgrind-nightly/valgrind-old/coregrind' make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory `/home0/cborntra/valgrind-nightly/valgrind-old' make: *** [all] Error 2 ================================================= == Difference between 24 hours ago and now == ================================================= *** old.short Mon May 9 22:10:54 2011 --- new.short Mon May 9 22:11:40 2011 *************** *** 6,9 **** Last 20 lines of verbose log follow echo - vgdb.c:637: error: 'PT_ENDREGS' undeclared (first use in this function) - vgdb.c:637: error: (Each undeclared identifier is reported only once vgdb.c:637: error: for each function it appears in.) --- 6,7 ---- *************** *** 11,16 **** vgdb.c:669: error: 'PT_ENDREGS' undeclared (first use in this function) make[3]: *** [vgdb-vgdb.o] Error 1 make[3]: *** Waiting for unfinished jobs.... - mv -f .deps/vgpreload_core_s390x_linux_so-vg_preloaded.Tpo .deps/vgpreload_core_s390x_linux_so-vg_preloaded.Po mv -f .deps/valgrind-launcher-linux.Tpo .deps/valgrind-launcher-linux.Po mv -f .deps/libreplacemalloc_toolpreload_s390x_linux_a-vg_replace_malloc.Tpo .deps/libreplacemalloc_toolpreload_s390x_linux_a-vg_replace_malloc.Po --- 9,16 ---- vgdb.c:669: error: 'PT_ENDREGS' undeclared (first use in this function) + mv -f .deps/no_op_client_for_valgrind-no_op_client_for_valgrind.Tpo .deps/no_op_client_for_valgrind-no_op_client_for_valgrind.Po + gcc -DHAVE_CONFIG_H -I. -I.. -I.. -I../include -I../VEX/pub -DVGA_s390x=1 -DVGO_linux=1 -DVGP_s390x_linux=1 -I../coregrind -DVG_LIBDIR="\"/home/cborntra/valgrind-nightly/valgrind-new/Inst/lib/valgrind"\" -DVG_PLATFORM="\"s390x-linux\"" -m64 -O2 -g -Wall -Wmissing-prototypes -Wshadow -Wpointer-arith -Wstrict-prototypes -Wmissing-declarations -Wno-format-zero-length -fno-strict-aliasing -fpic -O -g -fno-omit-frame-pointer -fno-strict-aliasing -Wno-long-long -Wno-pointer-sign -fno-stack-protector -MT vgpreload_core_s390x_linux_so-vg_preloaded.o -MD -MP -MF .deps/vgpreload_core_s390x_linux_so-vg_preloaded.Tpo -c -o vgpreload_core_s390x_linux_so-vg_preloaded.o `test -f 'vg_preloaded.c' || echo './'`vg_preloaded.c make[3]: *** [vgdb-vgdb.o] Error 1 make[3]: *** Waiting for unfinished jobs.... mv -f .deps/valgrind-launcher-linux.Tpo .deps/valgrind-launcher-linux.Po + mv -f .deps/vgpreload_core_s390x_linux_so-vg_preloaded.Tpo .deps/vgpreload_core_s390x_linux_so-vg_preloaded.Po mv -f .deps/libreplacemalloc_toolpreload_s390x_linux_a-vg_replace_malloc.Tpo .deps/libreplacemalloc_toolpreload_s390x_linux_a-vg_replace_malloc.Po *************** *** 20,26 **** mv -f .deps/libcoregrind_s390x_linux_a-syswrap-linux.Tpo .deps/libcoregrind_s390x_linux_a-syswrap-linux.Po ! make[3]: Leaving directory `/home0/cborntra/valgrind-nightly/valgrind-old/coregrind' make[2]: *** [all] Error 2 ! make[2]: Leaving directory `/home0/cborntra/valgrind-nightly/valgrind-old/coregrind' make[1]: *** [all-recursive] Error 1 ! make[1]: Leaving directory `/home0/cborntra/valgrind-nightly/valgrind-old' make: *** [all] Error 2 --- 20,26 ---- mv -f .deps/libcoregrind_s390x_linux_a-syswrap-linux.Tpo .deps/libcoregrind_s390x_linux_a-syswrap-linux.Po ! make[3]: Leaving directory `/home0/cborntra/valgrind-nightly/valgrind-new/coregrind' make[2]: *** [all] Error 2 ! make[2]: Leaving directory `/home0/cborntra/valgrind-nightly/valgrind-new/coregrind' make[1]: *** [all-recursive] Error 1 ! make[1]: Leaving directory `/home0/cborntra/valgrind-nightly/valgrind-new' make: *** [all] Error 2 |
|
From: Rich C. <rc...@wi...> - 2011-05-09 20:08:23
|
It looks like vgdb is trying to be compiled with non-position-independent code, viz -fno-pic, and the linker is pulling in a PIC object, making the linker flag the whole object PIC. Then the linker is objecting to the absolute address of _vmalloc. I'll see what I can find out. Rich On Mon, 9 May 2011 20:52:58 +0200 "Philippe Waroquiers" <phi...@sk...> wrote: > I see vgdb fails to link as indicated below. > I have no idea what could be the cause of the below. vgdb is a normal executable > (so e.g. it can and uses libc). > > Does someone has an idea what is wrong in the below ? > > > > > gcc -DHAVE_CONFIG_H -I. -I.. -I.. -I../include -I../VEX/pub -DVGA_x86=1 -DVGO_darwin=1 -DVGP_x86_darwin=1 -I../coregrind -DVG_LIBDIR="\"/Users/minime/src/vg/nightly/valgrind-new/Inst/lib/valgrind"\" > > -DVG_PLATFORM="\"x86-darwin\"" -arch > > i386 -O2 -g -Wall -Wmissing-prototypes -Wshadow -Wpointer-arith -Wstrict-prototypes -Wmissing-declarations -Wno-format-zero-length > > -fno-strict-aliasing -mmacosx-version-min=10.5 -fno-stack-protector -fno-pic -fno-PIC -Wno-long-long -Wno-pointer-sign -fno-stack-protector > > -MT vgdb-vgdb.o -MD -MP -MF .deps/vgdb-vgdb.Tpo -c -o vgdb-vgdb.o `test -f 'vgdb.c' || echo './'`vgdb.c > > vgdb.c: In function 'map_vgdbshared': > > vgdb.c:199: warning: format '%ld' expects type 'long int', but argument 5 has type 'off_t' > > mv -f .deps/vgdb-vgdb.Tpo .deps/vgdb-vgdb.Po > > gcc -arch > > i386 -O2 -g -Wall -Wmissing-prototypes -Wshadow -Wpointer-arith -Wstrict-prototypes -Wmissing-declarations -Wno-format-zero-length > > -fno-strict-aliasing -mmacosx-version-min=10.5 -fno-stack-protector -fno-pic -fno-PIC -Wno-long-long -Wno-pointer-sign -fno-stack-protector > > -arch > > i386 -O2 -g -Wall -Wmissing-prototypes -Wshadow -Wpointer-arith -Wstrict-prototypes -Wmissing-declarations -Wno-format-zero-length > > -fno-strict-aliasing -mmacosx-version-min=10.5 -fno-stack-protector -fno-pic -fno-PIC -lpthread -o vgdb vgdb-vgdb.o > > ld: absolute addressing (perhaps -mdynamic-no-pic) used in _vmalloc from vgdb-vgdb.o not allowed in slidable image. Use > > '-read_only_relocs suppress' to enable text relocs > > collect2: ld returned 1 exit status > > make[3]: *** [vgdb] Error 1 > > make[2]: *** [all] Error 2 > > make[1]: *** [all-recursive] Error 1 > > make: *** [all] Error 2 > -- Rich Coe rc...@wi... |
|
From: John R. <jr...@bi...> - 2011-05-09 19:40:38
|
>> gcc -arch >> i386 -O2 -g -Wall -Wmissing-prototypes -Wshadow -Wpointer-arith -Wstrict-prototypes -Wmissing-declarations -Wno-format-zero-length >> -fno-strict-aliasing -mmacosx-version-min=10.5 -fno-stack-protector -fno-pic -fno-PIC -Wno-long-long -Wno-pointer-sign -fno-stack-protector >> -arch >> i386 -O2 -g -Wall -Wmissing-prototypes -Wshadow -Wpointer-arith -Wstrict-prototypes -Wmissing-declarations -Wno-format-zero-length >> -fno-strict-aliasing -mmacosx-version-min=10.5 -fno-stack-protector -fno-pic -fno-PIC -lpthread -o vgdb vgdb-vgdb.o >> ld: absolute addressing (perhaps -mdynamic-no-pic) used in _vmalloc from vgdb-vgdb.o not allowed in slidable image. Use >> '-read_only_relocs suppress' to enable text relocs >> collect2: ld returned 1 exit status The conflict between "gcc ... -fno-pic -fno-PIC" and the message "ld: absolute addressing... not allowed..." suggests a mixup in flags to ld. What were the actual flags to ld? Run with "gcc -v", then re-run the last part with "collect2 -v" to see. (It is a bug that "gcc -v" does not forward the -v to collect2.) Or, run the whole thing under "strace -f -e execve gcc ...". -- |
|
From: Philippe W. <phi...@sk...> - 2011-05-09 19:02:03
|
From: "Maynard Johnson" <may...@us...>
> I also get compile errors with ppc64, but on older distros like SLES 10 and RHEL 5. The compilation error is different, though:
...
> Valgrind builds OK on SLES 11 SP1. Comparing ptrace header files between SLES 10 and SLES 11 SP1, I see that PTRACE_{GET|SET}REGS
> is most assuredly *not* defined in SLES 10. Is this a PowerPC issue only?
vgdb.c (and the rest of the gdbserver patch) has been compiled on various combinations of arch and platforms.
(a.o. on RHEL5 x86_64).
>From what I can see, depending on the OS and the arch, we can have:
PTRACE_GETREGS not defined
PTRACE_GETREGS defined, but returning an error at runtime if used.
PTRACE_GETREGS defined and working.
I will update vgdb.c so that it handles the above 3 cases (doing checks at compile time
and/or at runtime), which should solve the vgdb.c compilation problem for all linux platforms.
(there is no compilation problem on Darwin, because the ptrace support has not been
done for Darwin. There is however a link problem on Darwin/x86 that I do not understand).
Philippe
|
|
From: Philippe W. <phi...@sk...> - 2011-05-09 18:52:47
|
I see vgdb fails to link as indicated below. I have no idea what could be the cause of the below. vgdb is a normal executable (so e.g. it can and uses libc). Does someone has an idea what is wrong in the below ? > gcc -DHAVE_CONFIG_H -I. -I.. -I.. -I../include -I../VEX/pub -DVGA_x86=1 -DVGO_darwin=1 -DVGP_x86_darwin=1 -I../coregrind -DVG_LIBDIR="\"/Users/minime/src/vg/nightly/valgrind-new/Inst/lib/valgrind"\" > -DVG_PLATFORM="\"x86-darwin\"" -arch > i386 -O2 -g -Wall -Wmissing-prototypes -Wshadow -Wpointer-arith -Wstrict-prototypes -Wmissing-declarations -Wno-format-zero-length > -fno-strict-aliasing -mmacosx-version-min=10.5 -fno-stack-protector -fno-pic -fno-PIC -Wno-long-long -Wno-pointer-sign -fno-stack-protector > -MT vgdb-vgdb.o -MD -MP -MF .deps/vgdb-vgdb.Tpo -c -o vgdb-vgdb.o `test -f 'vgdb.c' || echo './'`vgdb.c > vgdb.c: In function 'map_vgdbshared': > vgdb.c:199: warning: format '%ld' expects type 'long int', but argument 5 has type 'off_t' > mv -f .deps/vgdb-vgdb.Tpo .deps/vgdb-vgdb.Po > gcc -arch > i386 -O2 -g -Wall -Wmissing-prototypes -Wshadow -Wpointer-arith -Wstrict-prototypes -Wmissing-declarations -Wno-format-zero-length > -fno-strict-aliasing -mmacosx-version-min=10.5 -fno-stack-protector -fno-pic -fno-PIC -Wno-long-long -Wno-pointer-sign -fno-stack-protector > -arch > i386 -O2 -g -Wall -Wmissing-prototypes -Wshadow -Wpointer-arith -Wstrict-prototypes -Wmissing-declarations -Wno-format-zero-length > -fno-strict-aliasing -mmacosx-version-min=10.5 -fno-stack-protector -fno-pic -fno-PIC -lpthread -o vgdb vgdb-vgdb.o > ld: absolute addressing (perhaps -mdynamic-no-pic) used in _vmalloc from vgdb-vgdb.o not allowed in slidable image. Use > '-read_only_relocs suppress' to enable text relocs > collect2: ld returned 1 exit status > make[3]: *** [vgdb] Error 1 > make[2]: *** [all] Error 2 > make[1]: *** [all-recursive] Error 1 > make: *** [all] Error 2 |
|
From: Maynard J. <may...@us...> - 2011-05-09 16:09:11
|
Christian Borntraeger wrote:
> On 08/05/11 09:47, Philippe Waroquiers wrote:
>> Christian/Florian, With reference to the below build failure I have seen:
>>> vgdb.c: In function 'getregs':
>>> vgdb.c:637:30: error: 'PT_ENDREGS' undeclared (first use in this function)
>>> vgdb.c: In function 'setregs':
>>> vgdb.c:669:30: error: 'PT_ENDREGS' undeclared (first use in this function)
>>
>> vgdb.c does not compile on
>> Fedora 13/14/15 mix with gcc 3.5.3 on z196 (s390x)
>> SUSE Linux Enterprise Server 11 SP1 gcc 4.3.4 on z196 (s390x)
I also get compile errors with ppc64, but on older distros like SLES 10 and RHEL 5. The compilation error is different, though:
---------
make[1]: Entering directory `/home/mpj/ISA2.06/NEW/upstream/valg_svn_05.09.2011_BUILD/coregrind'
gcc -DHAVE_CONFIG_H -I. -I.. -I.. -I../include -I../VEX/pub -DVGA_ppc64=1 -DVGO_linux=1 -DVGP_ppc64_linux=1 -I../coregrind -DVG_LIBDIR="\"/usr/local/lib/valgrind"\" -DVG_PLATFORM="\"ppc64-linux\"" -m64 -O2 -g -Wall -Wmissing-prototypes -Wshadow -Wpointer-arith -Wstrict-prototypes -Wmissing-declarations -Wno-format-zero-length -fno-strict-aliasing -Wno-long-long -Wno-pointer-sign -fno-stack-protector -MT vgdb-vgdb.o -MD -MP -MF .deps/vgdb-vgdb.Tpo -c -o vgdb-vgdb.o `test -f 'vgdb.c' || echo './'`vgdb.c
vgdb.c: In function ?getregs?:
vgdb.c:650:18: error: ?PTRACE_GETREGS? undeclared (first use in this function)
vgdb.c:650:18: note: each undeclared identifier is reported only once for each function it appears in
vgdb.c: In function ?setregs?:
vgdb.c:682:18: error: ?PTRACE_SETREGS? undeclared (first use in this function)
vgdb.c: At top level:
vgdb.c:299:5: warning: ?ptrace_write_memory? defined but not used
make[1]: *** [vgdb-vgdb.o] Error 1
---------
Valgrind builds OK on SLES 11 SP1. Comparing ptrace header files between SLES 10 and SLES 11 SP1, I see that PTRACE_{GET|SET}REGS is most assuredly *not* defined in SLES 10. Is this a PowerPC issue only?
-Maynard
>> On Linux 2.6.9-42.EL s390x RH EL AS release 4 (Nahant Update 4),
>> it is defined with the following chain of include:
>> vgdb.c:#include <sys/user.h>
>> sys/user.h:#include <asm/user.h>
>> asm/user.h:# include <asm-s390x/user.h>
>> asm-s390x/user.h:#include <linux/ptrace.h>
>> linux/ptrace.h:#include <asm/ptrace.h>
>> asm/ptrace.h:# include <asm-s390x/ptrace.h>
>> asm-s390x/ptrace.h:#define PT_ENDREGS 0x1B0-1
>
>
>
> Can you include linux/ptrace.h in vgdb.c? That should work
> on the old RHEL4 as well as on newer systems.
>
> Index: coregrind/vgdb.c
> ===================================================================
> --- coregrind/vgdb.c (revision 11727)
> +++ coregrind/vgdb.c (working copy)
> @@ -51,6 +51,7 @@
>
> # if defined(VGO_linux)
> #include <sys/prctl.h>
> +#include <linux/ptrace.h>
> # endif
>
> /* vgdb has two usages:
>
> ------------------------------------------------------------------------------
> WhatsUp Gold - Download Free Network Management Software
> The most intuitive, comprehensive, and cost-effective network
> management toolset available today. Delivers lowest initial
> acquisition cost and overall TCO of any competing solution.
> http://p.sf.net/sfu/whatsupgold-sd
> _______________________________________________
> Valgrind-developers mailing list
> Val...@li...
> https://lists.sourceforge.net/lists/listinfo/valgrind-developers
|
|
From: <sv...@va...> - 2011-05-09 10:47:03
|
Author: bart
Date: 2011-05-09 11:46:55 +0100 (Mon, 09 May 2011)
New Revision: 11734
Log:
memcheck: Fixed a bug in the address ranges reported in an error message. Closes #272615.
Modified:
trunk/memcheck/mc_leakcheck.c
Modified: trunk/memcheck/mc_leakcheck.c
===================================================================
--- trunk/memcheck/mc_leakcheck.c 2011-05-09 09:19:32 UTC (rev 11733)
+++ trunk/memcheck/mc_leakcheck.c 2011-05-09 10:46:55 UTC (rev 11734)
@@ -1005,7 +1005,7 @@
} else {
VG_(umsg)("Block 0x%lx..0x%lx overlaps with block 0x%lx..0x%lx",
- start1, end1, start1, end2);
+ start1, end1, start2, end2);
VG_(umsg)("This is usually caused by using VALGRIND_MALLOCLIKE_BLOCK");
VG_(umsg)("in an inappropriate way.");
tl_assert (0);
|
|
From: <sv...@va...> - 2011-05-09 09:19:41
|
Author: sewardj
Date: 2011-05-09 10:19:32 +0100 (Mon, 09 May 2011)
New Revision: 11733
Log:
read_dwarf2_lineblock: debug printing fix (no functional change)
Modified:
trunk/coregrind/m_debuginfo/readdwarf.c
Modified: trunk/coregrind/m_debuginfo/readdwarf.c
===================================================================
--- trunk/coregrind/m_debuginfo/readdwarf.c 2011-05-09 09:15:28 UTC (rev 11732)
+++ trunk/coregrind/m_debuginfo/readdwarf.c 2011-05-09 09:19:32 UTC (rev 11733)
@@ -860,7 +860,7 @@
data += bytes_read;
state_machine_regs.column = adv;
if (di->ddump_line)
- VG_(printf)(" DWARF2-line: set_column\n");
+ VG_(printf)(" Set column to %d\n", (Int)adv);
break;
case DW_LNS_negate_stmt:
|
|
From: <sv...@va...> - 2011-05-09 09:15:38
|
Author: sewardj
Date: 2011-05-09 10:15:28 +0100 (Mon, 09 May 2011)
New Revision: 11732
Log:
ppc{32,64}-linux: mark VG_MINIMAL_LONGJMP as noreturn, since it is,
and not doing so leads to compiler warnings for functions that tail
call this one, which themselves are marked "attribute noreturn".
Modified:
trunk/include/pub_tool_libcsetjmp.h
Modified: trunk/include/pub_tool_libcsetjmp.h
===================================================================
--- trunk/include/pub_tool_libcsetjmp.h 2011-05-08 10:10:46 UTC (rev 11731)
+++ trunk/include/pub_tool_libcsetjmp.h 2011-05-09 09:15:28 UTC (rev 11732)
@@ -69,12 +69,14 @@
#define VG_MINIMAL_JMP_BUF(_name) UInt _name [32+1+1]
Int VG_MINIMAL_SETJMP(VG_MINIMAL_JMP_BUF(_env));
+__attribute__((noreturn))
void VG_MINIMAL_LONGJMP(VG_MINIMAL_JMP_BUF(_env));
#elif defined(VGP_ppc64_linux)
#define VG_MINIMAL_JMP_BUF(_name) ULong _name [32+1+1]
Int VG_MINIMAL_SETJMP(VG_MINIMAL_JMP_BUF(_env));
+__attribute__((noreturn))
void VG_MINIMAL_LONGJMP(VG_MINIMAL_JMP_BUF(_env));
#else
|