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
(19) |
Oct
|
Nov
|
Dec
|
| S | M | T | W | T | F | S |
|---|---|---|---|---|---|---|
|
|
1
(18) |
2
(35) |
3
(34) |
4
(25) |
5
(16) |
6
(32) |
|
7
(7) |
8
(13) |
9
(20) |
10
(17) |
11
(10) |
12
(18) |
13
(9) |
|
14
(5) |
15
(26) |
16
(23) |
17
(5) |
18
(1) |
19
(4) |
20
(3) |
|
21
(10) |
22
(13) |
23
(13) |
24
(23) |
25
(30) |
26
(13) |
27
(6) |
|
28
(1) |
29
(16) |
30
(15) |
|
|
|
|
|
From: <sv...@va...> - 2009-06-12 23:40:15
|
Author: njn Date: 2009-06-13 00:40:04 +0100 (Sat, 13 Jun 2009) New Revision: 10313 Log: Tweak the README -- make its text match the website, get rid of some of the more detailed explanation (if they're reading the README, we probably don't need to convince them about Valgrind's wonderfulness). Modified: trunk/README trunk/README_DEVELOPERS Modified: trunk/README =================================================================== --- trunk/README 2009-06-12 11:57:39 UTC (rev 10312) +++ trunk/README 2009-06-12 23:40:04 UTC (rev 10313) @@ -9,53 +9,38 @@ For instructions on how to build/install, see the end of this file. -Valgrind works on most, reasonably recent Linux setups. If you have -problems, consult FAQ.txt to see if there are workarounds. +If you have problems, consult the FAQ to see if there are workarounds. + Executive Summary ~~~~~~~~~~~~~~~~~ -Valgrind is an award-winning suite of tools for debugging and profiling -Linux programs. With the tools that come with Valgrind, you can -automatically detect many memory management and threading bugs, avoiding -hours of frustrating bug-hunting, making your programs more stable. You can -also perform detailed profiling, to speed up and reduce memory use of your -programs. +Valgrind is an award-winning instrumentation framework for building +dynamic analysis tools. There are Valgrind tools that can automatically +detect many memory management and threading bugs, and profile your +programs in detail. You can also use Valgrind to build new tools. -The Valgrind distribution currently includes five production grade -tools: a memory error detector, a thread error detector, a cache -profiler, a call graph profiler and a heap profiler. Experimental -tools are also included. They are distinguished by the "exp-" prefix -on their names. +The Valgrind distribution currently includes six production-quality +tools: a memory error detector, two thread error detectors, a cache and +branch-prediction profiler, a call-graph generating cache profiler, and +a heap profiler. It also includes one experimental tool, which detects +out of bounds reads and writes of stack, global and heap arrays. -To give you an idea of what Valgrind tools do, when a program is run -under the supervision of Memcheck, the memory error detector tool, all -reads and writes of memory are checked, and calls to malloc/new/free/delete -are intercepted. As a result, Memcheck can detect if your program: +Valgrind is closely tied to details of the CPU, operating system and to +a lesser extent, compiler and basic C libraries. This makes it difficult +to make it portable. Nonetheless, it is available for the following +platforms: - - Accesses memory it shouldn't (areas not yet allocated, areas that have - been freed, areas past the end of heap blocks, inaccessible areas of - the stack). +- x86/Linux +- AMD64/Linux +- PPC32/Linux +- PPC64/Linux +- x86/MacOSX +- AMD64/MacOSX - - Uses uninitialised values in dangerous ways. +Note that AMD64 is just another name for x86-64, and Valgrind runs fine +on Intel processors. Also note that the core of MacOSX is called +"Darwin" and this name is used sometimes. - - Leaks memory. - - - Does bad frees of heap blocks (double frees, mismatched frees). - - - Passes overlapping source and destination memory blocks to memcpy() and - related functions. - -Problems like these can be difficult to find by other means, often -lying undetected for long periods, then causing occasional, -difficult-to-diagnose crashes. When one of these errors occurs, you can -attach GDB to your program, so you can poke around and see what's going -on. - -Valgrind is closely tied to details of the CPU, operating system and -to a less extent, compiler and basic C libraries. This makes it -difficult to make it portable. Nonetheless, it is available for -the following platforms: x86/Linux, AMD64/Linux and PPC32/Linux. - Valgrind is licensed under the GNU General Public License, version 2. Read the file COPYING in the source distribution for details. Modified: trunk/README_DEVELOPERS =================================================================== --- trunk/README_DEVELOPERS 2009-06-12 11:57:39 UTC (rev 10312) +++ trunk/README_DEVELOPERS 2009-06-12 23:40:04 UTC (rev 10313) @@ -101,6 +101,7 @@ Steps (1)--(3) can be put in a .gdbinit file, but any directory names must be fully expanded (ie. not an environment variable). + Self-hosting ~~~~~~~~~~~~ To run Valgrind under Valgrind: |
|
From: Nicholas N. <n.n...@gm...> - 2009-06-12 17:26:27
|
Nightly build on ocean32 ( Ubuntu 9.04, x86_64 (32-bit only) )
Started at 2009-06-13 03:00:01 EST
Ended at 2009-06-13 03:26:06 EST
Results unchanged from 24 hours ago
Checking out valgrind source tree ... done
Configuring valgrind ... done
Building valgrind ... done
Running regression tests ... failed
Regression test results follow
== 458 tests, 7 stderr failures, 2 stdout failures, 0 post failures ==
memcheck/tests/linux/stack_switch (stderr)
memcheck/tests/origin1-yes (stderr)
memcheck/tests/origin5-bz2 (stderr)
none/tests/linux/mremap2 (stdout)
none/tests/shell (stdout)
none/tests/shell (stderr)
none/tests/shell_valid1 (stderr)
none/tests/shell_valid2 (stderr)
none/tests/shell_valid3 (stderr)
=================================================
./valgrind-new/memcheck/tests/linux/stack_switch.stderr.diff
=================================================
--- stack_switch.stderr.exp 2009-06-13 03:15:12.000000000 +1000
+++ stack_switch.stderr.out 2009-06-13 03:21:13.000000000 +1000
@@ -0,0 +1,2 @@
+Syscall param clone(child_tidptr) contains uninitialised byte(s)
+ ...
=================================================
./valgrind-new/memcheck/tests/origin1-yes.stderr.diff
=================================================
--- origin1-yes.stderr.exp 2009-06-13 03:15:18.000000000 +1000
+++ origin1-yes.stderr.out 2009-06-13 03:21:31.000000000 +1000
@@ -47,7 +47,7 @@
Conditional jump or move depends on uninitialised value(s)
at 0x........: main (origin1-yes.c:101)
Uninitialised value was created
- at 0x........: brk (in /...libc...)
+ at 0x........: ??? (in /lib32/ld-2.9.so)
by 0x........: sbrk (in /...libc...)
by 0x........: main (origin1-yes.c:98)
=================================================
./valgrind-new/memcheck/tests/origin1-yes.stderr.diff-darwin
=================================================
--- origin1-yes.stderr.exp-darwin 2009-06-13 03:15:18.000000000 +1000
+++ origin1-yes.stderr.out 2009-06-13 03:21:31.000000000 +1000
@@ -44,7 +44,12 @@
Undef 7 of 8 (brk)
-(no complaint; sbrk initialises memory on Darwin)
+Conditional jump or move depends on uninitialised value(s)
+ at 0x........: main (origin1-yes.c:101)
+ Uninitialised value was created
+ at 0x........: ??? (in /lib32/ld-2.9.so)
+ by 0x........: sbrk (in /...libc...)
+ by 0x........: main (origin1-yes.c:98)
Undef 8 of 8 (MAKE_MEM_UNDEFINED)
=================================================
./valgrind-new/memcheck/tests/origin5-bz2.stderr.diff-glibc25-amd64
=================================================
--- origin5-bz2.stderr.exp-glibc25-amd64 2009-06-13 03:15:18.000000000 +1000
+++ origin5-bz2.stderr.out 2009-06-13 03:21:35.000000000 +1000
@@ -11,7 +11,7 @@
Uninitialised value was created by a client request
at 0x........: main (origin5-bz2.c:6479)
-Use of uninitialised value of size 8
+Use of uninitialised value of size 4
at 0x........: handle_compress (origin5-bz2.c:4686)
by 0x........: BZ2_bzCompress (origin5-bz2.c:4822)
by 0x........: BZ2_bzBuffToBuffCompress (origin5-bz2.c:5630)
@@ -19,7 +19,7 @@
Uninitialised value was created by a client request
at 0x........: main (origin5-bz2.c:6479)
-Use of uninitialised value of size 8
+Use of uninitialised value of size 4
at 0x........: handle_compress (origin5-bz2.c:4686)
by 0x........: BZ2_bzCompress (origin5-bz2.c:4822)
by 0x........: BZ2_bzBuffToBuffCompress (origin5-bz2.c:5630)
@@ -27,7 +27,7 @@
Uninitialised value was created by a client request
at 0x........: main (origin5-bz2.c:6479)
-Use of uninitialised value of size 8
+Use of uninitialised value of size 4
at 0x........: mainSort (origin5-bz2.c:2820)
by 0x........: BZ2_blockSort (origin5-bz2.c:3105)
by 0x........: BZ2_compressBlock (origin5-bz2.c:4034)
@@ -38,7 +38,7 @@
Uninitialised value was created by a client request
at 0x........: main (origin5-bz2.c:6479)
-Use of uninitialised value of size 8
+Use of uninitialised value of size 4
at 0x........: mainSort (origin5-bz2.c:2823)
by 0x........: BZ2_blockSort (origin5-bz2.c:3105)
by 0x........: BZ2_compressBlock (origin5-bz2.c:4034)
@@ -49,7 +49,7 @@
Uninitialised value was created by a client request
at 0x........: main (origin5-bz2.c:6479)
-Use of uninitialised value of size 8
+Use of uninitialised value of size 4
at 0x........: mainSort (origin5-bz2.c:2854)
by 0x........: BZ2_blockSort (origin5-bz2.c:3105)
by 0x........: BZ2_compressBlock (origin5-bz2.c:4034)
@@ -60,7 +60,7 @@
Uninitialised value was created by a client request
at 0x........: main (origin5-bz2.c:6479)
-Use of uninitialised value of size 8
+Use of uninitialised value of size 4
at 0x........: mainSort (origin5-bz2.c:2858)
by 0x........: BZ2_blockSort (origin5-bz2.c:3105)
by 0x........: BZ2_compressBlock (origin5-bz2.c:4034)
@@ -71,7 +71,7 @@
Uninitialised value was created by a client request
at 0x........: main (origin5-bz2.c:6479)
-Use of uninitialised value of size 8
+Use of uninitialised value of size 4
at 0x........: mainSort (origin5-bz2.c:2963)
by 0x........: BZ2_blockSort (origin5-bz2.c:3105)
by 0x........: BZ2_compressBlock (origin5-bz2.c:4034)
@@ -82,7 +82,7 @@
Uninitialised value was created by a client request
at 0x........: main (origin5-bz2.c:6479)
-Use of uninitialised value of size 8
+Use of uninitialised value of size 4
at 0x........: mainSort (origin5-bz2.c:2964)
by 0x........: BZ2_blockSort (origin5-bz2.c:3105)
by 0x........: BZ2_compressBlock (origin5-bz2.c:4034)
@@ -93,7 +93,7 @@
Uninitialised value was created by a client request
at 0x........: main (origin5-bz2.c:6479)
-Use of uninitialised value of size 8
+Use of uninitialised value of size 4
at 0x........: fallbackSort (origin5-bz2.c:2269)
by 0x........: BZ2_blockSort (origin5-bz2.c:3116)
by 0x........: BZ2_compressBlock (origin5-bz2.c:4034)
@@ -104,7 +104,7 @@
Uninitialised value was created by a client request
at 0x........: main (origin5-bz2.c:6479)
-Use of uninitialised value of size 8
+Use of uninitialised value of size 4
at 0x........: fallbackSort (origin5-bz2.c:2275)
by 0x........: BZ2_blockSort (origin5-bz2.c:3116)
by 0x........: BZ2_compressBlock (origin5-bz2.c:4034)
=================================================
./valgrind-new/memcheck/tests/origin5-bz2.stderr.diff-glibc25-x86
=================================================
--- origin5-bz2.stderr.exp-glibc25-x86 2009-06-13 03:15:18.000000000 +1000
+++ origin5-bz2.stderr.out 2009-06-13 03:21:35.000000000 +1000
@@ -28,7 +28,8 @@
at 0x........: main (origin5-bz2.c:6479)
Use of uninitialised value of size 4
- at 0x........: BZ2_blockSort (origin5-bz2.c:2820)
+ at 0x........: mainSort (origin5-bz2.c:2820)
+ by 0x........: BZ2_blockSort (origin5-bz2.c:3105)
by 0x........: BZ2_compressBlock (origin5-bz2.c:4034)
by 0x........: handle_compress (origin5-bz2.c:4753)
by 0x........: BZ2_bzCompress (origin5-bz2.c:4822)
@@ -38,7 +39,8 @@
at 0x........: main (origin5-bz2.c:6479)
Use of uninitialised value of size 4
- at 0x........: BZ2_blockSort (origin5-bz2.c:2823)
+ at 0x........: mainSort (origin5-bz2.c:2823)
+ by 0x........: BZ2_blockSort (origin5-bz2.c:3105)
by 0x........: BZ2_compressBlock (origin5-bz2.c:4034)
by 0x........: handle_compress (origin5-bz2.c:4753)
by 0x........: BZ2_bzCompress (origin5-bz2.c:4822)
@@ -48,7 +50,8 @@
at 0x........: main (origin5-bz2.c:6479)
Use of uninitialised value of size 4
- at 0x........: BZ2_blockSort (origin5-bz2.c:2855)
+ at 0x........: mainSort (origin5-bz2.c:2854)
+ by 0x........: BZ2_blockSort (origin5-bz2.c:3105)
by 0x........: BZ2_compressBlock (origin5-bz2.c:4034)
by 0x........: handle_compress (origin5-bz2.c:4753)
by 0x........: BZ2_bzCompress (origin5-bz2.c:4822)
@@ -58,7 +61,8 @@
at 0x........: main (origin5-bz2.c:6479)
Use of uninitialised value of size 4
- at 0x........: BZ2_blockSort (origin5-bz2.c:2859)
+ at 0x........: mainSort (origin5-bz2.c:2858)
+ by 0x........: BZ2_blockSort (origin5-bz2.c:3105)
by 0x........: BZ2_compressBlock (origin5-bz2.c:4034)
by 0x........: handle_compress (origin5-bz2.c:4753)
by 0x........: BZ2_bzCompress (origin5-bz2.c:4822)
@@ -68,7 +72,8 @@
at 0x........: main (origin5-bz2.c:6479)
Use of uninitialised value of size 4
- at 0x........: BZ2_blockSort (origin5-bz2.c:2963)
+ at 0x........: mainSort (origin5-bz2.c:2963)
+ by 0x........: BZ2_blockSort (origin5-bz2.c:3105)
by 0x........: BZ2_compressBlock (origin5-bz2.c:4034)
by 0x........: handle_compress (origin5-bz2.c:4753)
by 0x........: BZ2_bzCompress (origin5-bz2.c:4822)
@@ -78,7 +83,8 @@
at 0x........: main (origin5-bz2.c:6479)
Use of uninitialised value of size 4
- at 0x........: BZ2_blockSort (origin5-bz2.c:2964)
+ at 0x........: mainSort (origin5-bz2.c:2964)
+ by 0x........: BZ2_blockSort (origin5-bz2.c:3105)
by 0x........: BZ2_compressBlock (origin5-bz2.c:4034)
by 0x........: handle_compress (origin5-bz2.c:4753)
by 0x........: BZ2_bzCompress (origin5-bz2.c:4822)
=================================================
./valgrind-new/memcheck/tests/origin5-bz2.stderr.diff-glibc27-ppc64
=================================================
--- origin5-bz2.stderr.exp-glibc27-ppc64 2009-06-13 03:15:18.000000000 +1000
+++ origin5-bz2.stderr.out 2009-06-13 03:21:35.000000000 +1000
@@ -1,7 +1,7 @@
Conditional jump or move depends on uninitialised value(s)
at 0x........: main (origin5-bz2.c:6481)
Uninitialised value was created by a client request
- at 0x........: main (origin5-bz2.c:6481)
+ at 0x........: main (origin5-bz2.c:6479)
Conditional jump or move depends on uninitialised value(s)
at 0x........: handle_compress (origin5-bz2.c:4686)
@@ -9,85 +9,91 @@
by 0x........: BZ2_bzBuffToBuffCompress (origin5-bz2.c:5630)
by 0x........: main (origin5-bz2.c:6484)
Uninitialised value was created by a client request
- at 0x........: main (origin5-bz2.c:6481)
+ at 0x........: main (origin5-bz2.c:6479)
-Use of uninitialised value of size 8
+Use of uninitialised value of size 4
at 0x........: handle_compress (origin5-bz2.c:4686)
by 0x........: BZ2_bzCompress (origin5-bz2.c:4822)
by 0x........: BZ2_bzBuffToBuffCompress (origin5-bz2.c:5630)
by 0x........: main (origin5-bz2.c:6484)
Uninitialised value was created by a client request
- at 0x........: main (origin5-bz2.c:6481)
+ at 0x........: main (origin5-bz2.c:6479)
-Use of uninitialised value of size 8
+Use of uninitialised value of size 4
at 0x........: handle_compress (origin5-bz2.c:4686)
by 0x........: BZ2_bzCompress (origin5-bz2.c:4822)
by 0x........: BZ2_bzBuffToBuffCompress (origin5-bz2.c:5630)
by 0x........: main (origin5-bz2.c:6484)
Uninitialised value was created by a client request
- at 0x........: main (origin5-bz2.c:6481)
+ at 0x........: main (origin5-bz2.c:6479)
-Use of uninitialised value of size 8
- at 0x........: BZ2_blockSort (origin5-bz2.c:2820)
+Use of uninitialised value of size 4
+ at 0x........: mainSort (origin5-bz2.c:2820)
+ by 0x........: BZ2_blockSort (origin5-bz2.c:3105)
by 0x........: BZ2_compressBlock (origin5-bz2.c:4034)
by 0x........: handle_compress (origin5-bz2.c:4753)
by 0x........: BZ2_bzCompress (origin5-bz2.c:4822)
by 0x........: BZ2_bzBuffToBuffCompress (origin5-bz2.c:5630)
by 0x........: main (origin5-bz2.c:6484)
Uninitialised value was created by a client request
- at 0x........: main (origin5-bz2.c:6481)
+ at 0x........: main (origin5-bz2.c:6479)
-Use of uninitialised value of size 8
- at 0x........: BZ2_blockSort (origin5-bz2.c:2823)
+Use of uninitialised value of size 4
+ at 0x........: mainSort (origin5-bz2.c:2823)
+ by 0x........: BZ2_blockSort (origin5-bz2.c:3105)
by 0x........: BZ2_compressBlock (origin5-bz2.c:4034)
by 0x........: handle_compress (origin5-bz2.c:4753)
by 0x........: BZ2_bzCompress (origin5-bz2.c:4822)
by 0x........: BZ2_bzBuffToBuffCompress (origin5-bz2.c:5630)
by 0x........: main (origin5-bz2.c:6484)
Uninitialised value was created by a client request
- at 0x........: main (origin5-bz2.c:6481)
+ at 0x........: main (origin5-bz2.c:6479)
-Use of uninitialised value of size 8
- at 0x........: BZ2_blockSort (origin5-bz2.c:2854)
+Use of uninitialised value of size 4
+ at 0x........: mainSort (origin5-bz2.c:2854)
+ by 0x........: BZ2_blockSort (origin5-bz2.c:3105)
by 0x........: BZ2_compressBlock (origin5-bz2.c:4034)
by 0x........: handle_compress (origin5-bz2.c:4753)
by 0x........: BZ2_bzCompress (origin5-bz2.c:4822)
by 0x........: BZ2_bzBuffToBuffCompress (origin5-bz2.c:5630)
by 0x........: main (origin5-bz2.c:6484)
Uninitialised value was created by a client request
- at 0x........: main (origin5-bz2.c:6481)
+ at 0x........: main (origin5-bz2.c:6479)
-Use of uninitialised value of size 8
- at 0x........: BZ2_blockSort (origin5-bz2.c:2858)
+Use of uninitialised value of size 4
+ at 0x........: mainSort (origin5-bz2.c:2858)
+ by 0x........: BZ2_blockSort (origin5-bz2.c:3105)
by 0x........: BZ2_compressBlock (origin5-bz2.c:4034)
by 0x........: handle_compress (origin5-bz2.c:4753)
by 0x........: BZ2_bzCompress (origin5-bz2.c:4822)
by 0x........: BZ2_bzBuffToBuffCompress (origin5-bz2.c:5630)
by 0x........: main (origin5-bz2.c:6484)
Uninitialised value was created by a client request
- at 0x........: main (origin5-bz2.c:6481)
+ at 0x........: main (origin5-bz2.c:6479)
-Use of uninitialised value of size 8
- at 0x........: BZ2_blockSort (origin5-bz2.c:2963)
+Use of uninitialised value of size 4
+ at 0x........: mainSort (origin5-bz2.c:2963)
+ by 0x........: BZ2_blockSort (origin5-bz2.c:3105)
by 0x........: BZ2_compressBlock (origin5-bz2.c:4034)
<truncated beyond 100 lines>
=================================================
./valgrind-new/none/tests/linux/mremap2.stdout.diff
=================================================
--- mremap2.stdout.exp 2009-06-13 03:16:08.000000000 +1000
+++ mremap2.stdout.out 2009-06-13 03:22:55.000000000 +1000
@@ -27,38 +27,38 @@
..................................................
..................................................
-maymv 0 fixed 0 newsz 21 dstpo 0 dst 0x........ -> 0x........ (== src)
-XXXXXXXXX.XXXXXXXXXXXXXXXXXXXXX.........XXXXXXXXXX
+maymv 0 fixed 0 newsz 21 dstpo 0 dst 0x........ -> error 12
+XXXXXXXXX.XXXXXXXXXXXXXXXXXXXX..........XXXXXXXXXX
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
..................................................
..................................................
-maymv 0 fixed 0 newsz 21 dstpo 1 dst 0x........ -> 0x........ (== src)
-XXXXXXXXX.XXXXXXXXXXXXXXXXXXXXX.........XXXXXXXXXX
+maymv 0 fixed 0 newsz 21 dstpo 1 dst 0x........ -> error 12
+XXXXXXXXX.XXXXXXXXXXXXXXXXXXXX..........XXXXXXXXXX
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
..................................................
..................................................
-maymv 0 fixed 0 newsz 29 dstpo 0 dst 0x........ -> 0x........ (== src)
-XXXXXXXXX.XXXXXXXXXXXXXXXXXXXXXXXXXXXXX.XXXXXXXXXX
+maymv 0 fixed 0 newsz 29 dstpo 0 dst 0x........ -> error 12
+XXXXXXXXX.XXXXXXXXXXXXXXXXXXXX..........XXXXXXXXXX
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
..................................................
..................................................
-maymv 0 fixed 0 newsz 29 dstpo 1 dst 0x........ -> 0x........ (== src)
-XXXXXXXXX.XXXXXXXXXXXXXXXXXXXXXXXXXXXXX.XXXXXXXXXX
+maymv 0 fixed 0 newsz 29 dstpo 1 dst 0x........ -> error 12
+XXXXXXXXX.XXXXXXXXXXXXXXXXXXXX..........XXXXXXXXXX
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
..................................................
..................................................
-maymv 0 fixed 0 newsz 30 dstpo 0 dst 0x........ -> 0x........ (== src)
-XXXXXXXXX.XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+maymv 0 fixed 0 newsz 30 dstpo 0 dst 0x........ -> error 12
+XXXXXXXXX.XXXXXXXXXXXXXXXXXXXX..........XXXXXXXXXX
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
..................................................
..................................................
-maymv 0 fixed 0 newsz 30 dstpo 1 dst 0x........ -> 0x........ (== src)
-XXXXXXXXX.XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+maymv 0 fixed 0 newsz 30 dstpo 1 dst 0x........ -> error 12
+XXXXXXXXX.XXXXXXXXXXXXXXXXXXXX..........XXXXXXXXXX
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
..................................................
..................................................
@@ -173,40 +173,40 @@
..................................................
..................................................
-maymv 1 fixed 0 newsz 21 dstpo 0 dst 0x........ -> 0x........ (== src)
-XXXXXXXXX.XXXXXXXXXXXXXXXXXXXXX.........XXXXXXXXXX
+maymv 1 fixed 0 newsz 21 dstpo 0 dst 0x........ -> 0x........ (== other)
+XXXXXXXXX...............................XXXXXXXXXX
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
..................................................
..................................................
-maymv 1 fixed 0 newsz 21 dstpo 1 dst 0x........ -> 0x........ (== src)
-XXXXXXXXX.XXXXXXXXXXXXXXXXXXXXX.........XXXXXXXXXX
+maymv 1 fixed 0 newsz 21 dstpo 1 dst 0x........ -> 0x........ (== other)
+XXXXXXXXX...............................XXXXXXXXXX
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
..................................................
..................................................
-maymv 1 fixed 0 newsz 29 dstpo 0 dst 0x........ -> 0x........ (== src)
-XXXXXXXXX.XXXXXXXXXXXXXXXXXXXXXXXXXXXXX.XXXXXXXXXX
+maymv 1 fixed 0 newsz 29 dstpo 0 dst 0x........ -> 0x........ (== other)
+XXXXXXXXX...............................XXXXXXXXXX
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-..................................................
+XXXXXXXXXXXXXXXXXXXXXXXXXXXXX.....................
..................................................
-maymv 1 fixed 0 newsz 29 dstpo 1 dst 0x........ -> 0x........ (== src)
-XXXXXXXXX.XXXXXXXXXXXXXXXXXXXXXXXXXXXXX.XXXXXXXXXX
+maymv 1 fixed 0 newsz 29 dstpo 1 dst 0x........ -> 0x........ (== other)
+XXXXXXXXX...............................XXXXXXXXXX
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-..................................................
+XXXXXXXXXXXXXXXXXXXXXXXXXXXXX.....................
..................................................
-maymv 1 fixed 0 newsz 30 dstpo 0 dst 0x........ -> 0x........ (== src)
-XXXXXXXXX.XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+maymv 1 fixed 0 newsz 30 dstpo 0 dst 0x........ -> 0x........ (== other)
+XXXXXXXXX...............................XXXXXXXXXX
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-..................................................
+XXXXXXXXXXXXXXXXXXXXXXXXXXXXXX....................
..................................................
<truncated beyond 100 lines>
=================================================
./valgrind-new/none/tests/linux/mremap2.stdout.diff-glibc28-amd64
=================================================
--- mremap2.stdout.exp-glibc28-amd64 2009-06-13 03:16:08.000000000 +1000
+++ mremap2.stdout.out 2009-06-13 03:22:55.000000000 +1000
@@ -188,37 +188,37 @@
maymv 1 fixed 0 newsz 29 dstpo 0 dst 0x........ -> 0x........ (== other)
XXXXXXXXX...............................XXXXXXXXXX
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-..................................................
+XXXXXXXXXXXXXXXXXXXXXXXXXXXXX.....................
..................................................
maymv 1 fixed 0 newsz 29 dstpo 1 dst 0x........ -> 0x........ (== other)
XXXXXXXXX...............................XXXXXXXXXX
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-..................................................
+XXXXXXXXXXXXXXXXXXXXXXXXXXXXX.....................
..................................................
maymv 1 fixed 0 newsz 30 dstpo 0 dst 0x........ -> 0x........ (== other)
XXXXXXXXX...............................XXXXXXXXXX
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-..................................................
+XXXXXXXXXXXXXXXXXXXXXXXXXXXXXX....................
..................................................
maymv 1 fixed 0 newsz 30 dstpo 1 dst 0x........ -> 0x........ (== other)
XXXXXXXXX...............................XXXXXXXXXX
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-..................................................
+XXXXXXXXXXXXXXXXXXXXXXXXXXXXXX....................
..................................................
maymv 1 fixed 0 newsz 31 dstpo 0 dst 0x........ -> 0x........ (== other)
XXXXXXXXX...............................XXXXXXXXXX
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-..................................................
+XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX...................
..................................................
maymv 1 fixed 0 newsz 31 dstpo 1 dst 0x........ -> 0x........ (== other)
XXXXXXXXX...............................XXXXXXXXXX
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-..................................................
+XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX...................
..................................................
=================================================
./valgrind-new/none/tests/linux/mremap2.stdout.diff2
=================================================
--- mremap2.stdout.exp2 2009-06-13 03:16:08.000000000 +1000
+++ mremap2.stdout.out 2009-06-13 03:22:55.000000000 +1000
@@ -27,38 +27,38 @@
..................................................
..................................................
-maymv 0 fixed 0 newsz 21 dstpo 0 dst 0x........ -> 0x........ (== src)
-XXXXXXXXX.XXXXXXXXXXXXXXXXXXXXX.........XXXXXXXXXX
+maymv 0 fixed 0 newsz 21 dstpo 0 dst 0x........ -> error 12
+XXXXXXXXX.XXXXXXXXXXXXXXXXXXXX..........XXXXXXXXXX
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
..................................................
..................................................
-maymv 0 fixed 0 newsz 21 dstpo 1 dst 0x........ -> 0x........ (== src)
-XXXXXXXXX.XXXXXXXXXXXXXXXXXXXXX.........XXXXXXXXXX
+maymv 0 fixed 0 newsz 21 dstpo 1 dst 0x........ -> error 12
+XXXXXXXXX.XXXXXXXXXXXXXXXXXXXX..........XXXXXXXXXX
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
..................................................
..................................................
-maymv 0 fixed 0 newsz 29 dstpo 0 dst 0x........ -> 0x........ (== src)
-XXXXXXXXX.XXXXXXXXXXXXXXXXXXXXXXXXXXXXX.XXXXXXXXXX
+maymv 0 fixed 0 newsz 29 dstpo 0 dst 0x........ -> error 12
+XXXXXXXXX.XXXXXXXXXXXXXXXXXXXX..........XXXXXXXXXX
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
..................................................
..................................................
-maymv 0 fixed 0 newsz 29 dstpo 1 dst 0x........ -> 0x........ (== src)
-XXXXXXXXX.XXXXXXXXXXXXXXXXXXXXXXXXXXXXX.XXXXXXXXXX
+maymv 0 fixed 0 newsz 29 dstpo 1 dst 0x........ -> error 12
+XXXXXXXXX.XXXXXXXXXXXXXXXXXXXX..........XXXXXXXXXX
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
..................................................
..................................................
-maymv 0 fixed 0 newsz 30 dstpo 0 dst 0x........ -> 0x........ (== src)
-XXXXXXXXX.XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+maymv 0 fixed 0 newsz 30 dstpo 0 dst 0x........ -> error 12
+XXXXXXXXX.XXXXXXXXXXXXXXXXXXXX..........XXXXXXXXXX
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
..................................................
..................................................
-maymv 0 fixed 0 newsz 30 dstpo 1 dst 0x........ -> 0x........ (== src)
-XXXXXXXXX.XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+maymv 0 fixed 0 newsz 30 dstpo 1 dst 0x........ -> error 12
+XXXXXXXXX.XXXXXXXXXXXXXXXXXXXX..........XXXXXXXXXX
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
..................................................
..................................................
@@ -173,52 +173,52 @@
..................................................
..................................................
-maymv 1 fixed 0 newsz 21 dstpo 0 dst 0x........ -> 0x........ (== src)
-XXXXXXXXX.XXXXXXXXXXXXXXXXXXXXX.........XXXXXXXXXX
+maymv 1 fixed 0 newsz 21 dstpo 0 dst 0x........ -> 0x........ (== other)
+XXXXXXXXX...............................XXXXXXXXXX
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
..................................................
..................................................
-maymv 1 fixed 0 newsz 21 dstpo 1 dst 0x........ -> 0x........ (== src)
-XXXXXXXXX.XXXXXXXXXXXXXXXXXXXXX.........XXXXXXXXXX
+maymv 1 fixed 0 newsz 21 dstpo 1 dst 0x........ -> 0x........ (== other)
+XXXXXXXXX...............................XXXXXXXXXX
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
..................................................
..................................................
-maymv 1 fixed 0 newsz 29 dstpo 0 dst 0x........ -> 0x........ (== src)
-XXXXXXXXX.XXXXXXXXXXXXXXXXXXXXXXXXXXXXX.XXXXXXXXXX
+maymv 1 fixed 0 newsz 29 dstpo 0 dst 0x........ -> 0x........ (== other)
+XXXXXXXXX...............................XXXXXXXXXX
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-..................................................
+XXXXXXXXXXXXXXXXXXXXXXXXXXXXX.....................
..................................................
-maymv 1 fixed 0 newsz 29 dstpo 1 dst 0x........ -> 0x........ (== src)
-XXXXXXXXX.XXXXXXXXXXXXXXXXXXXXXXXXXXXXX.XXXXXXXXXX
+maymv 1 fixed 0 newsz 29 dstpo 1 dst 0x........ -> 0x........ (== other)
+XXXXXXXXX...............................XXXXXXXXXX
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-..................................................
+XXXXXXXXXXXXXXXXXXXXXXXXXXXXX.....................
..................................................
-maymv 1 fixed 0 newsz 30 dstpo 0 dst 0x........ -> 0x........ (== src)
-XXXXXXXXX.XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+maymv 1 fixed 0 newsz 30 dstpo 0 dst 0x........ -> 0x........ (== other)
+XXXXXXXXX...............................XXXXXXXXXX
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-..................................................
+XXXXXXXXXXXXXXXXXXXXXXXXXXXXXX....................
..................................................
<truncated beyond 100 lines>
=================================================
./valgrind-new/none/tests/shell.stderr.diff
=================================================
--- shell.stderr.exp 2009-06-13 03:16:13.000000000 +1000
+++ shell.stderr.out 2009-06-13 03:23:11.000000000 +1000
@@ -1,8 +1 @@
-./shell: ./x86/: is a directory
-./shell: ./shell.vgtest: Permission denied
-execve(0x........(./shell_badinterp), 0x........, 0x........) failed, errno 2
-EXEC FAILED: I can't recover from execve() failing, so I'm dying.
-Add more stringent tests in PRE(sys_execve), or work out how to recover.
-./shell: ./shell_binaryfile: cannot execute binary file
-./shell: ./shell_nosuchfile: No such file or directory
-./shell: shell_nosuchfile: command not found
+valgrind: failed to start tool 'none' for platform 'amd64-linux': No such file or directory
=================================================
./valgrind-new/none/tests/shell.stderr.diff-dash
=================================================
--- shell.stderr.exp-dash 2009-06-13 03:16:13.000000000 +1000
+++ shell.stderr.out 2009-06-13 03:23:11.000000000 +1000
@@ -1,8 +1 @@
-./shell: 10: ./x86/: Permission denied
-./shell: 13: ./shell.vgtest: Permission denied
-execve(0x........(./shell_badinterp), 0x........, 0x........) failed, errno 2
-EXEC FAILED: I can't recover from execve() failing, so I'm dying.
-Add more stringent tests in PRE(sys_execve), or work out how to recover.
-./shell_binaryfile: 4: Syntax error: ")" unexpected
-./shell: 22: ./shell_nosuchfile: not found
-./shell: 25: shell_nosuchfile: not found
+valgrind: failed to start tool 'none' for platform 'amd64-linux': No such file or directory
=================================================
./valgrind-new/none/tests/shell.stdout.diff
=================================================
--- shell.stdout.exp 2009-06-13 03:16:13.000000000 +1000
+++ shell.stdout.out 2009-06-13 03:23:11.000000000 +1000
@@ -1,10 +0,0 @@
-Execute a directory
-Execute a non-executable file
-Execute a script with a bad interpreter name
-Execute a binary file
-Execute a non-existent file
-Execute a non-existent file (2)
-Execute a valid script with a #! line
-Execute a valid script without a #! line
-Execute a valid script with #! but no interpname
-Execute a zero-length file
=================================================
./valgrind-new/none/tests/shell_valid1.stderr.diff
=================================================
--- shell_valid1.stderr.exp 2009-06-13 03:16:13.000000000 +1000
+++ shell_valid1.stderr.out 2009-06-13 03:23:11.000000000 +1000
@@ -0,0 +1 @@
+valgrind: failed to start tool 'none' for platform 'amd64-linux': No such file or directory
=================================================
./valgrind-new/none/tests/shell_valid2.stderr.diff
=================================================
--- shell_valid2.stderr.exp 2009-06-13 03:16:13.000000000 +1000
+++ shell_valid2.stderr.out 2009-06-13 03:23:11.000000000 +1000
@@ -0,0 +1,2 @@
+valgrind: wrong ELF executable class (eg. 32-bit instead of 64-bit)
+valgrind: ./shell_valid2: bad interpreter (/bin/sh): VG_(strerror): unknown error
=================================================
./valgrind-new/none/tests/shell_valid3.stderr.diff
=================================================
--- shell_valid3.stderr.exp 2009-06-13 03:16:13.000000000 +1000
+++ shell_valid3.stderr.out 2009-06-13 03:23:11.000000000 +1000
@@ -0,0 +1,2 @@
+valgrind: wrong ELF executable class (eg. 32-bit instead of 64-bit)
+valgrind: ./shell_valid3: bad interpreter (/bin/sh): VG_(strerror): unknown error
=================================================
./valgrind-old/memcheck/tests/linux/stack_switch.stderr.diff
=================================================
--- stack_switch.stderr.exp 2009-06-13 03:01:38.000000000 +1000
+++ stack_switch.stderr.out 2009-06-13 03:09:29.000000000 +1000
@@ -0,0 +1,2 @@
+Syscall param clone(child_tidptr) contains uninitialised byte(s)
+ ...
=================================================
./valgrind-old/memcheck/tests/origin1-yes.stderr.diff
=================================================
--- origin1-yes.stderr.exp 2009-06-13 03:01:49.000000000 +1000
+++ origin1-yes.stderr.out 2009-06-13 03:09:47.000000000 +1000
@@ -47,7 +47,7 @@
Conditional jump or move depends on uninitialised value(s)
at 0x........: main (origin1-yes.c:101)
Uninitialised value was created
- at 0x........: brk (in /...libc...)
+ at 0x........: ??? (in /lib32/ld-2.9.so)
by 0x........: sbrk (in /...libc...)
by 0x........: main (origin1-yes.c:98)
=================================================
./valgrind-old/memcheck/tests/origin1-yes.stderr.diff-darwin
=================================================
--- origin1-yes.stderr.exp-darwin 2009-06-13 03:01:49.000000000 +1000
+++ origin1-yes.stderr.out 2009-06-13 03:09:47.000000000 +1000
@@ -44,7 +44,12 @@
Undef 7 of 8 (brk)
-(no complaint; sbrk initialises memory on Darwin)
+Conditional jump or move depends on uninitialised value(s)
+ at 0x........: main (origin1-yes.c:101)
+ Uninitialised value was created
+ at 0x........: ??? (in /lib32/ld-2.9.so)
+ by 0x........: sbrk (in /...libc...)
+ by 0x........: main (origin1-yes.c:98)
Undef 8 of 8 (MAKE_MEM_UNDEFINED)
=================================================
./valgrind-old/memcheck/tests/origin5-bz2.stderr.diff-glibc25-amd64
=================================================
--- origin5-bz2.stderr.exp-glibc25-amd64 2009-06-13 03:01:49.000000000 +1000
+++ origin5-bz2.stderr.out 2009-06-13 03:09:50.000000000 +1000
@@ -11,7 +11,7 @@
Uninitialised value was created by a client request
at 0x........: main (origin5-bz2.c:6479)
-Use of uninitialised value of size 8
+Use of uninitialised value of size 4
at 0x........: handle_compress (origin5-bz2.c:4686)
by 0x........: BZ2_bzCompress (origin5-bz2.c:4822)
by 0x........: BZ2_bzBuffToBuffCompress (origin5-bz2.c:5630)
@@ -19,7 +19,7 @@
Uninitialised value was created by a client request
at 0x........: main (origin5-bz2.c:6479)
-Use of uninitialised value of size 8
+Use of uninitialised value of size 4
at 0x........: handle_compress (origin5-bz2.c:4686)
by 0x........: BZ2_bzCompress (origin5-bz2.c:4822)
by 0x........: BZ2_bzBuffToBuffCompress (origin5-bz2.c:5630)
@@ -27,7 +27,7 @@
Uninitialised value was created by a client request
at 0x........: main (origin5-bz2.c:6479)
-Use of uninitialised value of size 8
+Use of uninitialised value of size 4
at 0x........: mainSort (origin5-bz2.c:2820)
by 0x........: BZ2_blockSort (origin5-bz2.c:3105)
by 0x........: BZ2_compressBlock (origin5-bz2.c:4034)
@@ -38,7 +38,7 @@
Uninitialised value was created by a client request
at 0x........: main (origin5-bz2.c:6479)
-Use of uninitialised value of size 8
+Use of uninitialised value of size 4
at 0x........: mainSort (origin5-bz2.c:2823)
by 0x........: BZ2_blockSort (origin5-bz2.c:3105)
by 0x........: BZ2_compressBlock (origin5-bz2.c:4034)
@@ -49,7 +49,7 @@
Uninitialised value was created by a client request
at 0x........: main (origin5-bz2.c:6479)
-Use of uninitialised value of size 8
+Use of uninitialised value of size 4
at 0x........: mainSort (origin5-bz2.c:2854)
by 0x........: BZ2_blockSort (origin5-bz2.c:3105)
by 0x........: BZ2_compressBlock (origin5-bz2.c:4034)
@@ -60,7 +60,7 @@
Uninitialised value was created by a client request
at 0x........: main (origin5-bz2.c:6479)
-Use of uninitialised value of size 8
+Use of uninitialised value of size 4
at 0x........: mainSort (origin5-bz2.c:2858)
by 0x........: BZ2_blockSort (origin5-bz2.c:3105)
by 0x........: BZ2_compressBlock (origin5-bz2.c:4034)
@@ -71,7 +71,7 @@
Uninitialised value was created by a client request
at 0x........: main (origin5-bz2.c:6479)
-Use of uninitialised value of size 8
+Use of uninitialised value of size 4
at 0x........: mainSort (origin5-bz2.c:2963)
by 0x........: BZ2_blockSort (origin5-bz2.c:3105)
by 0x........: BZ2_compressBlock (origin5-bz2.c:4034)
@@ -82,7 +82,7 @@
Uninitialised value was created by a client request
at 0x........: main (origin5-bz2.c:6479)
-Use of uninitialised value of size 8
+Use of uninitialised value of size 4
at 0x........: mainSort (origin5-bz2.c:2964)
by 0x........: BZ2_blockSort (origin5-bz2.c:3105)
by 0x........: BZ2_compressBlock (origin5-bz2.c:4034)
@@ -93,7 +93,7 @@
Uninitialised value was created by a client request
at 0x........: main (origin5-bz2.c:6479)
-Use of uninitialised value of size 8
+Use of uninitialised value of size 4
at 0x........: fallbackSort (origin5-bz2.c:2269)
by 0x........: BZ2_blockSort (origin5-bz2.c:3116)
by 0x........: BZ2_compressBlock (origin5-bz2.c:4034)
@@ -104,7 +104,7 @@
Uninitialised value was created by a client request
at 0x........: main (origin5-bz2.c:6479)
-Use of uninitialised value of size 8
+Use of uninitialised value of size 4
at 0x........: fallbackSort (origin5-bz2.c:2275)
by 0x........: BZ2_blockSort (origin5-bz2.c:3116)
by 0x........: BZ2_compressBlock (origin5-bz2.c:4034)
=================================================
./valgrind-old/memcheck/tests/origin5-bz2.stderr.diff-glibc25-x86
=================================================
--- origin5-bz2.stderr.exp-glibc25-x86 2009-06-13 03:01:49.000000000 +1000
+++ origin5-bz2.stderr.out 2009-06-13 03:09:50.000000000 +1000
@@ -28,7 +28,8 @@
at 0x........: main (origin5-bz2.c:6479)
Use of uninitialised value of size 4
- at 0x........: BZ2_blockSort (origin5-bz2.c:2820)
+ at 0x........: mainSort (origin5-bz2.c:2820)
+ by 0x........: BZ2_blockSort (origin5-bz2.c:3105)
by 0x........: BZ2_compressBlock (origin5-bz2.c:4034)
by 0x........: handle_compress (origin5-bz2.c:4753)
by 0x........: BZ2_bzCompress (origin5-bz2.c:4822)
@@ -38,7 +39,8 @@
at 0x........: main (origin5-bz2.c:6479)
Use of uninitialised value of size 4
- at 0x........: BZ2_blockSort (origin5-bz2.c:2823)
+ at 0x........: mainSort (origin5-bz2.c:2823)
+ by 0x........: BZ2_blockSort (origin5-bz2.c:3105)
by 0x........: BZ2_compressBlock (origin5-bz2.c:4034)
by 0x........: handle_compress (origin5-bz2.c:4753)
by 0x........: BZ2_bzCompress (origin5-bz2.c:4822)
@@ -48,7 +50,8 @@
at 0x........: main (origin5-bz2.c:6479)
Use of uninitialised value of size 4
- at 0x........: BZ2_blockSort (origin5-bz2.c:2855)
+ at 0x........: mainSort (origin5-bz2.c:2854)
+ by 0x........: BZ2_blockSort (origin5-bz2.c:3105)
by 0x........: BZ2_compressBlock (origin5-bz2.c:4034)
by 0x........: handle_compress (origin5-bz2.c:4753)
by 0x........: BZ2_bzCompress (origin5-bz2.c:4822)
@@ -58,7 +61,8 @@
at 0x........: main (origin5-bz2.c:6479)
Use of uninitialised value of size 4
- at 0x........: BZ2_blockSort (origin5-bz2.c:2859)
+ at 0x........: mainSort (origin5-bz2.c:2858)
+ by 0x........: BZ2_blockSort (origin5-bz2.c:3105)
by 0x........: BZ2_compressBlock (origin5-bz2.c:4034)
by 0x........: handle_compress (origin5-bz2.c:4753)
by 0x........: BZ2_bzCompress (origin5-bz2.c:4822)
@@ -68,7 +72,8 @@
at 0x........: main (origin5-bz2.c:6479)
Use of uninitialised value of size 4
- at 0x........: BZ2_blockSort (origin5-bz2.c:2963)
+ at 0x........: mainSort (origin5-bz2.c:2963)
+ by 0x........: BZ2_blockSort (origin5-bz2.c:3105)
by 0x........: BZ2_compressBlock (origin5-bz2.c:4034)
by 0x........: handle_compress (origin5-bz2.c:4753)
by 0x........: BZ2_bzCompress (origin5-bz2.c:4822)
@@ -78,7 +83,8 @@
at 0x........: main (origin5-bz2.c:6479)
Use of uninitialised value of size 4
- at 0x........: BZ2_blockSort (origin5-bz2.c:2964)
+ at 0x........: mainSort (origin5-bz2.c:2964)
+ by 0x........: BZ2_blockSort (origin5-bz2.c:3105)
by 0x........: BZ2_compressBlock (origin5-bz2.c:4034)
by 0x........: handle_compress (origin5-bz2.c:4753)
by 0x........: BZ2_bzCompress (origin5-bz2.c:4822)
=================================================
./valgrind-old/memcheck/tests/origin5-bz2.stderr.diff-glibc27-ppc64
=================================================
--- origin5-bz2.stderr.exp-glibc27-ppc64 2009-06-13 03:01:49.000000000 +1000
+++ origin5-bz2.stderr.out 2009-06-13 03:09:50.000000000 +1000
@@ -1,7 +1,7 @@
Conditional jump or move depends on uninitialised value(s)
at 0x........: main (origin5-bz2.c:6481)
Uninitialised value was created by a client request
- at 0x........: main (origin5-bz2.c:6481)
+ at 0x........: main (origin5-bz2.c:6479)
Conditional jump or move depends on uninitialised value(s)
at 0x........: handle_compress (origin5-bz2.c:4686)
@@ -9,85 +9,91 @@
by 0x........: BZ2_bzBuffToBuffCompress (origin5-bz2.c:5630)
by 0x........: main (origin5-bz2.c:6484)
Uninitialised value was created by a client request
- at 0x........: main (origin5-bz2.c:6481)
+ at 0x........: main (origin5-bz2.c:6479)
-Use of uninitialised value of size 8
+Use of uninitialised value of size 4
at 0x........: handle_compress (origin5-bz2.c:4686)
by 0x........: BZ2_bzCompress (origin5-bz2.c:4822)
by 0x........: BZ2_bzBuffToBuffCompress (origin5-bz2.c:5630)
by 0x........: main (origin5-bz2.c:6484)
Uninitialised value was created by a client request
- at 0x........: main (origin5-bz2.c:6481)
+ at 0x........: main (origin5-bz2.c:6479)
-Use of uninitialised value of size 8
+Use of uninitialised value of size 4
at 0x........: handle_compress (origin5-bz2.c:4686)
by 0x........: BZ2_bzCompress (origin5-bz2.c:4822)
by 0x........: BZ2_bzBuffToBuffCompress (origin5-bz2.c:5630)
by 0x........: main (origin5-bz2.c:6484)
Uninitialised value was created by a client request
- at 0x........: main (origin5-bz2.c:6481)
+ at 0x........: main (origin5-bz2.c:6479)
-Use of uninitialised value of size 8
- at 0x........: BZ2_blockSort (origin5-bz2.c:2820)
+Use of uninitialised value of size 4
+ at 0x........: mainSort (origin5-bz2.c:2820)
+ by 0x........: BZ2_blockSort (origin5-bz2.c:3105)
by 0x........: BZ2_compressBlock (origin5-bz2.c:4034)
by 0x........: handle_compress (origin5-bz2.c:4753)
by 0x........: BZ2_bzCompress (origin5-bz2.c:4822)
by 0x........: BZ2_bzBuffToBuffCompress (origin5-bz2.c:5630)
by 0x........: main (origin5-bz2.c:6484)
Uninitialised value was created by a client request
- at 0x........: main (origin5-bz2.c:6481)
+ at 0x........: main (origin5-bz2.c:6479)
-Use of uninitialised value of size 8
- at 0x........: BZ2_blockSort (origin5-bz2.c:2823)
+Use of uninitialised value of size 4
+ at 0x........: mainSort (origin5-bz2.c:2823)
+ by 0x........: BZ2_blockSort (origin5-bz2.c:3105)
by 0x........: BZ2_compressBlock (origin5-bz2.c:4034)
by 0x........: handle_compress (origin5-bz2.c:4753)
by 0x........: BZ2_bzCompress (origin5-bz2.c:4822)
by 0x........: BZ2_bzBuffToBuffCompress (origin5-bz2.c:5630)
by 0x........: main (origin5-bz2.c:6484)
Uninitialised value was created by a client request
- at 0x........: main (origin5-bz2.c:6481)
+ at 0x........: main (origin5-bz2.c:6479)
-Use of uninitialised value of size 8
- at 0x........: BZ2_blockSort (origin5-bz2.c:2854)
+Use of uninitialised value of size 4
+ at 0x........: mainSort (origin5-bz2.c:2854)
+ by 0x........: BZ2_blockSort (origin5-bz2.c:3105)
by 0x........: BZ2_compressBlock (origin5-bz2.c:4034)
by 0x........: handle_compress (origin5-bz2.c:4753)
by 0x........: BZ2_bzCompress (origin5-bz2.c:4822)
by 0x........: BZ2_bzBuffToBuffCompress (origin5-bz2.c:5630)
by 0x........: main (origin5-bz2.c:6484)
Uninitialised value was created by a client request
- at 0x........: main (origin5-bz2.c:6481)
+ at 0x........: main (origin5-bz2.c:6479)
-Use of uninitialised value of size 8
- at 0x........: BZ2_blockSort (origin5-bz2.c:2858)
+Use of uninitialised value of size 4
+ at 0x........: mainSort (origin5-bz2.c:2858)
+ by 0x........: BZ2_blockSort (origin5-bz2.c:3105)
by 0x........: BZ2_compressBlock (origin5-bz2.c:4034)
by 0x........: handle_compress (origin5-bz2.c:4753)
by 0x........: BZ2_bzCompress (origin5-bz2.c:4822)
by 0x........: BZ2_bzBuffToBuffCompress (origin5-bz2.c:5630)
by 0x........: main (origin5-bz2.c:6484)
Uninitialised value was created by a client request
- at 0x........: main (origin5-bz2.c:6481)
+ at 0x........: main (origin5-bz2.c:6479)
-Use of uninitialised value of size 8
- at 0x........: BZ2_blockSort (origin5-bz2.c:2963)
+Use of uninitialised value of size 4
+ at 0x........: mainSort (origin5-bz2.c:2963)
+ by 0x........: BZ2_blockSort (origin5-bz2.c:3105)
by 0x........: BZ2_compressBlock (origin5-bz2.c:4034)
<truncated beyond 100 lines>
=================================================
./valgrind-old/none/tests/linux/mremap2.stdout.diff
=================================================
--- mremap2.stdout.exp 2009-06-13 03:03:05.000000000 +1000
+++ mremap2.stdout.out 2009-06-13 03:11:11.000000000 +1000
@@ -27,38 +27,38 @@
..................................................
..................................................
-maymv 0 fixed 0 newsz 21 dstpo 0 dst 0x........ -> 0x........ (== src)
-XXXXXXXXX.XXXXXXXXXXXXXXXXXXXXX.........XXXXXXXXXX
+maymv 0 fixed 0 newsz 21 dstpo 0 dst 0x........ -> error 12
+XXXXXXXXX.XXXXXXXXXXXXXXXXXXXX..........XXXXXXXXXX
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
..................................................
..................................................
-maymv 0 fixed 0 newsz 21 dstpo 1 dst 0x........ -> 0x........ (== src)
-XXXXXXXXX.XXXXXXXXXXXXXXXXXXXXX.........XXXXXXXXXX
+maymv 0 fixed 0 newsz 21 dstpo 1 dst 0x........ -> error 12
+XXXXXXXXX.XXXXXXXXXXXXXXXXXXXX..........XXXXXXXXXX
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
..................................................
..................................................
-maymv 0 fixed 0 newsz 29 dstpo 0 dst 0x........ -> 0x........ (== src)
-XXXXXXXXX.XXXXXXXXXXXXXXXXXXXXXXXXXXXXX.XXXXXXXXXX
+maymv 0 fixed 0 newsz 29 dstpo 0 dst 0x........ -> error 12
+XXXXXXXXX.XXXXXXXXXXXXXXXXXXXX..........XXXXXXXXXX
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
..................................................
..................................................
-maymv 0 fixed 0 newsz 29 dstpo 1 dst 0x........ -> 0x........ (== src)
-XXXXXXXXX.XXXXXXXXXXXXXXXXXXXXXXXXXXXXX.XXXXXXXXXX
+maymv 0 fixed 0 newsz 29 dstpo 1 dst 0x........ -> error 12
+XXXXXXXXX.XXXXXXXXXXXXXXXXXXXX..........XXXXXXXXXX
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
..................................................
..................................................
-maymv 0 fixed 0 newsz 30 dstpo 0 dst 0x........ -> 0x........ (== src)
-XXXXXXXXX.XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+maymv 0 fixed 0 newsz 30 dstpo 0 dst 0x........ -> error 12
+XXXXXXXXX.XXXXXXXXXXXXXXXXXXXX..........XXXXXXXXXX
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
..................................................
..................................................
-maymv 0 fixed 0 newsz 30 dstpo 1 dst 0x........ -> 0x........ (== src)
-XXXXXXXXX.XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+maymv 0 fixed 0 newsz 30 dstpo 1 dst 0x........ -> error 12
+XXXXXXXXX.XXXXXXXXXXXXXXXXXXXX..........XXXXXXXXXX
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
..................................................
..................................................
@@ -173,40 +173,40 @@
..................................................
..................................................
-maymv 1 fixed 0 newsz 21 dstpo 0 dst 0x........ -> 0x........ (== src)
-XXXXXXXXX.XXXXXXXXXXXXXXXXXXXXX.........XXXXXXXXXX
+maymv 1 fixed 0 newsz 21 dstpo 0 dst 0x........ -> 0x........ (== other)
+XXXXXXXXX...............................XXXXXXXXXX
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
..................................................
..................................................
-maymv 1 fixed 0 newsz 21 dstpo 1 dst 0x........ -> 0x........ (== src)
-XXXXXXXXX.XXXXXXXXXXXXXXXXXXXXX.........XXXXXXXXXX
+maymv 1 fixed 0 newsz 21 dstpo 1 dst 0x........ -> 0x........ (== other)
+XXXXXXXXX...............................XXXXXXXXXX
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
..................................................
..................................................
-maymv 1 fixed 0 newsz 29 dstpo 0 dst 0x........ -> 0x........ (== src)
-XXXXXXXXX.XXXXXXXXXXXXXXXXXXXXXXXXXXXXX.XXXXXXXXXX
+maymv 1 fixed 0 newsz 29 dstpo 0 dst 0x........ -> 0x........ (== other)
+XXXXXXXXX...............................XXXXXXXXXX
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-..................................................
+XXXXXXXXXXXXXXXXXXXXXXXXXXXXX.....................
..................................................
-maymv 1 fixed 0 newsz 29 dstpo 1 dst 0x........ -> 0x........ (== src)
-XXXXXXXXX.XXXXXXXXXXXXXXXXXXXXXXXXXXXXX.XXXXXXXXXX
+maymv 1 fixed 0 newsz 29 dstpo 1 dst 0x........ -> 0x........ (== other)
+XXXXXXXXX...............................XXXXXXXXXX
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-..................................................
+XXXXXXXXXXXXXXXXXXXXXXXXXXXXX.....................
..................................................
-maymv 1 fixed 0 newsz 30 dstpo 0 dst 0x........ -> 0x........ (== src)
-XXXXXXXXX.XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+maymv 1 fixed 0 newsz 30 dstpo 0 dst 0x........ -> 0x........ (== other)
+XXXXXXXXX...............................XXXXXXXXXX
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-..................................................
+XXXXXXXXXXXXXXXXXXXXXXXXXXXXXX....................
..................................................
<truncated beyond 100 lines>
=================================================
./valgrind-old/none/tests/linux/mremap2.stdout.diff-glibc28-amd64
=================================================
--- mremap2.stdout.exp-glibc28-amd64 2009-06-13 03:03:05.000000000 +1000
+++ mremap2.stdout.out 2009-06-13 03:11:11.000000000 +1000
@@ -188,37 +188,37 @@
maymv 1 fixed 0 newsz 29 dstpo 0 dst 0x........ -> 0x........ (== other)
XXXXXXXXX...............................XXXXXXXXXX
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-..................................................
+XXXXXXXXXXXXXXXXXXXXXXXXXXXXX.....................
..................................................
maymv 1 fixed 0 newsz 29 dstpo 1 dst 0x........ -> 0x........ (== other)
XXXXXXXXX...............................XXXXXXXXXX
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-..................................................
+XXXXXXXXXXXXXXXXXXXXXXXXXXXXX.....................
..................................................
maymv 1 fixed 0 newsz 30 dstpo 0 dst 0x........ -> 0x........ (== other)
XXXXXXXXX...............................XXXXXXXXXX
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-..................................................
+XXXXXXXXXXXXXXXXXXXXXXXXXXXXXX....................
..................................................
maymv 1 fixed 0 newsz 30 dstpo 1 dst 0x........ -> 0x........ (== other)
XXXXXXXXX...............................XXXXXXXXXX
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-..................................................
+XXXXXXXXXXXXXXXXXXXXXXXXXXXXXX....................
..................................................
maymv 1 fixed 0 newsz 31 dstpo 0 dst 0x........ -> 0x........ (== other)
XXXXXXXXX...............................XXXXXXXXXX
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-..................................................
+XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX...................
..................................................
maymv 1 fixed 0 newsz 31 dstpo 1 dst 0x........ -> 0x........ (== other)
XXXXXXXXX...............................XXXXXXXXXX
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-..................................................
+XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX...................
..................................................
=================================================
./valgrind-old/none/tests/linux/mremap2.stdout.diff2
=================================================
--- mremap2.stdout.exp2 2009-06-13 03:03:05.000000000 +1000
+++ mremap2.stdout.out 2009-06-13 03:11:11.000000000 +1000
@@ -27,38 +27,38 @@
..................................................
..................................................
-maymv 0 fixed 0 newsz 21 dstpo 0 dst 0x........ -> 0x........ (== src)
-XXXXXXXXX.XXXXXXXXXXXXXXXXXXXXX.........XXXXXXXXXX
+maymv 0 fixed 0 newsz 21 dstpo 0 dst 0x........ -> error 12
+XXXXXXXXX.XXXXXXXXXXXXXXXXXXXX..........XXXXXXXXXX
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
..................................................
..................................................
-maymv 0 fixed 0 newsz 21 dstpo 1 dst 0x........ -> 0x........ (== src)
-XXXXXXXXX.XXXXXXXXXXXXXXXXXXXXX.........XXXXXXXXXX
+maymv 0 fixed 0 newsz 21 dstpo 1 dst 0x........ -> error 12
+XXXXXXXXX.XXXXXXXXXXXXXXXXXXXX..........XXXXXXXXXX
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
..................................................
..................................................
-maymv 0 fixed 0 newsz 29 dstpo 0 dst 0x........ -> 0x........ (== src)
-XXXXXXXXX.XXXXXXXXXXXXXXXXXXXXXXXXXXXXX.XXXXXXXXXX
+maymv 0 fixed 0 newsz 29 dstpo 0 dst 0x........ -> error 12
+XXXXXXXXX.XXXXXXXXXXXXXXXXXXXX..........XXXXXXXXXX
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
..................................................
..................................................
-maymv 0 fixed 0 newsz 29 dstpo 1 dst 0x........ -> 0x........ (== src)
-XXXXXXXXX.XXXXXXXXXXXXXXXXXXXXXXXXXXXXX.XXXXXXXXXX
+maymv 0 fixed 0 newsz 29 dstpo 1 dst 0x........ -> error 12
+XXXXXXXXX.XXXXXXXXXXXXXXXXXXXX..........XXXXXXXXXX
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
..................................................
..................................................
-maymv 0 fixed 0 newsz 30 dstpo 0 dst 0x........ -> 0x........ (== src)
-XXXXXXXXX.XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+maymv 0 fixed 0 newsz 30 dstpo 0 dst 0x........ -> error 12
+XXXXXXXXX.XXXXXXXXXXXXXXXXXXXX..........XXXXXXXXXX
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
..................................................
..................................................
-maymv 0 fixed 0 newsz 30 dstpo 1 dst 0x........ -> 0x........ (== src)
-XXXXXXXXX.XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+maymv 0 fixed 0 newsz 30 dstpo 1 dst 0x........ -> error 12
+XXXXXXXXX.XXXXXXXXXXXXXXXXXXXX..........XXXXXXXXXX
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
..................................................
..................................................
@@ -173,52 +173,52 @@
..................................................
..................................................
-maymv 1 fixed 0 newsz 21 dstpo 0 dst 0x........ -> 0x........ (== src)
-XXXXXXXXX.XXXXXXXXXXXXXXXXXXXXX.........XXXXXXXXXX
+maymv 1 fixed 0 newsz 21 dstpo 0 dst 0x........ -> 0x........ (== other)
+XXXXXXXXX...............................XXXXXXXXXX
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
..................................................
..................................................
-maymv 1 fixed 0 newsz 21 dstpo 1 dst 0x........ -> 0x........ (== src)
-XXXXXXXXX.XXXXXXXXXXXXXXXXXXXXX.........XXXXXXXXXX
+maymv 1 fixed 0 newsz 21 dstpo 1 dst 0x........ -> 0x........ (== other)
+XXXXXXXXX...............................XXXXXXXXXX
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
..................................................
..................................................
-maymv 1 fixed 0 newsz 29 dstpo 0 dst 0x........ -> 0x........ (== src)
-XXXXXXXXX.XXXXXXXXXXXXXXXXXXXXXXXXXXXXX.XXXXXXXXXX
+maymv 1 fixed 0 newsz 29 dstpo 0 dst 0x........ -> 0x........ (== other)
+XXXXXXXXX...............................XXXXXXXXXX
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-..................................................
+XXXXXXXXXXXXXXXXXXXXXXXXXXXXX.....................
..................................................
-maymv 1 fixed 0 newsz 29 dstpo 1 dst 0x........ -> 0x........ (== src)
-XXXXXXXXX.XXXXXXXXXXXXXXXXXXXXXXXXXXXXX.XXXXXXXXXX
+maymv 1 fixed 0 newsz 29 dstpo 1 dst 0x........ -> 0x........ (== other)
+XXXXXXXXX...............................XXXXXXXXXX
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-..................................................
+XXXXXXXXXXXXXXXXXXXXXXXXXXXXX.....................
..................................................
-maymv 1 fixed 0 newsz 30 dstpo 0 dst 0x........ -> 0x........ (== src)
-XXXXXXXXX.XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+maymv 1 fixed 0 newsz 30 dstpo 0 dst 0x........ -> 0x........ (== other)
+XXXXXXXXX...............................XXXXXXXXXX
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-..................................................
+XXXXXXXXXXXXXXXXXXXXXXXXXXXXXX....................
..................................................
<truncated beyond 100 lines>
=================================================
./valgrind-old/none/tests/shell.stderr.diff
=================================================
--- shell.stderr.exp 2009-06-13 03:03:19.000000000 +1000
+++ shell.stderr.out 2009-06-13 03:11:26.000000000 +1000
@@ -1,8 +1 @@
-./shell: ./x86/: is a directory
-./shell: ./shell.vgtest: Permission denied
-execve(0x........(./shell_badinterp), 0x........, 0x........) failed, errno 2
-EXEC FAILED: I can't recover from execve() failing, so I'm dying.
-Add more stringent tests in PRE(sys_execve), or work out how to recover.
-./shell: ./shell_binaryfile: cannot execute binary file
-./shell: ./shell_nosuchfile: No such file or directory
-./shell: shell_nosuchfile: command not found
+valgrind: failed to start tool 'none' for platform 'amd64-linux': No such file or directory
=================================================
./valgrind-old/none/tests/shell.stderr.diff-dash
=================================================
--- shell.stderr.exp-dash 2009-06-13 03:03:19.000000000 +1000
+++ shell.stderr.out 2009-06-13 03:11:26.000000000 +1000
@@ -1,8 +1 @@
-./shell: 10: ./x86/: Permission denied
-./shell: 13: ./shell.vgtest: Permission denied
-execve(0x........(./shell_badinterp), 0x........, 0x........) failed, errno 2
-EXEC FAILED: I can't recover from execve() failing, so I'm dying.
-Add more stringent tests in PRE(sys_execve), or work out how to recover.
-./shell_binaryfile: 4: Syntax error: ")" unexpected
-./shell: 22: ./shell_nosuchfile: not found
-./shell: 25: shell_nosuchfile: not found
+valgrind: failed to start tool 'none' for platform 'amd64-linux': No such file or directory
=================================================
./valgrind-old/none/tests/shell.stdout.diff
=================================================
--- shell.stdout.exp 2009-06-13 03:03:19.000000000 +1000
+++ shell.stdout.out 2009-06-13 03:11:26.000000000 +1000
@@ -1,10 +0,0 @@
-Execute a directory
-Execute a non-executable file
-Execute a script with a bad interpreter name
-Execute a binary file
-Execute a non-existent file
-Execute a non-existent file (2)
-Execute a valid script with a #! line
-Execute a valid script without a #! line
-Execute a valid script with #! but no interpname
-Execute a zero-length file
=================================================
./valgrind-old/none/tests/shell_valid1.stderr.diff
=================================================
--- shell_valid1.stderr.exp 2009-06-13 03:03:19.000000000 +1000
+++ shell_valid1.stderr.out 2009-06-13 03:11:26.000000000 +1000
@@ -0,0 +1 @@
+valgrind: failed to start tool 'none' for platform 'amd64-linux': No such file or directory
=================================================
./valgrind-old/none/tests/shell_valid2.stderr.diff
=================================================
--- shell_valid2.stderr.exp 2009-06-13 03:03:19.000000000 +1000
+++ shell_valid2.stderr.out 2009-06-13 03:11:26.000000000 +1000
@@ -0,0 +1,2 @@
+valgrind: wrong ELF executable class (eg. 32-bit instead of 64-bit)
+valgrind: ./shell_valid2: bad interpreter (/bin/sh): VG_(strerror): unknown error
=================================================
./valgrind-old/none/tests/shell_valid3.stderr.diff
=================================================
--- shell_valid3.stderr.exp 2009-06-13 03:03:19.000000000 +1000
+++ shell_valid3.stderr.out 2009-06-13 03:11:26.000000000 +1000
@@ -0,0 +1,2 @@
+valgrind: wrong ELF executable class (eg. 32-bit instead of 64-bit)
+valgrind: ./shell_valid3: bad interpreter (/bin/sh): VG_(strerror): unknown error
=================================================
./valgrind/memcheck/tests/linux/stack_switch.stderr.diff
=================================================
--- stack_switch.stderr.exp 2009-06-05 03:12:28.000000000 +1000
+++ stack_switch...
[truncated message content] |
|
From: Nicholas N. <n.n...@gm...> - 2009-06-12 16:25:01
|
Nightly build on ocean ( Ubuntu 9.04, x86_64 ) Started at 2009-06-13 02:00:01 EST Ended at 2009-06-13 02:25:16 EST Results unchanged from 24 hours ago Checking out valgrind source tree ... done Configuring valgrind ... done Building valgrind ... done Running regression tests ... failed Regression test results follow == 495 tests, 0 stderr failures, 1 stdout failure, 0 post failures == none/tests/linux/mremap2 (stdout) ================================================= ./valgrind-new/none/tests/linux/mremap2.stdout.diff ================================================= --- mremap2.stdout.exp 2009-06-13 02:13:09.000000000 +1000 +++ mremap2.stdout.out 2009-06-13 02:22:20.000000000 +1000 @@ -27,38 +27,38 @@ .................................................. .................................................. -maymv 0 fixed 0 newsz 21 dstpo 0 dst 0x........ -> 0x........ (== src) -XXXXXXXXX.XXXXXXXXXXXXXXXXXXXXX.........XXXXXXXXXX +maymv 0 fixed 0 newsz 21 dstpo 0 dst 0x........ -> error 12 +XXXXXXXXX.XXXXXXXXXXXXXXXXXXXX..........XXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX .................................................. .................................................. -maymv 0 fixed 0 newsz 21 dstpo 1 dst 0x........ -> 0x........ (== src) -XXXXXXXXX.XXXXXXXXXXXXXXXXXXXXX.........XXXXXXXXXX +maymv 0 fixed 0 newsz 21 dstpo 1 dst 0x........ -> error 12 +XXXXXXXXX.XXXXXXXXXXXXXXXXXXXX..........XXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX .................................................. .................................................. -maymv 0 fixed 0 newsz 29 dstpo 0 dst 0x........ -> 0x........ (== src) -XXXXXXXXX.XXXXXXXXXXXXXXXXXXXXXXXXXXXXX.XXXXXXXXXX +maymv 0 fixed 0 newsz 29 dstpo 0 dst 0x........ -> error 12 +XXXXXXXXX.XXXXXXXXXXXXXXXXXXXX..........XXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX .................................................. .................................................. -maymv 0 fixed 0 newsz 29 dstpo 1 dst 0x........ -> 0x........ (== src) -XXXXXXXXX.XXXXXXXXXXXXXXXXXXXXXXXXXXXXX.XXXXXXXXXX +maymv 0 fixed 0 newsz 29 dstpo 1 dst 0x........ -> error 12 +XXXXXXXXX.XXXXXXXXXXXXXXXXXXXX..........XXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX .................................................. .................................................. -maymv 0 fixed 0 newsz 30 dstpo 0 dst 0x........ -> 0x........ (== src) -XXXXXXXXX.XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX +maymv 0 fixed 0 newsz 30 dstpo 0 dst 0x........ -> error 12 +XXXXXXXXX.XXXXXXXXXXXXXXXXXXXX..........XXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX .................................................. .................................................. -maymv 0 fixed 0 newsz 30 dstpo 1 dst 0x........ -> 0x........ (== src) -XXXXXXXXX.XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX +maymv 0 fixed 0 newsz 30 dstpo 1 dst 0x........ -> error 12 +XXXXXXXXX.XXXXXXXXXXXXXXXXXXXX..........XXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX .................................................. .................................................. @@ -173,40 +173,40 @@ .................................................. .................................................. -maymv 1 fixed 0 newsz 21 dstpo 0 dst 0x........ -> 0x........ (== src) -XXXXXXXXX.XXXXXXXXXXXXXXXXXXXXX.........XXXXXXXXXX +maymv 1 fixed 0 newsz 21 dstpo 0 dst 0x........ -> 0x........ (== other) +XXXXXXXXX...............................XXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX .................................................. .................................................. -maymv 1 fixed 0 newsz 21 dstpo 1 dst 0x........ -> 0x........ (== src) -XXXXXXXXX.XXXXXXXXXXXXXXXXXXXXX.........XXXXXXXXXX +maymv 1 fixed 0 newsz 21 dstpo 1 dst 0x........ -> 0x........ (== other) +XXXXXXXXX...............................XXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX .................................................. .................................................. -maymv 1 fixed 0 newsz 29 dstpo 0 dst 0x........ -> 0x........ (== src) -XXXXXXXXX.XXXXXXXXXXXXXXXXXXXXXXXXXXXXX.XXXXXXXXXX +maymv 1 fixed 0 newsz 29 dstpo 0 dst 0x........ -> 0x........ (== other) +XXXXXXXXX...............................XXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX -.................................................. +XXXXXXXXXXXXXXXXXXXXXXXXXXXXX..................... .................................................. -maymv 1 fixed 0 newsz 29 dstpo 1 dst 0x........ -> 0x........ (== src) -XXXXXXXXX.XXXXXXXXXXXXXXXXXXXXXXXXXXXXX.XXXXXXXXXX +maymv 1 fixed 0 newsz 29 dstpo 1 dst 0x........ -> 0x........ (== other) +XXXXXXXXX...............................XXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX -.................................................. +XXXXXXXXXXXXXXXXXXXXXXXXXXXXX..................... .................................................. -maymv 1 fixed 0 newsz 30 dstpo 0 dst 0x........ -> 0x........ (== src) -XXXXXXXXX.XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX +maymv 1 fixed 0 newsz 30 dstpo 0 dst 0x........ -> 0x........ (== other) +XXXXXXXXX...............................XXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX -.................................................. +XXXXXXXXXXXXXXXXXXXXXXXXXXXXXX.................... .................................................. <truncated beyond 100 lines> ================================================= ./valgrind-new/none/tests/linux/mremap2.stdout.diff-glibc28-amd64 ================================================= --- mremap2.stdout.exp-glibc28-amd64 2009-06-13 02:13:09.000000000 +1000 +++ mremap2.stdout.out 2009-06-13 02:22:20.000000000 +1000 @@ -188,37 +188,37 @@ maymv 1 fixed 0 newsz 29 dstpo 0 dst 0x........ -> 0x........ (== other) XXXXXXXXX...............................XXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX -.................................................. +XXXXXXXXXXXXXXXXXXXXXXXXXXXXX..................... .................................................. maymv 1 fixed 0 newsz 29 dstpo 1 dst 0x........ -> 0x........ (== other) XXXXXXXXX...............................XXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX -.................................................. +XXXXXXXXXXXXXXXXXXXXXXXXXXXXX..................... .................................................. maymv 1 fixed 0 newsz 30 dstpo 0 dst 0x........ -> 0x........ (== other) XXXXXXXXX...............................XXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX -.................................................. +XXXXXXXXXXXXXXXXXXXXXXXXXXXXXX.................... .................................................. maymv 1 fixed 0 newsz 30 dstpo 1 dst 0x........ -> 0x........ (== other) XXXXXXXXX...............................XXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX -.................................................. +XXXXXXXXXXXXXXXXXXXXXXXXXXXXXX.................... .................................................. maymv 1 fixed 0 newsz 31 dstpo 0 dst 0x........ -> 0x........ (== other) XXXXXXXXX...............................XXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX -.................................................. +XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX................... .................................................. maymv 1 fixed 0 newsz 31 dstpo 1 dst 0x........ -> 0x........ (== other) XXXXXXXXX...............................XXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX -.................................................. +XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX................... .................................................. ================================================= ./valgrind-new/none/tests/linux/mremap2.stdout.diff2 ================================================= --- mremap2.stdout.exp2 2009-06-13 02:13:09.000000000 +1000 +++ mremap2.stdout.out 2009-06-13 02:22:20.000000000 +1000 @@ -27,38 +27,38 @@ .................................................. .................................................. -maymv 0 fixed 0 newsz 21 dstpo 0 dst 0x........ -> 0x........ (== src) -XXXXXXXXX.XXXXXXXXXXXXXXXXXXXXX.........XXXXXXXXXX +maymv 0 fixed 0 newsz 21 dstpo 0 dst 0x........ -> error 12 +XXXXXXXXX.XXXXXXXXXXXXXXXXXXXX..........XXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX .................................................. .................................................. -maymv 0 fixed 0 newsz 21 dstpo 1 dst 0x........ -> 0x........ (== src) -XXXXXXXXX.XXXXXXXXXXXXXXXXXXXXX.........XXXXXXXXXX +maymv 0 fixed 0 newsz 21 dstpo 1 dst 0x........ -> error 12 +XXXXXXXXX.XXXXXXXXXXXXXXXXXXXX..........XXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX .................................................. .................................................. -maymv 0 fixed 0 newsz 29 dstpo 0 dst 0x........ -> 0x........ (== src) -XXXXXXXXX.XXXXXXXXXXXXXXXXXXXXXXXXXXXXX.XXXXXXXXXX +maymv 0 fixed 0 newsz 29 dstpo 0 dst 0x........ -> error 12 +XXXXXXXXX.XXXXXXXXXXXXXXXXXXXX..........XXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX .................................................. .................................................. -maymv 0 fixed 0 newsz 29 dstpo 1 dst 0x........ -> 0x........ (== src) -XXXXXXXXX.XXXXXXXXXXXXXXXXXXXXXXXXXXXXX.XXXXXXXXXX +maymv 0 fixed 0 newsz 29 dstpo 1 dst 0x........ -> error 12 +XXXXXXXXX.XXXXXXXXXXXXXXXXXXXX..........XXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX .................................................. .................................................. -maymv 0 fixed 0 newsz 30 dstpo 0 dst 0x........ -> 0x........ (== src) -XXXXXXXXX.XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX +maymv 0 fixed 0 newsz 30 dstpo 0 dst 0x........ -> error 12 +XXXXXXXXX.XXXXXXXXXXXXXXXXXXXX..........XXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX .................................................. .................................................. -maymv 0 fixed 0 newsz 30 dstpo 1 dst 0x........ -> 0x........ (== src) -XXXXXXXXX.XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX +maymv 0 fixed 0 newsz 30 dstpo 1 dst 0x........ -> error 12 +XXXXXXXXX.XXXXXXXXXXXXXXXXXXXX..........XXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX .................................................. .................................................. @@ -173,52 +173,52 @@ .................................................. .................................................. -maymv 1 fixed 0 newsz 21 dstpo 0 dst 0x........ -> 0x........ (== src) -XXXXXXXXX.XXXXXXXXXXXXXXXXXXXXX.........XXXXXXXXXX +maymv 1 fixed 0 newsz 21 dstpo 0 dst 0x........ -> 0x........ (== other) +XXXXXXXXX...............................XXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX .................................................. .................................................. -maymv 1 fixed 0 newsz 21 dstpo 1 dst 0x........ -> 0x........ (== src) -XXXXXXXXX.XXXXXXXXXXXXXXXXXXXXX.........XXXXXXXXXX +maymv 1 fixed 0 newsz 21 dstpo 1 dst 0x........ -> 0x........ (== other) +XXXXXXXXX...............................XXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX .................................................. .................................................. -maymv 1 fixed 0 newsz 29 dstpo 0 dst 0x........ -> 0x........ (== src) -XXXXXXXXX.XXXXXXXXXXXXXXXXXXXXXXXXXXXXX.XXXXXXXXXX +maymv 1 fixed 0 newsz 29 dstpo 0 dst 0x........ -> 0x........ (== other) +XXXXXXXXX...............................XXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX -.................................................. +XXXXXXXXXXXXXXXXXXXXXXXXXXXXX..................... .................................................. -maymv 1 fixed 0 newsz 29 dstpo 1 dst 0x........ -> 0x........ (== src) -XXXXXXXXX.XXXXXXXXXXXXXXXXXXXXXXXXXXXXX.XXXXXXXXXX +maymv 1 fixed 0 newsz 29 dstpo 1 dst 0x........ -> 0x........ (== other) +XXXXXXXXX...............................XXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX -.................................................. +XXXXXXXXXXXXXXXXXXXXXXXXXXXXX..................... .................................................. -maymv 1 fixed 0 newsz 30 dstpo 0 dst 0x........ -> 0x........ (== src) -XXXXXXXXX.XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX +maymv 1 fixed 0 newsz 30 dstpo 0 dst 0x........ -> 0x........ (== other) +XXXXXXXXX...............................XXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX -.................................................. +XXXXXXXXXXXXXXXXXXXXXXXXXXXXXX.................... .................................................. <truncated beyond 100 lines> ================================================= ./valgrind-old/none/tests/linux/mremap2.stdout.diff ================================================= --- mremap2.stdout.exp 2009-06-13 02:01:05.000000000 +1000 +++ mremap2.stdout.out 2009-06-13 02:08:01.000000000 +1000 @@ -27,38 +27,38 @@ .................................................. .................................................. -maymv 0 fixed 0 newsz 21 dstpo 0 dst 0x........ -> 0x........ (== src) -XXXXXXXXX.XXXXXXXXXXXXXXXXXXXXX.........XXXXXXXXXX +maymv 0 fixed 0 newsz 21 dstpo 0 dst 0x........ -> error 12 +XXXXXXXXX.XXXXXXXXXXXXXXXXXXXX..........XXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX .................................................. .................................................. -maymv 0 fixed 0 newsz 21 dstpo 1 dst 0x........ -> 0x........ (== src) -XXXXXXXXX.XXXXXXXXXXXXXXXXXXXXX.........XXXXXXXXXX +maymv 0 fixed 0 newsz 21 dstpo 1 dst 0x........ -> error 12 +XXXXXXXXX.XXXXXXXXXXXXXXXXXXXX..........XXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX .................................................. .................................................. -maymv 0 fixed 0 newsz 29 dstpo 0 dst 0x........ -> 0x........ (== src) -XXXXXXXXX.XXXXXXXXXXXXXXXXXXXXXXXXXXXXX.XXXXXXXXXX +maymv 0 fixed 0 newsz 29 dstpo 0 dst 0x........ -> error 12 +XXXXXXXXX.XXXXXXXXXXXXXXXXXXXX..........XXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX .................................................. .................................................. -maymv 0 fixed 0 newsz 29 dstpo 1 dst 0x........ -> 0x........ (== src) -XXXXXXXXX.XXXXXXXXXXXXXXXXXXXXXXXXXXXXX.XXXXXXXXXX +maymv 0 fixed 0 newsz 29 dstpo 1 dst 0x........ -> error 12 +XXXXXXXXX.XXXXXXXXXXXXXXXXXXXX..........XXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX .................................................. .................................................. -maymv 0 fixed 0 newsz 30 dstpo 0 dst 0x........ -> 0x........ (== src) -XXXXXXXXX.XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX +maymv 0 fixed 0 newsz 30 dstpo 0 dst 0x........ -> error 12 +XXXXXXXXX.XXXXXXXXXXXXXXXXXXXX..........XXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX .................................................. .................................................. -maymv 0 fixed 0 newsz 30 dstpo 1 dst 0x........ -> 0x........ (== src) -XXXXXXXXX.XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX +maymv 0 fixed 0 newsz 30 dstpo 1 dst 0x........ -> error 12 +XXXXXXXXX.XXXXXXXXXXXXXXXXXXXX..........XXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX .................................................. .................................................. @@ -173,40 +173,40 @@ .................................................. .................................................. -maymv 1 fixed 0 newsz 21 dstpo 0 dst 0x........ -> 0x........ (== src) -XXXXXXXXX.XXXXXXXXXXXXXXXXXXXXX.........XXXXXXXXXX +maymv 1 fixed 0 newsz 21 dstpo 0 dst 0x........ -> 0x........ (== other) +XXXXXXXXX...............................XXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX .................................................. .................................................. -maymv 1 fixed 0 newsz 21 dstpo 1 dst 0x........ -> 0x........ (== src) -XXXXXXXXX.XXXXXXXXXXXXXXXXXXXXX.........XXXXXXXXXX +maymv 1 fixed 0 newsz 21 dstpo 1 dst 0x........ -> 0x........ (== other) +XXXXXXXXX...............................XXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX .................................................. .................................................. -maymv 1 fixed 0 newsz 29 dstpo 0 dst 0x........ -> 0x........ (== src) -XXXXXXXXX.XXXXXXXXXXXXXXXXXXXXXXXXXXXXX.XXXXXXXXXX +maymv 1 fixed 0 newsz 29 dstpo 0 dst 0x........ -> 0x........ (== other) +XXXXXXXXX...............................XXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX -.................................................. +XXXXXXXXXXXXXXXXXXXXXXXXXXXXX..................... .................................................. -maymv 1 fixed 0 newsz 29 dstpo 1 dst 0x........ -> 0x........ (== src) -XXXXXXXXX.XXXXXXXXXXXXXXXXXXXXXXXXXXXXX.XXXXXXXXXX +maymv 1 fixed 0 newsz 29 dstpo 1 dst 0x........ -> 0x........ (== other) +XXXXXXXXX...............................XXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX -.................................................. +XXXXXXXXXXXXXXXXXXXXXXXXXXXXX..................... .................................................. -maymv 1 fixed 0 newsz 30 dstpo 0 dst 0x........ -> 0x........ (== src) -XXXXXXXXX.XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX +maymv 1 fixed 0 newsz 30 dstpo 0 dst 0x........ -> 0x........ (== other) +XXXXXXXXX...............................XXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX -.................................................. +XXXXXXXXXXXXXXXXXXXXXXXXXXXXXX.................... .................................................. <truncated beyond 100 lines> ================================================= ./valgrind-old/none/tests/linux/mremap2.stdout.diff-glibc28-amd64 ================================================= --- mremap2.stdout.exp-glibc28-amd64 2009-06-13 02:01:05.000000000 +1000 +++ mremap2.stdout.out 2009-06-13 02:08:01.000000000 +1000 @@ -188,37 +188,37 @@ maymv 1 fixed 0 newsz 29 dstpo 0 dst 0x........ -> 0x........ (== other) XXXXXXXXX...............................XXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX -.................................................. +XXXXXXXXXXXXXXXXXXXXXXXXXXXXX..................... .................................................. maymv 1 fixed 0 newsz 29 dstpo 1 dst 0x........ -> 0x........ (== other) XXXXXXXXX...............................XXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX -.................................................. +XXXXXXXXXXXXXXXXXXXXXXXXXXXXX..................... .................................................. maymv 1 fixed 0 newsz 30 dstpo 0 dst 0x........ -> 0x........ (== other) XXXXXXXXX...............................XXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX -.................................................. +XXXXXXXXXXXXXXXXXXXXXXXXXXXXXX.................... .................................................. maymv 1 fixed 0 newsz 30 dstpo 1 dst 0x........ -> 0x........ (== other) XXXXXXXXX...............................XXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX -.................................................. +XXXXXXXXXXXXXXXXXXXXXXXXXXXXXX.................... .................................................. maymv 1 fixed 0 newsz 31 dstpo 0 dst 0x........ -> 0x........ (== other) XXXXXXXXX...............................XXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX -.................................................. +XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX................... .................................................. maymv 1 fixed 0 newsz 31 dstpo 1 dst 0x........ -> 0x........ (== other) XXXXXXXXX...............................XXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX -.................................................. +XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX................... .................................................. ================================================= ./valgrind-old/none/tests/linux/mremap2.stdout.diff2 ================================================= --- mremap2.stdout.exp2 2009-06-13 02:01:05.000000000 +1000 +++ mremap2.stdout.out 2009-06-13 02:08:01.000000000 +1000 @@ -27,38 +27,38 @@ .................................................. .................................................. -maymv 0 fixed 0 newsz 21 dstpo 0 dst 0x........ -> 0x........ (== src) -XXXXXXXXX.XXXXXXXXXXXXXXXXXXXXX.........XXXXXXXXXX +maymv 0 fixed 0 newsz 21 dstpo 0 dst 0x........ -> error 12 +XXXXXXXXX.XXXXXXXXXXXXXXXXXXXX..........XXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX .................................................. .................................................. -maymv 0 fixed 0 newsz 21 dstpo 1 dst 0x........ -> 0x........ (== src) -XXXXXXXXX.XXXXXXXXXXXXXXXXXXXXX.........XXXXXXXXXX +maymv 0 fixed 0 newsz 21 dstpo 1 dst 0x........ -> error 12 +XXXXXXXXX.XXXXXXXXXXXXXXXXXXXX..........XXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX .................................................. .................................................. -maymv 0 fixed 0 newsz 29 dstpo 0 dst 0x........ -> 0x........ (== src) -XXXXXXXXX.XXXXXXXXXXXXXXXXXXXXXXXXXXXXX.XXXXXXXXXX +maymv 0 fixed 0 newsz 29 dstpo 0 dst 0x........ -> error 12 +XXXXXXXXX.XXXXXXXXXXXXXXXXXXXX..........XXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX .................................................. .................................................. -maymv 0 fixed 0 newsz 29 dstpo 1 dst 0x........ -> 0x........ (== src) -XXXXXXXXX.XXXXXXXXXXXXXXXXXXXXXXXXXXXXX.XXXXXXXXXX +maymv 0 fixed 0 newsz 29 dstpo 1 dst 0x........ -> error 12 +XXXXXXXXX.XXXXXXXXXXXXXXXXXXXX..........XXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX .................................................. .................................................. -maymv 0 fixed 0 newsz 30 dstpo 0 dst 0x........ -> 0x........ (== src) -XXXXXXXXX.XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX +maymv 0 fixed 0 newsz 30 dstpo 0 dst 0x........ -> error 12 +XXXXXXXXX.XXXXXXXXXXXXXXXXXXXX..........XXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX .................................................. .................................................. -maymv 0 fixed 0 newsz 30 dstpo 1 dst 0x........ -> 0x........ (== src) -XXXXXXXXX.XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX +maymv 0 fixed 0 newsz 30 dstpo 1 dst 0x........ -> error 12 +XXXXXXXXX.XXXXXXXXXXXXXXXXXXXX..........XXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX .................................................. .................................................. @@ -173,52 +173,52 @@ .................................................. .................................................. -maymv 1 fixed 0 newsz 21 dstpo 0 dst 0x........ -> 0x........ (== src) -XXXXXXXXX.XXXXXXXXXXXXXXXXXXXXX.........XXXXXXXXXX +maymv 1 fixed 0 newsz 21 dstpo 0 dst 0x........ -> 0x........ (== other) +XXXXXXXXX...............................XXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX .................................................. .................................................. -maymv 1 fixed 0 newsz 21 dstpo 1 dst 0x........ -> 0x........ (== src) -XXXXXXXXX.XXXXXXXXXXXXXXXXXXXXX.........XXXXXXXXXX +maymv 1 fixed 0 newsz 21 dstpo 1 dst 0x........ -> 0x........ (== other) +XXXXXXXXX...............................XXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX .................................................. .................................................. -maymv 1 fixed 0 newsz 29 dstpo 0 dst 0x........ -> 0x........ (== src) -XXXXXXXXX.XXXXXXXXXXXXXXXXXXXXXXXXXXXXX.XXXXXXXXXX +maymv 1 fixed 0 newsz 29 dstpo 0 dst 0x........ -> 0x........ (== other) +XXXXXXXXX...............................XXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX -.................................................. +XXXXXXXXXXXXXXXXXXXXXXXXXXXXX..................... .................................................. -maymv 1 fixed 0 newsz 29 dstpo 1 dst 0x........ -> 0x........ (== src) -XXXXXXXXX.XXXXXXXXXXXXXXXXXXXXXXXXXXXXX.XXXXXXXXXX +maymv 1 fixed 0 newsz 29 dstpo 1 dst 0x........ -> 0x........ (== other) +XXXXXXXXX...............................XXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX -.................................................. +XXXXXXXXXXXXXXXXXXXXXXXXXXXXX..................... .................................................. -maymv 1 fixed 0 newsz 30 dstpo 0 dst 0x........ -> 0x........ (== src) -XXXXXXXXX.XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX +maymv 1 fixed 0 newsz 30 dstpo 0 dst 0x........ -> 0x........ (== other) +XXXXXXXXX...............................XXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX -.................................................. +XXXXXXXXXXXXXXXXXXXXXXXXXXXXXX.................... .................................................. <truncated beyond 100 lines> |
|
From: <sv...@va...> - 2009-06-12 11:57:44
|
Author: njn Date: 2009-06-12 12:57:39 +0100 (Fri, 12 Jun 2009) New Revision: 10312 Log: Yet more build system cut+paste avoidance. Modified: branches/BUILD_TWEAKS/helgrind/Makefile.am branches/BUILD_TWEAKS/memcheck/Makefile.am Modified: branches/BUILD_TWEAKS/helgrind/Makefile.am =================================================================== --- branches/BUILD_TWEAKS/helgrind/Makefile.am 2009-06-12 11:31:54 UTC (rev 10311) +++ branches/BUILD_TWEAKS/helgrind/Makefile.am 2009-06-12 11:57:39 UTC (rev 10312) @@ -1,164 +1,96 @@ include $(top_srcdir)/Makefile.tool.am -noinst_PROGRAMS = -noinst_DSYMS = -if VGCONF_PLATFORMS_INCLUDE_X86_LINUX -noinst_PROGRAMS += helgrind-x86-linux vgpreload_helgrind-x86-linux.so -endif -if VGCONF_PLATFORMS_INCLUDE_AMD64_LINUX -noinst_PROGRAMS += helgrind-amd64-linux vgpreload_helgrind-amd64-linux.so -endif -if VGCONF_PLATFORMS_INCLUDE_PPC32_LINUX -noinst_PROGRAMS += helgrind-ppc32-linux vgpreload_helgrind-ppc32-linux.so -endif -if VGCONF_PLATFORMS_INCLUDE_PPC64_LINUX -noinst_PROGRAMS += helgrind-ppc64-linux vgpreload_helgrind-ppc64-linux.so -endif -if VGCONF_PLATFORMS_INCLUDE_PPC32_AIX5 -noinst_PROGRAMS += helgrind-ppc32-aix5 vgpreload_helgrind-ppc32-aix5.so -endif -if VGCONF_PLATFORMS_INCLUDE_PPC64_AIX5 -noinst_PROGRAMS += helgrind-ppc64-aix5 vgpreload_helgrind-ppc64-aix5.so -endif -if VGCONF_PLATFORMS_INCLUDE_X86_DARWIN -noinst_PROGRAMS += helgrind-x86-darwin vgpreload_helgrind-x86-darwin.so -noinst_DSYMS += vgpreload_helgrind-x86-darwin.so -endif -if VGCONF_PLATFORMS_INCLUDE_AMD64_DARWIN -noinst_PROGRAMS += helgrind-amd64-darwin vgpreload_helgrind-amd64-darwin.so -noinst_DSYMS += vgpreload_helgrind-amd64-darwin.so -endif +#---------------------------------------------------------------------------- +# Headers, etc +#---------------------------------------------------------------------------- -VGPRELOAD_HELGRIND_SOURCES_COMMON = hg_intercepts.c +pkginclude_HEADERS = helgrind.h -vgpreload_helgrind_x86_linux_so_SOURCES = $(VGPRELOAD_HELGRIND_SOURCES_COMMON) -vgpreload_helgrind_x86_linux_so_CPPFLAGS = $(AM_CPPFLAGS_X86_LINUX) -vgpreload_helgrind_x86_linux_so_CFLAGS = $(AM_CFLAGS_X86_LINUX) $(AM_CFLAGS_PIC) -vgpreload_helgrind_x86_linux_so_DEPENDENCIES = $(LIBREPLACEMALLOC_X86_LINUX) -vgpreload_helgrind_x86_linux_so_LDFLAGS = \ - $(PRELOAD_LDFLAGS_X86_LINUX) \ - $(LIBREPLACEMALLOC_LDFLAGS_X86_LINUX) +noinst_HEADERS = \ + hg_basics.h hg_lock_n_thread.h hg_errors.h hg_wordset.h \ + libhb.h -vgpreload_helgrind_amd64_linux_so_SOURCES = $(VGPRELOAD_HELGRIND_SOURCES_COMMON) -vgpreload_helgrind_amd64_linux_so_CPPFLAGS = $(AM_CPPFLAGS_AMD64_LINUX) -vgpreload_helgrind_amd64_linux_so_CFLAGS = $(AM_CFLAGS_AMD64_LINUX) $(AM_CFLAGS_PIC) -vgpreload_helgrind_amd64_linux_so_DEPENDENCIES = $(LIBREPLACEMALLOC_AMD64_LINUX) -vgpreload_helgrind_amd64_linux_so_LDFLAGS = \ - $(PRELOAD_LDFLAGS_AMD64_LINUX) \ - $(LIBREPLACEMALLOC_LDFLAGS_AMD64_LINUX) +EXTRA_DIST = README_MSMProp2.txt README_YARD.txt -vgpreload_helgrind_ppc32_linux_so_SOURCES = $(VGPRELOAD_HELGRIND_SOURCES_COMMON) -vgpreload_helgrind_ppc32_linux_so_CPPFLAGS = $(AM_CPPFLAGS_PPC32_LINUX) -vgpreload_helgrind_ppc32_linux_so_CFLAGS = $(AM_CFLAGS_PPC32_LINUX) $(AM_CFLAGS_PIC) -vgpreload_helgrind_ppc32_linux_so_DEPENDENCIES = $(LIBREPLACEMALLOC_PPC32_LINUX) -vgpreload_helgrind_ppc32_linux_so_LDFLAGS = \ - $(PRELOAD_LDFLAGS_PPC32_LINUX) \ - $(LIBREPLACEMALLOC_LDFLAGS_PPC32_LINUX) +#---------------------------------------------------------------------------- +# helgrind-<platform> +#---------------------------------------------------------------------------- -vgpreload_helgrind_ppc64_linux_so_SOURCES = $(VGPRELOAD_HELGRIND_SOURCES_COMMON) -vgpreload_helgrind_ppc64_linux_so_CPPFLAGS = $(AM_CPPFLAGS_PPC64_LINUX) -vgpreload_helgrind_ppc64_linux_so_CFLAGS = $(AM_CFLAGS_PPC64_LINUX) $(AM_CFLAGS_PIC) -vgpreload_helgrind_ppc64_linux_so_DEPENDENCIES = $(LIBREPLACEMALLOC_PPC64_LINUX) -vgpreload_helgrind_ppc64_linux_so_LDFLAGS = \ - $(PRELOAD_LDFLAGS_PPC64_LINUX) \ - $(LIBREPLACEMALLOC_LDFLAGS_PPC64_LINUX) +noinst_PROGRAMS = helgrind-@VGCONF_ARCH_PRI@-@VGCONF_OS@ +if VGCONF_HAVE_PLATFORM_SEC +noinst_PROGRAMS += helgrind-@VGCONF_ARCH_SEC@-@VGCONF_OS@ +endif -vgpreload_helgrind_ppc32_aix5_so_SOURCES = $(VGPRELOAD_HELGRIND_SOURCES_COMMON) -vgpreload_helgrind_ppc32_aix5_so_CPPFLAGS = $(AM_CPPFLAGS_PPC32_AIX5) -vgpreload_helgrind_ppc32_aix5_so_CFLAGS = $(AM_CFLAGS_PPC32_AIX5) $(AM_CFLAGS_PIC) -vgpreload_helgrind_ppc32_aix5_so_DEPENDENCIES = $(LIBREPLACEMALLOC_PPC32_AIX5) -vgpreload_helgrind_ppc32_aix5_so_LDFLAGS = \ - $(PRELOAD_LDFLAGS_PPC32_AIX5) \ - $(LIBREPLACEMALLOC_LDFLAGS_PPC32_AIX5) - -vgpreload_helgrind_ppc64_aix5_so_SOURCES = $(VGPRELOAD_HELGRIND_SOURCES_COMMON) -vgpreload_helgrind_ppc64_aix5_so_CPPFLAGS = $(AM_CPPFLAGS_PPC64_AIX5) -vgpreload_helgrind_ppc64_aix5_so_CFLAGS = $(AM_CFLAGS_PPC64_AIX5) $(AM_CFLAGS_PIC) -vgpreload_helgrind_ppc64_aix5_so_DEPENDENCIES = $(LIBREPLACEMALLOC_PPC64_AIX5) -vgpreload_helgrind_ppc64_aix5_so_LDFLAGS = \ - $(PRELOAD_LDFLAGS_PPC64_AIX5) \ - $(LIBREPLACEMALLOC_LDFLAGS_PPC64_AIX5) - -vgpreload_helgrind_x86_darwin_so_SOURCES = $(VGPRELOAD_HELGRIND_SOURCES_COMMON) -vgpreload_helgrind_x86_darwin_so_CPPFLAGS = $(AM_CPPFLAGS_X86_DARWIN) -vgpreload_helgrind_x86_darwin_so_CFLAGS = $(AM_CFLAGS_X86_DARWIN) $(AM_CFLAGS_PIC) -vgpreload_helgrind_x86_darwin_so_DEPENDENCIES = $(LIBREPLACEMALLOC_X86_DARWIN) -vgpreload_helgrind_x86_darwin_so_LDFLAGS = \ - $(PRELOAD_LDFLAGS_X86_DARWIN) \ - $(LIBREPLACEMALLOC_LDFLAGS_X86_DARWIN) - -vgpreload_helgrind_amd64_darwin_so_SOURCES = $(VGPRELOAD_HELGRIND_SOURCES_COMMON) -vgpreload_helgrind_amd64_darwin_so_CPPFLAGS = $(AM_CPPFLAGS_AMD64_DARWIN) -vgpreload_helgrind_amd64_darwin_so_CFLAGS = $(AM_CFLAGS_AMD64_DARWIN) $(AM_CFLAGS_PIC) -vgpreload_helgrind_amd64_darwin_so_DEPENDENCIES = $(LIBREPLACEMALLOC_AMD64_DARWIN) -vgpreload_helgrind_amd64_darwin_so_LDFLAGS = \ - $(PRELOAD_LDFLAGS_AMD64_DARWIN) \ - $(LIBREPLACEMALLOC_LDFLAGS_AMD64_DARWIN) - HELGRIND_SOURCES_COMMON = \ - hg_basics.c hg_lock_n_thread.c hg_wordset.c libhb_core.c \ - hg_errors.c hg_main.c + hg_basics.c \ + hg_errors.c \ + hg_lock_n_thread.c \ + hg_main.c \ + hg_wordset.c \ + libhb_core.c -helgrind_x86_linux_SOURCES = $(HELGRIND_SOURCES_COMMON) -helgrind_x86_linux_CPPFLAGS = $(AM_CPPFLAGS_X86_LINUX) -helgrind_x86_linux_CFLAGS = $(AM_CFLAGS_X86_LINUX) -O2 -helgrind_x86_linux_DEPENDENCIES = $(COREGRIND_LIBS_X86_LINUX) -helgrind_x86_linux_LDADD = $(TOOL_LDADD_X86_LINUX) -helgrind_x86_linux_LDFLAGS = $(TOOL_LDFLAGS_X86_LINUX) +helgrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_SOURCES = $(HELGRIND_SOURCES_COMMON) +helgrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_CPPFLAGS = \ + $(AM_CPPFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) +helgrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_CFLAGS = \ + $(AM_CFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) -O2 +helgrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_DEPENDENCIES = \ + $(COREGRIND_LIBS_@VGCONF_PLATFORM_PRI_CAPS@) +helgrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_LDADD = \ + $(TOOL_LDADD_@VGCONF_PLATFORM_PRI_CAPS@) +helgrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_LDFLAGS = \ + $(TOOL_LDFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) +if VGCONF_HAVE_PLATFORM_SEC +helgrind_@VGCONF_ARCH_SEC@_@VGCONF_OS@_SOURCES = $(HELGRIND_SOURCES_COMMON) +helgrind_@VGCONF_ARCH_SEC@_@VGCONF_OS@_CPPFLAGS = \ + $(AM_CPPFLAGS_@VGCONF_PLATFORM_SEC_CAPS@) +helgrind_@VGCONF_ARCH_SEC@_@VGCONF_OS@_CFLAGS = \ + $(AM_CFLAGS_@VGCONF_PLATFORM_SEC_CAPS@) -O2 +helgrind_@VGCONF_ARCH_SEC@_@VGCONF_OS@_DEPENDENCIES = \ + $(COREGRIND_LIBS_@VGCONF_PLATFORM_SEC_CAPS@) +helgrind_@VGCONF_ARCH_SEC@_@VGCONF_OS@_LDADD = \ + $(TOOL_LDADD_@VGCONF_PLATFORM_SEC_CAPS@) +helgrind_@VGCONF_ARCH_SEC@_@VGCONF_OS@_LDFLAGS = \ + $(TOOL_LDFLAGS_@VGCONF_PLATFORM_SEC_CAPS@) +endif -helgrind_amd64_linux_SOURCES = $(HELGRIND_SOURCES_COMMON) -helgrind_amd64_linux_CPPFLAGS = $(AM_CPPFLAGS_AMD64_LINUX) -helgrind_amd64_linux_CFLAGS = $(AM_CFLAGS_AMD64_LINUX) -O2 -helgrind_amd64_linux_DEPENDENCIES = $(COREGRIND_LIBS_AMD64_LINUX) -helgrind_amd64_linux_LDADD = $(TOOL_LDADD_AMD64_LINUX) -helgrind_amd64_linux_LDFLAGS = $(TOOL_LDFLAGS_AMD64_LINUX) +#---------------------------------------------------------------------------- +# vgpreload_helgrind_<platform>.so +#---------------------------------------------------------------------------- -helgrind_ppc32_linux_SOURCES = $(HELGRIND_SOURCES_COMMON) -helgrind_ppc32_linux_CPPFLAGS = $(AM_CPPFLAGS_PPC32_LINUX) -helgrind_ppc32_linux_CFLAGS = $(AM_CFLAGS_PPC32_LINUX) -O2 -helgrind_ppc32_linux_DEPENDENCIES = $(COREGRIND_LIBS_PPC32_LINUX) -helgrind_ppc32_linux_LDADD = $(TOOL_LDADD_PPC32_LINUX) -helgrind_ppc32_linux_LDFLAGS = $(TOOL_LDFLAGS_PPC32_LINUX) +noinst_PROGRAMS += vgpreload_helgrind-@VGCONF_ARCH_PRI@-@VGCONF_OS@.so +if VGCONF_HAVE_PLATFORM_SEC +noinst_PROGRAMS += vgpreload_helgrind-@VGCONF_ARCH_SEC@-@VGCONF_OS@.so +endif -helgrind_ppc64_linux_SOURCES = $(HELGRIND_SOURCES_COMMON) -helgrind_ppc64_linux_CPPFLAGS = $(AM_CPPFLAGS_PPC64_LINUX) -helgrind_ppc64_linux_CFLAGS = $(AM_CFLAGS_PPC64_LINUX) -O2 -helgrind_ppc64_linux_DEPENDENCIES = $(COREGRIND_LIBS_PPC64_LINUX) -helgrind_ppc64_linux_LDADD = $(TOOL_LDADD_PPC64_LINUX) -helgrind_ppc64_linux_LDFLAGS = $(TOOL_LDFLAGS_PPC64_LINUX) +if VGCONF_OS_IS_DARWIN +noinst_DSYMS = $(noinst_PROGRAMS) +endif -helgrind_ppc32_aix5_SOURCES = $(HELGRIND_SOURCES_COMMON) -helgrind_ppc32_aix5_CPPFLAGS = $(AM_CPPFLAGS_PPC32_AIX5) -helgrind_ppc32_aix5_CFLAGS = $(AM_CFLAGS_PPC32_AIX5) -O2 -helgrind_ppc32_aix5_DEPENDENCIES = $(COREGRIND_LIBS_PPC32_AIX5) -helgrind_ppc32_aix5_LDADD = $(TOOL_LDADD_PPC32_AIX5) -helgrind_ppc32_aix5_LDFLAGS = $(TOOL_LDFLAGS_PPC32_AIX5) +VGPRELOAD_HELGRIND_SOURCES_COMMON = hg_intercepts.c -helgrind_ppc64_aix5_SOURCES = $(HELGRIND_SOURCES_COMMON) -helgrind_ppc64_aix5_CPPFLAGS = $(AM_CPPFLAGS_PPC64_AIX5) -helgrind_ppc64_aix5_CFLAGS = $(AM_CFLAGS_PPC64_AIX5) -O2 -helgrind_ppc64_aix5_DEPENDENCIES = $(COREGRIND_LIBS_PPC64_AIX5) -helgrind_ppc64_aix5_LDADD = $(TOOL_LDADD_PPC64_AIX5) -helgrind_ppc64_aix5_LDFLAGS = $(TOOL_LDFLAGS_PPC64_AIX5) +vgpreload_helgrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_SOURCES = \ + $(VGPRELOAD_HELGRIND_SOURCES_COMMON) +vgpreload_helgrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_CPPFLAGS = \ + $(AM_CPPFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) +vgpreload_helgrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_CFLAGS = \ + $(AM_CFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) $(AM_CFLAGS_PIC) +vgpreload_helgrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_DEPENDENCIES = \ + $(LIBREPLACEMALLOC_@VGCONF_PLATFORM_PRI_CAPS@) +vgpreload_helgrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_LDFLAGS = \ + $(PRELOAD_LDFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) \ + $(LIBREPLACEMALLOC_LDFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) +if VGCONF_HAVE_PLATFORM_SEC +vgpreload_helgrind_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so_SOURCES = \ + $(VGPRELOAD_HELGRIND_SOURCES_COMMON) +vgpreload_helgrind_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so_CPPFLAGS = \ + $(AM_CPPFLAGS_@VGCONF_PLATFORM_SEC_CAPS@) +vgpreload_helgrind_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so_CFLAGS = \ + $(AM_CFLAGS_@VGCONF_PLATFORM_SEC_CAPS@) $(AM_CFLAGS_PIC) +vgpreload_helgrind_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so_DEPENDENCIES = \ + $(LIBREPLACEMALLOC_@VGCONF_PLATFORM_SEC_CAPS@) +vgpreload_helgrind_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so_LDFLAGS = \ + $(PRELOAD_LDFLAGS_@VGCONF_PLATFORM_SEC_CAPS@) \ + $(LIBREPLACEMALLOC_LDFLAGS_@VGCONF_PLATFORM_SEC_CAPS@) +endif -helgrind_x86_darwin_SOURCES = $(HELGRIND_SOURCES_COMMON) -helgrind_x86_darwin_CPPFLAGS = $(AM_CPPFLAGS_X86_DARWIN) -helgrind_x86_darwin_CFLAGS = $(AM_CFLAGS_X86_DARWIN) -O2 -helgrind_x86_darwin_DEPENDENCIES = $(COREGRIND_LIBS_X86_DARWIN) -helgrind_x86_darwin_LDADD = $(TOOL_LDADD_X86_DARWIN) -helgrind_x86_darwin_LDFLAGS = $(TOOL_LDFLAGS_X86_DARWIN) - -helgrind_amd64_darwin_SOURCES = $(HELGRIND_SOURCES_COMMON) -helgrind_amd64_darwin_CPPFLAGS = $(AM_CPPFLAGS_AMD64_DARWIN) -helgrind_amd64_darwin_CFLAGS = $(AM_CFLAGS_AMD64_DARWIN) -O2 -helgrind_amd64_darwin_DEPENDENCIES = $(COREGRIND_LIBS_AMD64_DARWIN) -helgrind_amd64_darwin_LDADD = $(TOOL_LDADD_AMD64_DARWIN) -helgrind_amd64_darwin_LDFLAGS = $(TOOL_LDFLAGS_AMD64_DARWIN) - -pkginclude_HEADERS = helgrind.h - -noinst_HEADERS = \ - hg_basics.h hg_lock_n_thread.h hg_errors.h hg_wordset.h \ - libhb.h - -EXTRA_DIST = README_MSMProp2.txt README_YARD.txt Modified: branches/BUILD_TWEAKS/memcheck/Makefile.am =================================================================== --- branches/BUILD_TWEAKS/memcheck/Makefile.am 2009-06-12 11:31:54 UTC (rev 10311) +++ branches/BUILD_TWEAKS/memcheck/Makefile.am 2009-06-12 11:57:39 UTC (rev 10312) @@ -34,8 +34,6 @@ $(AM_CPPFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) memcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_CFLAGS = \ $(AM_CFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) -O2 -memcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_CCASFLAGS = \ - $(AM_CCASFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) memcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_DEPENDENCIES = \ $(COREGRIND_LIBS_@VGCONF_PLATFORM_PRI_CAPS@) memcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_LDADD = \ @@ -48,8 +46,6 @@ $(AM_CPPFLAGS_@VGCONF_PLATFORM_SEC_CAPS@) memcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_CFLAGS = \ $(AM_CFLAGS_@VGCONF_PLATFORM_SEC_CAPS@) -O2 -memcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_CCASFLAGS = \ - $(AM_CCASFLAGS_@VGCONF_PLATFORM_SEC_CAPS@) memcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_DEPENDENCIES = \ $(COREGRIND_LIBS_@VGCONF_PLATFORM_SEC_CAPS@) memcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_LDADD = \ @@ -81,8 +77,6 @@ $(AM_CPPFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) vgpreload_memcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_CFLAGS = \ $(AM_CFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) $(AM_CFLAGS_PIC) -O2 -vgpreload_memcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_CCASFLAGS = \ - $(AM_CCASFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) vgpreload_memcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_DEPENDENCIES = \ $(LIBREPLACEMALLOC_@VGCONF_PLATFORM_PRI_CAPS@) vgpreload_memcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_LDFLAGS = \ @@ -95,8 +89,6 @@ $(AM_CPPFLAGS_@VGCONF_PLATFORM_SEC_CAPS@) vgpreload_memcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so_CFLAGS = \ $(AM_CFLAGS_@VGCONF_PLATFORM_SEC_CAPS@) $(AM_CFLAGS_PIC) -O2 -vgpreload_memcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so_CCASFLAGS = \ - $(AM_CCASFLAGS_@VGCONF_PLATFORM_SEC_CAPS@) vgpreload_memcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so_DEPENDENCIES = \ $(LIBREPLACEMALLOC_@VGCONF_PLATFORM_SEC_CAPS@) vgpreload_memcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so_LDFLAGS = \ |
|
From: <sv...@va...> - 2009-06-12 11:32:02
|
Author: njn Date: 2009-06-12 12:31:54 +0100 (Fri, 12 Jun 2009) New Revision: 10311 Log: More cut+paste removal in the build system. Modified: branches/BUILD_TWEAKS/callgrind/Makefile.am branches/BUILD_TWEAKS/drd/Makefile.am branches/BUILD_TWEAKS/helgrind/Makefile.am branches/BUILD_TWEAKS/massif/Makefile.am branches/BUILD_TWEAKS/memcheck/Makefile.am branches/BUILD_TWEAKS/none/Makefile.am Modified: branches/BUILD_TWEAKS/callgrind/Makefile.am =================================================================== --- branches/BUILD_TWEAKS/callgrind/Makefile.am 2009-06-12 07:50:56 UTC (rev 10310) +++ branches/BUILD_TWEAKS/callgrind/Makefile.am 2009-06-12 11:31:54 UTC (rev 10311) @@ -40,8 +40,7 @@ CALLGRIND_CFLAGS_COMMON = -I$(top_srcdir)/cachegrind -clincludedir = $(includedir)/valgrind -clinclude_HEADERS = \ +pkginclude_HEADERS = \ callgrind.h callgrind_x86_linux_SOURCES = $(CALLGRIND_SOURCES_COMMON) $(CALLGRIND_SOURCES_X86) Modified: branches/BUILD_TWEAKS/drd/Makefile.am =================================================================== --- branches/BUILD_TWEAKS/drd/Makefile.am 2009-06-12 07:50:56 UTC (rev 10310) +++ branches/BUILD_TWEAKS/drd/Makefile.am 2009-06-12 11:31:54 UTC (rev 10311) @@ -131,10 +131,8 @@ drd_semaphore.c \ drd_suppression.c -drdincludedir = $(includedir)/valgrind +pkginclude_HEADERS = drd.h -drdinclude_HEADERS = drd.h - noinst_HEADERS = \ drd_barrier.h \ drd_basics.h \ Modified: branches/BUILD_TWEAKS/helgrind/Makefile.am =================================================================== --- branches/BUILD_TWEAKS/helgrind/Makefile.am 2009-06-12 07:50:56 UTC (rev 10310) +++ branches/BUILD_TWEAKS/helgrind/Makefile.am 2009-06-12 11:31:54 UTC (rev 10311) @@ -155,10 +155,8 @@ helgrind_amd64_darwin_LDADD = $(TOOL_LDADD_AMD64_DARWIN) helgrind_amd64_darwin_LDFLAGS = $(TOOL_LDFLAGS_AMD64_DARWIN) -hgincludedir = $(includedir)/valgrind +pkginclude_HEADERS = helgrind.h -hginclude_HEADERS = helgrind.h - noinst_HEADERS = \ hg_basics.h hg_lock_n_thread.h hg_errors.h hg_wordset.h \ libhb.h Modified: branches/BUILD_TWEAKS/massif/Makefile.am =================================================================== --- branches/BUILD_TWEAKS/massif/Makefile.am 2009-06-12 07:50:56 UTC (rev 10310) +++ branches/BUILD_TWEAKS/massif/Makefile.am 2009-06-12 11:31:54 UTC (rev 10311) @@ -13,7 +13,9 @@ noinst_PROGRAMS += massif-@VGCONF_ARCH_SEC@-@VGCONF_OS@ endif -massif_@VGCONF_ARCH_PRI@_@VGCONF_OS@_SOURCES = ms_main.c +MASSIF_SOURCES_COMMON = ms_main.c + +massif_@VGCONF_ARCH_PRI@_@VGCONF_OS@_SOURCES = $(MASSIF_SOURCES_COMMON) massif_@VGCONF_ARCH_PRI@_@VGCONF_OS@_CPPFLAGS = \ $(AM_CPPFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) massif_@VGCONF_ARCH_PRI@_@VGCONF_OS@_CFLAGS = \ @@ -25,7 +27,7 @@ massif_@VGCONF_ARCH_PRI@_@VGCONF_OS@_LDFLAGS = \ $(TOOL_LDFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) if VGCONF_HAVE_PLATFORM_SEC -massif_@VGCONF_ARCH_SEC@_@VGCONF_OS@_SOURCES = ms_main.c +massif_@VGCONF_ARCH_SEC@_@VGCONF_OS@_SOURCES = $(MASSIF_SOURCES_COMMON) massif_@VGCONF_ARCH_SEC@_@VGCONF_OS@_CPPFLAGS = \ $(AM_CPPFLAGS_@VGCONF_PLATFORM_SEC_CAPS@) massif_@VGCONF_ARCH_SEC@_@VGCONF_OS@_CFLAGS = \ Modified: branches/BUILD_TWEAKS/memcheck/Makefile.am =================================================================== --- branches/BUILD_TWEAKS/memcheck/Makefile.am 2009-06-12 07:50:56 UTC (rev 10310) +++ branches/BUILD_TWEAKS/memcheck/Makefile.am 2009-06-12 11:31:54 UTC (rev 10311) @@ -2,109 +2,25 @@ SUBDIRS += perf -noinst_PROGRAMS = -noinst_DSYMS = -if VGCONF_PLATFORMS_INCLUDE_X86_LINUX -noinst_PROGRAMS += memcheck-x86-linux vgpreload_memcheck-x86-linux.so -endif -if VGCONF_PLATFORMS_INCLUDE_AMD64_LINUX -noinst_PROGRAMS += memcheck-amd64-linux vgpreload_memcheck-amd64-linux.so -endif -if VGCONF_PLATFORMS_INCLUDE_PPC32_LINUX -noinst_PROGRAMS += memcheck-ppc32-linux vgpreload_memcheck-ppc32-linux.so -endif -if VGCONF_PLATFORMS_INCLUDE_PPC64_LINUX -noinst_PROGRAMS += memcheck-ppc64-linux vgpreload_memcheck-ppc64-linux.so -endif -if VGCONF_PLATFORMS_INCLUDE_PPC32_AIX5 -noinst_PROGRAMS += memcheck-ppc32-aix5 vgpreload_memcheck-ppc32-aix5.so -endif -if VGCONF_PLATFORMS_INCLUDE_PPC64_AIX5 -noinst_PROGRAMS += memcheck-ppc64-aix5 vgpreload_memcheck-ppc64-aix5.so -endif -if VGCONF_PLATFORMS_INCLUDE_X86_DARWIN -noinst_PROGRAMS += memcheck-x86-darwin vgpreload_memcheck-x86-darwin.so -noinst_DSYMS += vgpreload_memcheck-x86-darwin.so -endif -if VGCONF_PLATFORMS_INCLUDE_AMD64_DARWIN -noinst_PROGRAMS += memcheck-amd64-darwin vgpreload_memcheck-amd64-darwin.so -noinst_DSYMS += vgpreload_memcheck-amd64-darwin.so -endif +#---------------------------------------------------------------------------- +# Headers +#---------------------------------------------------------------------------- -VGPRELOAD_MEMCHECK_SOURCES_COMMON = mc_replace_strmem.c +pkginclude_HEADERS = \ + memcheck.h -vgpreload_memcheck_x86_linux_so_SOURCES = $(VGPRELOAD_MEMCHECK_SOURCES_COMMON) -vgpreload_memcheck_x86_linux_so_CPPFLAGS = $(AM_CPPFLAGS_X86_LINUX) -vgpreload_memcheck_x86_linux_so_CFLAGS = $(AM_CFLAGS_X86_LINUX) $(AM_CFLAGS_PIC) -O2 -vgpreload_memcheck_x86_linux_so_CCASFLAGS = $(AM_CCASFLAGS_X86_LINUX) -vgpreload_memcheck_x86_linux_so_DEPENDENCIES = $(LIBREPLACEMALLOC_X86_LINUX) -vgpreload_memcheck_x86_linux_so_LDFLAGS = \ - $(PRELOAD_LDFLAGS_X86_LINUX) \ - $(LIBREPLACEMALLOC_LDFLAGS_X86_LINUX) +noinst_HEADERS = \ + mc_include.h -vgpreload_memcheck_amd64_linux_so_SOURCES = $(VGPRELOAD_MEMCHECK_SOURCES_COMMON) -vgpreload_memcheck_amd64_linux_so_CPPFLAGS = $(AM_CPPFLAGS_AMD64_LINUX) -vgpreload_memcheck_amd64_linux_so_CFLAGS = $(AM_CFLAGS_AMD64_LINUX) $(AM_CFLAGS_PIC) -O2 -vgpreload_memcheck_amd64_linux_so_CCASFLAGS = $(AM_CCASFLAGS_AMD64_LINUX) -vgpreload_memcheck_amd64_linux_so_DEPENDENCIES = $(LIBREPLACEMALLOC_AMD64_LINUX) -vgpreload_memcheck_amd64_linux_so_LDFLAGS = \ - $(PRELOAD_LDFLAGS_AMD64_LINUX) \ - $(LIBREPLACEMALLOC_LDFLAGS_AMD64_LINUX) +#---------------------------------------------------------------------------- +# memcheck-<platform> +#---------------------------------------------------------------------------- -vgpreload_memcheck_ppc32_linux_so_SOURCES = $(VGPRELOAD_MEMCHECK_SOURCES_COMMON) -vgpreload_memcheck_ppc32_linux_so_CPPFLAGS = $(AM_CPPFLAGS_PPC32_LINUX) -vgpreload_memcheck_ppc32_linux_so_CFLAGS = $(AM_CFLAGS_PPC32_LINUX) $(AM_CFLAGS_PIC) -O2 -vgpreload_memcheck_ppc32_linux_so_CCASFLAGS = $(AM_CCASFLAGS_PPC32_LINUX) -vgpreload_memcheck_ppc32_linux_so_DEPENDENCIES = $(LIBREPLACEMALLOC_PPC32_LINUX) -vgpreload_memcheck_ppc32_linux_so_LDFLAGS = \ - $(PRELOAD_LDFLAGS_PPC32_LINUX) \ - $(LIBREPLACEMALLOC_LDFLAGS_PPC32_LINUX) +noinst_PROGRAMS = memcheck-@VGCONF_ARCH_PRI@-@VGCONF_OS@ +if VGCONF_HAVE_PLATFORM_SEC +noinst_PROGRAMS += memcheck-@VGCONF_ARCH_SEC@-@VGCONF_OS@ +endif -vgpreload_memcheck_ppc64_linux_so_SOURCES = $(VGPRELOAD_MEMCHECK_SOURCES_COMMON) -vgpreload_memcheck_ppc64_linux_so_CPPFLAGS = $(AM_CPPFLAGS_PPC64_LINUX) -vgpreload_memcheck_ppc64_linux_so_CFLAGS = $(AM_CFLAGS_PPC64_LINUX) $(AM_CFLAGS_PIC) -O2 -vgpreload_memcheck_ppc64_linux_so_CCASFLAGS = $(AM_CCASFLAGS_PPC64_LINUX) -vgpreload_memcheck_ppc64_linux_so_DEPENDENCIES = $(LIBREPLACEMALLOC_PPC64_LINUX) -vgpreload_memcheck_ppc64_linux_so_LDFLAGS = \ - $(PRELOAD_LDFLAGS_PPC64_LINUX) \ - $(LIBREPLACEMALLOC_LDFLAGS_PPC64_LINUX) - -vgpreload_memcheck_ppc32_aix5_so_SOURCES = $(VGPRELOAD_MEMCHECK_SOURCES_COMMON) -vgpreload_memcheck_ppc32_aix5_so_CPPFLAGS = $(AM_CPPFLAGS_PPC32_AIX5) -vgpreload_memcheck_ppc32_aix5_so_CFLAGS = $(AM_CFLAGS_PPC32_AIX5) $(AM_CFLAGS_PIC) -O2 -vgpreload_memcheck_ppc32_aix5_so_CCASFLAGS = $(AM_CCASFLAGS_PPC32_AIX5) -vgpreload_memcheck_ppc32_aix5_so_DEPENDENCIES = $(LIBREPLACEMALLOC_PPC32_AIX5) -vgpreload_memcheck_ppc32_aix5_so_LDFLAGS = \ - $(PRELOAD_LDFLAGS_PPC32_AIX5) \ - $(LIBREPLACEMALLOC_LDFLAGS_PPC32_AIX5) - -vgpreload_memcheck_ppc64_aix5_so_SOURCES = $(VGPRELOAD_MEMCHECK_SOURCES_COMMON) -vgpreload_memcheck_ppc64_aix5_so_CPPFLAGS = $(AM_CPPFLAGS_PPC64_AIX5) -vgpreload_memcheck_ppc64_aix5_so_CFLAGS = $(AM_CFLAGS_PPC64_AIX5) $(AM_CFLAGS_PIC) -O2 -vgpreload_memcheck_ppc64_aix5_so_CCASFLAGS = $(AM_CCASFLAGS_PPC64_AIX5) -vgpreload_memcheck_ppc64_aix5_so_DEPENDENCIES = $(LIBREPLACEMALLOC_PPC64_AIX5) -vgpreload_memcheck_ppc64_aix5_so_LDFLAGS = \ - $(PRELOAD_LDFLAGS_PPC64_AIX5) \ - $(LIBREPLACEMALLOC_LDFLAGS_PPC64_AIX5) - -vgpreload_memcheck_x86_darwin_so_SOURCES = $(VGPRELOAD_MEMCHECK_SOURCES_COMMON) -vgpreload_memcheck_x86_darwin_so_CPPFLAGS = $(AM_CPPFLAGS_X86_DARWIN) -vgpreload_memcheck_x86_darwin_so_CFLAGS = $(AM_CFLAGS_X86_DARWIN) $(AM_CFLAGS_PIC) -O2 -vgpreload_memcheck_x86_darwin_so_CCASFLAGS = $(AM_CCASFLAGS_X86_DARWIN) -vgpreload_memcheck_x86_darwin_so_DEPENDENCIES = $(LIBREPLACEMALLOC_X86_DARWIN) -vgpreload_memcheck_x86_darwin_so_LDFLAGS = \ - $(PRELOAD_LDFLAGS_X86_DARWIN) \ - $(LIBREPLACEMALLOC_LDFLAGS_X86_DARWIN) - -vgpreload_memcheck_amd64_darwin_so_SOURCES = $(VGPRELOAD_MEMCHECK_SOURCES_COMMON) -vgpreload_memcheck_amd64_darwin_so_CPPFLAGS = $(AM_CPPFLAGS_AMD64_DARWIN) -vgpreload_memcheck_amd64_darwin_so_CFLAGS = $(AM_CFLAGS_AMD64_DARWIN) $(AM_CFLAGS_PIC) -O2 -vgpreload_memcheck_amd64_darwin_so_CCASFLAGS = $(AM_CCASFLAGS_AMD64_DARWIN) -vgpreload_memcheck_amd64_darwin_so_DEPENDENCIES = $(LIBREPLACEMALLOC_AMD64_DARWIN) -vgpreload_memcheck_amd64_darwin_so_LDFLAGS = \ - $(PRELOAD_LDFLAGS_AMD64_DARWIN) \ - $(LIBREPLACEMALLOC_LDFLAGS_AMD64_DARWIN) - MEMCHECK_SOURCES_COMMON = \ mc_leakcheck.c \ mc_malloc_wrappers.c \ @@ -113,78 +29,80 @@ mc_machine.c \ mc_errors.c -memcheck_x86_linux_SOURCES = $(MEMCHECK_SOURCES_COMMON) -memcheck_x86_linux_CPPFLAGS = $(AM_CPPFLAGS_X86_LINUX) -memcheck_x86_linux_CFLAGS = $(AM_CFLAGS_X86_LINUX) -O2 -memcheck_x86_linux_CCASFLAGS = $(AM_CCASFLAGS_X86_LINUX) -memcheck_x86_linux_DEPENDENCIES = $(COREGRIND_LIBS_X86_LINUX) -memcheck_x86_linux_LDADD = $(TOOL_LDADD_X86_LINUX) -memcheck_x86_linux_LDFLAGS = $(TOOL_LDFLAGS_X86_LINUX) +memcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_SOURCES = $(MEMCHECK_SOURCES_COMMON) +memcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_CPPFLAGS = \ + $(AM_CPPFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) +memcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_CFLAGS = \ + $(AM_CFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) -O2 +memcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_CCASFLAGS = \ + $(AM_CCASFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) +memcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_DEPENDENCIES = \ + $(COREGRIND_LIBS_@VGCONF_PLATFORM_PRI_CAPS@) +memcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_LDADD = \ + $(TOOL_LDADD_@VGCONF_PLATFORM_PRI_CAPS@) +memcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_LDFLAGS = \ + $(TOOL_LDFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) +if VGCONF_HAVE_PLATFORM_SEC +memcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_SOURCES = $(MEMCHECK_SOURCES_COMMON) +memcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_CPPFLAGS = \ + $(AM_CPPFLAGS_@VGCONF_PLATFORM_SEC_CAPS@) +memcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_CFLAGS = \ + $(AM_CFLAGS_@VGCONF_PLATFORM_SEC_CAPS@) -O2 +memcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_CCASFLAGS = \ + $(AM_CCASFLAGS_@VGCONF_PLATFORM_SEC_CAPS@) +memcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_DEPENDENCIES = \ + $(COREGRIND_LIBS_@VGCONF_PLATFORM_SEC_CAPS@) +memcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_LDADD = \ + $(TOOL_LDADD_@VGCONF_PLATFORM_SEC_CAPS@) +memcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_LDFLAGS = \ + $(TOOL_LDFLAGS_@VGCONF_PLATFORM_SEC_CAPS@) +endif -memcheck_amd64_linux_SOURCES = $(MEMCHECK_SOURCES_COMMON) -memcheck_amd64_linux_CPPFLAGS = $(AM_CPPFLAGS_AMD64_LINUX) -memcheck_amd64_linux_CFLAGS = $(AM_CFLAGS_AMD64_LINUX) -O2 -memcheck_amd64_linux_CCASFLAGS = $(AM_CCASFLAGS_AMD64_LINUX) -memcheck_amd64_linux_DEPENDENCIES = $(COREGRIND_LIBS_AMD64_LINUX) -memcheck_amd64_linux_LDADD = $(TOOL_LDADD_AMD64_LINUX) -memcheck_amd64_linux_LDFLAGS = $(TOOL_LDFLAGS_AMD64_LINUX) +mc_main.o: CFLAGS += -fomit-frame-pointer -memcheck_ppc32_linux_SOURCES = $(MEMCHECK_SOURCES_COMMON) -memcheck_ppc32_linux_CPPFLAGS = $(AM_CPPFLAGS_PPC32_LINUX) -memcheck_ppc32_linux_CFLAGS = $(AM_CFLAGS_PPC32_LINUX) -O2 -memcheck_ppc32_linux_CCASFLAGS = $(AM_CCASFLAGS_PPC32_LINUX) -memcheck_ppc32_linux_DEPENDENCIES = $(COREGRIND_LIBS_PPC32_LINUX) -memcheck_ppc32_linux_LDADD = $(TOOL_LDADD_PPC32_LINUX) -memcheck_ppc32_linux_LDFLAGS = $(TOOL_LDFLAGS_PPC32_LINUX) +#---------------------------------------------------------------------------- +# vgpreload_memcheck_<platform>.so +#---------------------------------------------------------------------------- -memcheck_ppc64_linux_SOURCES = $(MEMCHECK_SOURCES_COMMON) -memcheck_ppc64_linux_CPPFLAGS = $(AM_CPPFLAGS_PPC64_LINUX) -memcheck_ppc64_linux_CFLAGS = $(AM_CFLAGS_PPC64_LINUX) -O2 -memcheck_ppc64_linux_CCASFLAGS = $(AM_CCASFLAGS_PPC64_LINUX) -memcheck_ppc64_linux_DEPENDENCIES = $(COREGRIND_LIBS_PPC64_LINUX) -memcheck_ppc64_linux_LDADD = $(TOOL_LDADD_PPC64_LINUX) -memcheck_ppc64_linux_LDFLAGS = $(TOOL_LDFLAGS_PPC64_LINUX) +noinst_PROGRAMS += vgpreload_memcheck-@VGCONF_ARCH_PRI@-@VGCONF_OS@.so +if VGCONF_HAVE_PLATFORM_SEC +noinst_PROGRAMS += vgpreload_memcheck-@VGCONF_ARCH_SEC@-@VGCONF_OS@.so +endif -memcheck_ppc32_aix5_SOURCES = $(MEMCHECK_SOURCES_COMMON) -memcheck_ppc32_aix5_CPPFLAGS = $(AM_CPPFLAGS_PPC32_AIX5) -memcheck_ppc32_aix5_CFLAGS = $(AM_CFLAGS_PPC32_AIX5) -O2 -memcheck_ppc32_aix5_CCASFLAGS = $(AM_CCASFLAGS_PPC32_AIX5) -memcheck_ppc32_aix5_DEPENDENCIES = $(COREGRIND_LIBS_PPC32_AIX5) -memcheck_ppc32_aix5_LDADD = $(TOOL_LDADD_PPC32_AIX5) -memcheck_ppc32_aix5_LDFLAGS = $(TOOL_LDFLAGS_PPC32_AIX5) +if VGCONF_OS_IS_DARWIN +noinst_DSYMS = $(noinst_PROGRAMS) +endif -memcheck_ppc64_aix5_SOURCES = $(MEMCHECK_SOURCES_COMMON) -memcheck_ppc64_aix5_CPPFLAGS = $(AM_CPPFLAGS_PPC64_AIX5) -memcheck_ppc64_aix5_CFLAGS = $(AM_CFLAGS_PPC64_AIX5) -O2 -memcheck_ppc64_aix5_CCASFLAGS = $(AM_CCASFLAGS_PPC64_AIX5) -memcheck_ppc64_aix5_DEPENDENCIES = $(COREGRIND_LIBS_PPC64_AIX5) -memcheck_ppc64_aix5_LDADD = $(TOOL_LDADD_PPC64_AIX5) -memcheck_ppc64_aix5_LDFLAGS = $(TOOL_LDFLAGS_PPC64_AIX5) +VGPRELOAD_MEMCHECK_SOURCES_COMMON = mc_replace_strmem.c -memcheck_x86_darwin_SOURCES = $(MEMCHECK_SOURCES_COMMON) -memcheck_x86_darwin_CPPFLAGS = $(AM_CPPFLAGS_X86_DARWIN) -memcheck_x86_darwin_CFLAGS = $(AM_CFLAGS_X86_DARWIN) -O2 -memcheck_x86_darwin_CCASFLAGS = $(AM_CCASFLAGS_X86_DARWIN) -memcheck_x86_darwin_DEPENDENCIES = $(COREGRIND_LIBS_X86_DARWIN) -memcheck_x86_darwin_LDADD = $(TOOL_LDADD_X86_DARWIN) -memcheck_x86_darwin_LDFLAGS = $(TOOL_LDFLAGS_X86_DARWIN) +vgpreload_memcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_SOURCES = \ + $(VGPRELOAD_MEMCHECK_SOURCES_COMMON) +vgpreload_memcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_CPPFLAGS = \ + $(AM_CPPFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) +vgpreload_memcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_CFLAGS = \ + $(AM_CFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) $(AM_CFLAGS_PIC) -O2 +vgpreload_memcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_CCASFLAGS = \ + $(AM_CCASFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) +vgpreload_memcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_DEPENDENCIES = \ + $(LIBREPLACEMALLOC_@VGCONF_PLATFORM_PRI_CAPS@) +vgpreload_memcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_LDFLAGS = \ + $(PRELOAD_LDFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) \ + $(LIBREPLACEMALLOC_LDFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) +if VGCONF_HAVE_PLATFORM_SEC +vgpreload_memcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so_SOURCES = \ + $(VGPRELOAD_MEMCHECK_SOURCES_COMMON) +vgpreload_memcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so_CPPFLAGS = \ + $(AM_CPPFLAGS_@VGCONF_PLATFORM_SEC_CAPS@) +vgpreload_memcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so_CFLAGS = \ + $(AM_CFLAGS_@VGCONF_PLATFORM_SEC_CAPS@) $(AM_CFLAGS_PIC) -O2 +vgpreload_memcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so_CCASFLAGS = \ + $(AM_CCASFLAGS_@VGCONF_PLATFORM_SEC_CAPS@) +vgpreload_memcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so_DEPENDENCIES = \ + $(LIBREPLACEMALLOC_@VGCONF_PLATFORM_SEC_CAPS@) +vgpreload_memcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so_LDFLAGS = \ + $(PRELOAD_LDFLAGS_@VGCONF_PLATFORM_SEC_CAPS@) \ + $(LIBREPLACEMALLOC_LDFLAGS_@VGCONF_PLATFORM_SEC_CAPS@) +endif -memcheck_amd64_darwin_SOURCES = $(MEMCHECK_SOURCES_COMMON) -memcheck_amd64_darwin_CPPFLAGS = $(AM_CPPFLAGS_AMD64_DARWIN) -memcheck_amd64_darwin_CFLAGS = $(AM_CFLAGS_AMD64_DARWIN) -O2 -memcheck_amd64_darwin_CCASFLAGS = $(AM_CCASFLAGS_AMD64_DARWIN) -memcheck_amd64_darwin_DEPENDENCIES = $(COREGRIND_LIBS_AMD64_DARWIN) -memcheck_amd64_darwin_LDADD = $(TOOL_LDADD_AMD64_DARWIN) -memcheck_amd64_darwin_LDFLAGS = $(TOOL_LDFLAGS_AMD64_DARWIN) - -mcincludedir = $(includedir)/valgrind - -mcinclude_HEADERS = \ - memcheck.h - -noinst_HEADERS = \ - mc_include.h - mc_replace_strmem.o: CFLAGS += -fno-omit-frame-pointer -mc_main.o: CFLAGS += -fomit-frame-pointer Modified: branches/BUILD_TWEAKS/none/Makefile.am =================================================================== --- branches/BUILD_TWEAKS/none/Makefile.am 2009-06-12 07:50:56 UTC (rev 10310) +++ branches/BUILD_TWEAKS/none/Makefile.am 2009-06-12 11:31:54 UTC (rev 10311) @@ -1,85 +1,39 @@ include $(top_srcdir)/Makefile.tool.am -noinst_PROGRAMS = -if VGCONF_PLATFORMS_INCLUDE_X86_LINUX -noinst_PROGRAMS += none-x86-linux +#---------------------------------------------------------------------------- +# none-<platform> +#---------------------------------------------------------------------------- + +noinst_PROGRAMS = none-@VGCONF_ARCH_PRI@-@VGCONF_OS@ +if VGCONF_HAVE_PLATFORM_SEC +noinst_PROGRAMS += none-@VGCONF_ARCH_SEC@-@VGCONF_OS@ endif -if VGCONF_PLATFORMS_INCLUDE_AMD64_LINUX -noinst_PROGRAMS += none-amd64-linux -endif -if VGCONF_PLATFORMS_INCLUDE_PPC32_LINUX -noinst_PROGRAMS += none-ppc32-linux -endif -if VGCONF_PLATFORMS_INCLUDE_PPC64_LINUX -noinst_PROGRAMS += none-ppc64-linux -endif -if VGCONF_PLATFORMS_INCLUDE_PPC32_AIX5 -noinst_PROGRAMS += none-ppc32-aix5 -endif -if VGCONF_PLATFORMS_INCLUDE_PPC64_AIX5 -noinst_PROGRAMS += none-ppc64-aix5 -endif -if VGCONF_PLATFORMS_INCLUDE_X86_DARWIN -noinst_PROGRAMS += none-x86-darwin -endif -if VGCONF_PLATFORMS_INCLUDE_AMD64_DARWIN -noinst_PROGRAMS += none-amd64-darwin -endif NONE_SOURCES_COMMON = nl_main.c -none_x86_linux_SOURCES = $(NONE_SOURCES_COMMON) -none_x86_linux_CPPFLAGS = $(AM_CPPFLAGS_X86_LINUX) -none_x86_linux_CFLAGS = $(AM_CFLAGS_X86_LINUX) -none_x86_linux_DEPENDENCIES = $(COREGRIND_LIBS_X86_LINUX) -none_x86_linux_LDADD = $(TOOL_LDADD_X86_LINUX) -none_x86_linux_LDFLAGS = $(TOOL_LDFLAGS_X86_LINUX) +none_@VGCONF_ARCH_PRI@_@VGCONF_OS@_SOURCES = $(NONE_SOURCES_COMMON) +none_@VGCONF_ARCH_PRI@_@VGCONF_OS@_CPPFLAGS = \ + $(AM_CPPFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) +none_@VGCONF_ARCH_PRI@_@VGCONF_OS@_CFLAGS = \ + $(AM_CFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) +none_@VGCONF_ARCH_PRI@_@VGCONF_OS@_DEPENDENCIES = \ + $(COREGRIND_LIBS_@VGCONF_PLATFORM_PRI_CAPS@) +none_@VGCONF_ARCH_PRI@_@VGCONF_OS@_LDADD = \ + $(TOOL_LDADD_@VGCONF_PLATFORM_PRI_CAPS@) +none_@VGCONF_ARCH_PRI@_@VGCONF_OS@_LDFLAGS = \ + $(TOOL_LDFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) +if VGCONF_HAVE_PLATFORM_SEC +none_@VGCONF_ARCH_SEC@_@VGCONF_OS@_SOURCES = $(NONE_SOURCES_COMMON) +none_@VGCONF_ARCH_SEC@_@VGCONF_OS@_CPPFLAGS = \ + $(AM_CPPFLAGS_@VGCONF_PLATFORM_SEC_CAPS@) +none_@VGCONF_ARCH_SEC@_@VGCONF_OS@_CFLAGS = \ + $(AM_CFLAGS_@VGCONF_PLATFORM_SEC_CAPS@) +none_@VGCONF_ARCH_SEC@_@VGCONF_OS@_DEPENDENCIES = \ + $(COREGRIND_LIBS_@VGCONF_PLATFORM_SEC_CAPS@) +none_@VGCONF_ARCH_SEC@_@VGCONF_OS@_LDADD = \ + $(TOOL_LDADD_@VGCONF_PLATFORM_SEC_CAPS@) +none_@VGCONF_ARCH_SEC@_@VGCONF_OS@_LDFLAGS = \ + $(TOOL_LDFLAGS_@VGCONF_PLATFORM_SEC_CAPS@) +endif -none_amd64_linux_SOURCES = $(NONE_SOURCES_COMMON) -none_amd64_linux_CPPFLAGS = $(AM_CPPFLAGS_AMD64_LINUX) -none_amd64_linux_CFLAGS = $(AM_CFLAGS_AMD64_LINUX) -none_amd64_linux_DEPENDENCIES = $(COREGRIND_LIBS_AMD64_LINUX) -none_amd64_linux_LDADD = $(TOOL_LDADD_AMD64_LINUX) -none_amd64_linux_LDFLAGS = $(TOOL_LDFLAGS_AMD64_LINUX) -none_ppc32_linux_SOURCES = $(NONE_SOURCES_COMMON) -none_ppc32_linux_CPPFLAGS = $(AM_CPPFLAGS_PPC32_LINUX) -none_ppc32_linux_CFLAGS = $(AM_CFLAGS_PPC32_LINUX) -none_ppc32_linux_DEPENDENCIES = $(COREGRIND_LIBS_PPC32_LINUX) -none_ppc32_linux_LDADD = $(TOOL_LDADD_PPC32_LINUX) -none_ppc32_linux_LDFLAGS = $(TOOL_LDFLAGS_PPC32_LINUX) - -none_ppc64_linux_SOURCES = $(NONE_SOURCES_COMMON) -none_ppc64_linux_CPPFLAGS = $(AM_CPPFLAGS_PPC64_LINUX) -none_ppc64_linux_CFLAGS = $(AM_CFLAGS_PPC64_LINUX) -none_ppc64_linux_DEPENDENCIES = $(COREGRIND_LIBS_PPC64_LINUX) -none_ppc64_linux_LDADD = $(TOOL_LDADD_PPC64_LINUX) -none_ppc64_linux_LDFLAGS = $(TOOL_LDFLAGS_PPC64_LINUX) - -none_ppc32_aix5_SOURCES = $(NONE_SOURCES_COMMON) -none_ppc32_aix5_CPPFLAGS = $(AM_CPPFLAGS_PPC32_AIX5) -none_ppc32_aix5_CFLAGS = $(AM_CFLAGS_PPC32_AIX5) -none_ppc32_aix5_DEPENDENCIES = $(COREGRIND_LIBS_PPC32_AIX5) -none_ppc32_aix5_LDADD = $(TOOL_LDADD_PPC32_AIX5) -none_ppc32_aix5_LDFLAGS = $(TOOL_LDFLAGS_PPC32_AIX5) - -none_ppc64_aix5_SOURCES = $(NONE_SOURCES_COMMON) -none_ppc64_aix5_CPPFLAGS = $(AM_CPPFLAGS_PPC64_AIX5) -none_ppc64_aix5_CFLAGS = $(AM_CFLAGS_PPC64_AIX5) -none_ppc64_aix5_DEPENDENCIES = $(COREGRIND_LIBS_PPC64_AIX5) -none_ppc64_aix5_LDADD = $(TOOL_LDADD_PPC64_AIX5) -none_ppc64_aix5_LDFLAGS = $(TOOL_LDFLAGS_PPC64_AIX5) - -none_x86_darwin_SOURCES = $(NONE_SOURCES_COMMON) -none_x86_darwin_CPPFLAGS = $(AM_CPPFLAGS_X86_DARWIN) -none_x86_darwin_CFLAGS = $(AM_CFLAGS_X86_DARWIN) -none_x86_darwin_DEPENDENCIES = $(COREGRIND_LIBS_X86_DARWIN) -none_x86_darwin_LDADD = $(TOOL_LDADD_X86_DARWIN) -none_x86_darwin_LDFLAGS = $(TOOL_LDFLAGS_X86_DARWIN) - -none_amd64_darwin_SOURCES = $(NONE_SOURCES_COMMON) -none_amd64_darwin_CPPFLAGS = $(AM_CPPFLAGS_AMD64_DARWIN) -none_amd64_darwin_CFLAGS = $(AM_CFLAGS_AMD64_DARWIN) -none_amd64_darwin_DEPENDENCIES = $(COREGRIND_LIBS_AMD64_DARWIN) -none_amd64_darwin_LDADD = $(TOOL_LDADD_AMD64_DARWIN) -none_amd64_darwin_LDFLAGS = $(TOOL_LDFLAGS_AMD64_DARWIN) |
|
From: Bart V. A. <bar...@gm...> - 2009-06-12 07:58:24
|
Nightly build on georgia-tech-cellbuzz-native ( cellbuzz, ppc64, Fedora 7, native ) Started at 2009-06-12 02:07:44 EDT Ended at 2009-06-12 03:44:45 EDT Results unchanged from 24 hours ago Checking out valgrind source tree ... done Configuring valgrind ... done Building valgrind ... done Running regression tests ... done Regression test results follow == 419 tests, 36 stderr failures, 12 stdout failures, 0 post failures == memcheck/tests/deep_templates (stdout) memcheck/tests/leak-cases-full (stderr) memcheck/tests/leak-cases-summary (stderr) memcheck/tests/leak-cycle (stderr) memcheck/tests/origin5-bz2 (stderr) memcheck/tests/varinfo1 (stderr) memcheck/tests/varinfo2 (stderr) memcheck/tests/varinfo3 (stderr) memcheck/tests/varinfo4 (stderr) memcheck/tests/varinfo5 (stderr) memcheck/tests/varinfo6 (stderr) memcheck/tests/wrap8 (stderr) none/tests/linux/mremap (stderr) none/tests/linux/mremap2 (stdout) none/tests/ppc32/jm-fp (stdout) none/tests/ppc32/jm-vmx (stdout) none/tests/ppc32/round (stdout) none/tests/ppc32/test_gx (stdout) none/tests/ppc64/jm-fp (stdout) none/tests/ppc64/jm-vmx (stdout) none/tests/ppc64/round (stdout) none/tests/shell_valid2 (stderr) none/tests/shell_valid3 (stderr) helgrind/tests/hg05_race2 (stderr) exp-ptrcheck/tests/bad_percentify (stdout) exp-ptrcheck/tests/bad_percentify (stderr) exp-ptrcheck/tests/base (stderr) exp-ptrcheck/tests/ccc (stderr) exp-ptrcheck/tests/fp (stderr) exp-ptrcheck/tests/globalerr (stderr) exp-ptrcheck/tests/hackedbz2 (stdout) exp-ptrcheck/tests/hackedbz2 (stderr) exp-ptrcheck/tests/hp_bounds (stderr) exp-ptrcheck/tests/hp_dangle (stderr) exp-ptrcheck/tests/justify (stderr) exp-ptrcheck/tests/partial_bad (stderr) exp-ptrcheck/tests/partial_good (stderr) exp-ptrcheck/tests/preen_invars (stdout) exp-ptrcheck/tests/preen_invars (stderr) exp-ptrcheck/tests/pth_create (stderr) exp-ptrcheck/tests/pth_specific (stderr) exp-ptrcheck/tests/realloc (stderr) exp-ptrcheck/tests/stackerr (stderr) exp-ptrcheck/tests/strcpy (stderr) exp-ptrcheck/tests/supp (stderr) exp-ptrcheck/tests/tricky (stderr) exp-ptrcheck/tests/unaligned (stderr) exp-ptrcheck/tests/zero (stderr) |
|
From: <sv...@va...> - 2009-06-12 07:52:08
|
Author: njn Date: 2009-06-12 08:50:56 +0100 (Fri, 12 Jun 2009) New Revision: 10310 Log: Avoid more cut+paste code in coregrind/Makefile.am. And fix minor make dist in drd/tests/Makefile.am. Modified: branches/BUILD_TWEAKS/coregrind/Makefile.am branches/BUILD_TWEAKS/drd/tests/Makefile.am Modified: branches/BUILD_TWEAKS/coregrind/Makefile.am =================================================================== --- branches/BUILD_TWEAKS/coregrind/Makefile.am 2009-06-12 07:38:24 UTC (rev 10309) +++ branches/BUILD_TWEAKS/coregrind/Makefile.am 2009-06-12 07:50:56 UTC (rev 10310) @@ -25,46 +25,10 @@ default.supp: $(SUPP_FILES) - -pkglib_LIBRARIES = - -if VGCONF_PLATFORMS_INCLUDE_X86_LINUX -pkglib_LIBRARIES += libcoregrind-x86-linux.a -endif - -if VGCONF_PLATFORMS_INCLUDE_AMD64_LINUX -pkglib_LIBRARIES += libcoregrind-amd64-linux.a -endif - -if VGCONF_PLATFORMS_INCLUDE_PPC32_LINUX -pkglib_LIBRARIES += libcoregrind-ppc32-linux.a -endif - -if VGCONF_PLATFORMS_INCLUDE_PPC64_LINUX -pkglib_LIBRARIES += libcoregrind-ppc64-linux.a -endif - -if VGCONF_PLATFORMS_INCLUDE_PPC32_AIX5 -pkglib_LIBRARIES += libcoregrind-ppc32-aix5.a -endif - -if VGCONF_PLATFORMS_INCLUDE_PPC64_AIX5 -pkglib_LIBRARIES += libcoregrind-ppc64-aix5.a -endif - -if VGCONF_PLATFORMS_INCLUDE_X86_DARWIN -pkglib_LIBRARIES += libcoregrind-x86-darwin.a -endif - -if VGCONF_PLATFORMS_INCLUDE_AMD64_DARWIN -pkglib_LIBRARIES += libcoregrind-amd64-darwin.a -endif - #---------------------------------------------------------------------------- -# The launcher +# The launcher. Built for the primary target only. #---------------------------------------------------------------------------- -# Build the launcher (valgrind) for the primary target only. -# + bin_PROGRAMS = \ valgrind no_op_client_for_valgrind @@ -117,30 +81,41 @@ # processor.defs \ # processor_set.defs \ # -if VGCONF_OS_IS_DARWIN -mach_defs = \ - mach_vm.defs \ - task.defs \ - thread_act.defs \ - vm_map.defs -else +mach_user_srcs = +mach_server_srcs = +mach_hdrs = mach_defs = +if VGCONF_OS_IS_DARWIN +mach_user_srcs += \ + m_mach/mach_vmUser.c \ + m_mach/taskUser.c \ + m_mach/thread_actUser.c \ + m_mach/vm_mapUser.c +mach_server_srcs += \ + m_mach/mach_vmServer.c \ + m_mach/taskServer.c \ + m_mach/thread_actServer.c \ + m_mach/vm_mapServer.c +mach_hdrs += \ + m_mach/mach_vm.h \ + m_mach/task.h \ + m_mach/thread_act.h \ + m_mach/vm_map.h +mach_defs += \ + /usr/include/mach/mach_vm.defs \ + /usr/include/mach/task.defs \ + /usr/include/mach/thread_act.defs \ + /usr/include/mach/vm_map.defs endif -mach_srcs = $(addprefix m_mach/,$(mach_defs:.defs=User.c)) -mach_server_srcs = $(addprefix m_mach/,$(mach_defs:.defs=Server.c)) -mach_hdrs = $(addprefix m_mach/,$(mach_defs:.defs=.h)) -mach_files = $(addprefix /usr/include/mach/,$(mach_defs)) +$(mach_user_srcs) $(mach_hdrs): $(mach_defs) + (cd m_mach && mig $(mach_defs)) -$(mach_srcs) $(mach_hdrs): $(mach_files) - (cd m_mach && mig $(mach_files)) - #---------------------------------------------------------------------------- # Headers #---------------------------------------------------------------------------- noinst_HEADERS = \ - $(mach_hdrs) \ launcher-aix5-bootblock.h \ pub_core_aspacehl.h \ pub_core_aspacemgr.h \ @@ -228,11 +203,12 @@ # libcoregrind_<platform>.so #---------------------------------------------------------------------------- -BUILT_SOURCES = -CLEANFILES = -if VGCONF_OS_IS_DARWIN -BUILT_SOURCES += $(COREGRIND_DARWIN_BUILT_SOURCES) -CLEANFILES += $(COREGRIND_DARWIN_BUILT_SOURCES) +BUILT_SOURCES = $(mach_user_srcs) +CLEANFILES = $(mach_user_srcs) $(mach_server_srcs) $(mach_hdrs) + +pkglib_LIBRARIES = libcoregrind-@VGCONF_ARCH_PRI@-@VGCONF_OS@.a +if VGCONF_HAVE_PLATFORM_SEC +pkglib_LIBRARIES += libcoregrind-@VGCONF_ARCH_SEC@-@VGCONF_OS@.a endif COREGRIND_SOURCES_COMMON = \ @@ -351,76 +327,41 @@ m_ume/main.c \ m_ume/script.c - # These are generated using 'mig' from $mach_defs above. -COREGRIND_DARWIN_BUILT_SOURCES = \ - m_mach/mach_vmUser.c \ - m_mach/taskUser.c \ - m_mach/thread_actUser.c \ - m_mach/vm_mapUser.c +libcoregrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_a_SOURCES = \ + $(COREGRIND_SOURCES_COMMON) +nodist_libcoregrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_a_SOURCES = \ + $(BUILT_SOURCES) +libcoregrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_a_CPPFLAGS = \ + $(AM_CPPFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) +libcoregrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_a_CFLAGS = \ + $(AM_CFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) +libcoregrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_a_CCASFLAGS = \ + $(AM_CCASFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) +if VGCONF_HAVE_PLATFORM_SEC +libcoregrind_@VGCONF_ARCH_SEC@_@VGCONF_OS@_a_SOURCES = \ + $(COREGRIND_SOURCES_COMMON) +nodist_libcoregrind_@VGCONF_ARCH_SEC@_@VGCONF_OS@_a_SOURCES = \ + $(BUILT_SOURCES) +libcoregrind_@VGCONF_ARCH_SEC@_@VGCONF_OS@_a_CPPFLAGS = \ + $(AM_CPPFLAGS_@VGCONF_PLATFORM_SEC_CAPS@) +libcoregrind_@VGCONF_ARCH_SEC@_@VGCONF_OS@_a_CFLAGS = \ + $(AM_CFLAGS_@VGCONF_PLATFORM_SEC_CAPS@) +libcoregrind_@VGCONF_ARCH_SEC@_@VGCONF_OS@_a_CCASFLAGS = \ + $(AM_CCASFLAGS_@VGCONF_PLATFORM_SEC_CAPS@) +endif -libcoregrind_x86_linux_a_SOURCES = $(COREGRIND_SOURCES_COMMON) -libcoregrind_x86_linux_a_CPPFLAGS = $(AM_CPPFLAGS_X86_LINUX) -libcoregrind_x86_linux_a_CFLAGS = $(AM_CFLAGS_X86_LINUX) -libcoregrind_x86_linux_a_CCASFLAGS = $(AM_CCASFLAGS_X86_LINUX) - -libcoregrind_amd64_linux_a_SOURCES = $(COREGRIND_SOURCES_COMMON) -libcoregrind_amd64_linux_a_CPPFLAGS = $(AM_CPPFLAGS_AMD64_LINUX) -libcoregrind_amd64_linux_a_CFLAGS = $(AM_CFLAGS_AMD64_LINUX) -libcoregrind_amd64_linux_a_CCASFLAGS = $(AM_CCASFLAGS_AMD64_LINUX) - -libcoregrind_ppc32_linux_a_SOURCES = $(COREGRIND_SOURCES_COMMON) -libcoregrind_ppc32_linux_a_CPPFLAGS = $(AM_CPPFLAGS_PPC32_LINUX) -libcoregrind_ppc32_linux_a_CFLAGS = $(AM_CFLAGS_PPC32_LINUX) -libcoregrind_ppc32_linux_a_CCASFLAGS = $(AM_CCASFLAGS_PPC32_LINUX) - -libcoregrind_ppc64_linux_a_SOURCES = $(COREGRIND_SOURCES_COMMON) -libcoregrind_ppc64_linux_a_CPPFLAGS = $(AM_CPPFLAGS_PPC64_LINUX) -libcoregrind_ppc64_linux_a_CFLAGS = $(AM_CFLAGS_PPC64_LINUX) -libcoregrind_ppc64_linux_a_CCASFLAGS = $(AM_CCASFLAGS_PPC64_LINUX) - -libcoregrind_ppc32_aix5_a_SOURCES = $(COREGRIND_SOURCES_COMMON) -libcoregrind_ppc32_aix5_a_CPPFLAGS = $(AM_CPPFLAGS_PPC32_AIX5) -libcoregrind_ppc32_aix5_a_CFLAGS = $(AM_CFLAGS_PPC32_AIX5) -libcoregrind_ppc32_aix5_a_CCASFLAGS = $(AM_CCASFLAGS_PPC32_AIX5) libcoregrind_ppc32_aix5_a_AR = $(AR) -X32 cru - -libcoregrind_ppc64_aix5_a_SOURCES = $(COREGRIND_SOURCES_COMMON) -libcoregrind_ppc64_aix5_a_CPPFLAGS = $(AM_CPPFLAGS_PPC64_AIX5) -libcoregrind_ppc64_aix5_a_CFLAGS = $(AM_CFLAGS_PPC64_AIX5) -libcoregrind_ppc64_aix5_a_CCASFLAGS = $(AM_CCASFLAGS_PPC64_AIX5) libcoregrind_ppc64_aix5_a_AR = $(AR) -X64 cru -libcoregrind_x86_darwin_a_SOURCES = $(COREGRIND_SOURCES_COMMON) -nodist_libcoregrind_x86_darwin_a_SOURCES = $(COREGRIND_DARWIN_BUILT_SOURCES) -libcoregrind_x86_darwin_a_CPPFLAGS = $(AM_CPPFLAGS_X86_DARWIN) -libcoregrind_x86_darwin_a_CFLAGS = $(AM_CFLAGS_X86_DARWIN) -libcoregrind_x86_darwin_a_CCASFLAGS = $(AM_CCASFLAGS_X86_DARWIN) -libcoregrind_amd64_darwin_a_SOURCES = $(COREGRIND_SOURCES_COMMON) -nodist_libcoregrind_amd64_darwin_a_SOURCES = $(COREGRIND_DARWIN_BUILT_SOURCES) -libcoregrind_amd64_darwin_a_CPPFLAGS = $(AM_CPPFLAGS_AMD64_DARWIN) -libcoregrind_amd64_darwin_a_CFLAGS = $(AM_CFLAGS_AMD64_DARWIN) -libcoregrind_amd64_darwin_a_CCASFLAGS = $(AM_CCASFLAGS_AMD64_DARWIN) +m_syswrap/syswrap-main.c: libvex_guest_offsets.h +m_dispatch/dispatch-@VGCONF_ARCH_PRI@-@VGCONF_OS@.S: libvex_guest_offsets.h +m_syswrap/syscall-@VGCONF_ARCH_PRI@-@VGCONF_OS@.S: libvex_guest_offsets.h +if VGCONF_HAVE_PLATFORM_SEC +m_dispatch/dispatch-@VGCONF_ARCH_SEC@-@VGCONF_OS@.S: libvex_guest_offsets.h +m_syswrap/syscall-@VGCONF_ARCH_SEC@-@VGCONF_OS@.S: libvex_guest_offsets.h +endif - -m_dispatch/dispatch-x86-linux.S: libvex_guest_offsets.h -m_dispatch/dispatch-amd64-linux.S: libvex_guest_offsets.h -m_dispatch/dispatch-ppc32-linux.S: libvex_guest_offsets.h -m_dispatch/dispatch-ppc64-linux.S: libvex_guest_offsets.h -m_dispatch/dispatch-ppc32-aix5.S: libvex_guest_offsets.h -m_dispatch/dispatch-ppc64-aix5.S: libvex_guest_offsets.h -m_dispatch/dispatch-x86-darwin.S: libvex_guest_offsets.h -m_dispatch/dispatch-amd64-darwin.S: libvex_guest_offsets.h -m_syswrap/syscall-x86-linux.S: libvex_guest_offsets.h -m_syswrap/syscall-amd64-linux.S: libvex_guest_offsets.h -m_syswrap/syscall-ppc32-linux.S: libvex_guest_offsets.h -m_syswrap/syscall-ppc64-linux.S: libvex_guest_offsets.h -m_syswrap/syscall-ppc32-aix5.S: libvex_guest_offsets.h -m_syswrap/syscall-ppc64-aix5.S: libvex_guest_offsets.h -m_syswrap/syscall-x86-darwin.S: libvex_guest_offsets.h -m_syswrap/syscall-amd64-darwin.S: libvex_guest_offsets.h -m_syswrap/syswrap-main.c: libvex_guest_offsets.h - libvex_guest_offsets.h: $(MAKE) -C @VEX_DIR@ CC="$(CC)" AR="$(AR)" pub/libvex_guest_offsets.h @@ -490,7 +431,6 @@ clean-local: clean-noinst_DSYMS $(MAKE) -C @VEX_DIR@ CC="$(CC)" AR="$(AR)" clean - rm -f $(mach_srcs) $(mach_server_srcs) $(mach_hdrs) LIBVEX = libvex-@VGCONF_ARCH_PRI@-@VGCONF_OS@.a if VGCONF_HAVE_PLATFORM_SEC Modified: branches/BUILD_TWEAKS/drd/tests/Makefile.am =================================================================== --- branches/BUILD_TWEAKS/drd/tests/Makefile.am 2009-06-12 07:38:24 UTC (rev 10309) +++ branches/BUILD_TWEAKS/drd/tests/Makefile.am 2009-06-12 07:50:56 UTC (rev 10310) @@ -24,8 +24,7 @@ annotate_ignore_read.vgtest \ annotate_trace_memory.stderr.exp \ annotate_trace_memory.vgtest \ - atomic_var.stderr.exp-with-atomic-builtins \ - atomic_var.stderr.exp-without-atomic-builtins \ + atomic_var.stderr.exp \ atomic_var.vgtest \ bar_bad.stderr.exp \ bar_bad.vgtest \ @@ -34,8 +33,7 @@ bar_trivial.vgtest \ boost_thread.stderr.exp \ boost_thread.vgtest \ - circular_buffer.stderr.exp-with-atomic-builtins \ - circular_buffer.stderr.exp-without-atomic-builtins \ + circular_buffer.stderr.exp \ circular_buffer.vgtest \ custom_alloc.stderr.exp \ custom_alloc.vgtest \ |
|
From: <sv...@va...> - 2009-06-12 07:39:28
|
Author: njn Date: 2009-06-12 08:38:24 +0100 (Fri, 12 Jun 2009) New Revision: 10309 Log: Get rid of ACKNOWLEDGEMENTS, because it overlaps hugely with AUTHORS. Improve AUTHORS a bit at the same time. Removed: trunk/ACKNOWLEDGEMENTS Modified: trunk/AUTHORS trunk/Makefile.am trunk/docs/xml/dist-docs.xml trunk/valgrind.spec.in Deleted: trunk/ACKNOWLEDGEMENTS =================================================================== --- trunk/ACKNOWLEDGEMENTS 2009-06-12 06:05:54 UTC (rev 10308) +++ trunk/ACKNOWLEDGEMENTS 2009-06-12 07:38:24 UTC (rev 10309) @@ -1,70 +0,0 @@ - -Cerion Armour-Brown, ce...@op... - -Cerion worked on PowerPC instruction set support using the Vex -dynamic-translation framework. - -Jeremy Fitzhardinge, je...@va... - -Jeremy wrote Helgrind (in the 2.X line) and totally overhauled -low-level syscall/signal and address space layout stuff, among many -other improvements. - -Tom Hughes, to...@va... - -Tom did a vast number of bug fixes, and helped out with support for -more recent Linux/glibc versions, and set up the present build system. - -Nicholas Nethercote, nj...@va... - -Nick did the core/tool generalisation, wrote Cachegrind and Massif, -and tons of other stuff. - -Paul Mackerras - -Paul did a lot of the initial per-architecture factoring that forms -the basis of the 3.0 line and is also to be seen in 2.4.0. He also did -UCode-based dynamic translation support for PowerPC, and created a set -of ppc-linux derivatives of the 2.X release line. - -Dirk Mueller, dm...@gm... - -Dirk contributed the malloc-free mismatch checking stuff and various -other bits and pieces, and acted as our KDE liaison. - -Donna Robinson, do...@te... - -Keeper of the very excellent http://www.valgrind.org. - -Julian Seward, ju...@va... - -Julian was the original designer and author of Valgrind, created the -dynamic translation framework, wrote Memcheck and 3.3.X Helgrind, and -did lots of other things. - -Robert Walsh, rj...@va... - -Robert added file descriptor leakage checking, new library -interception machinery, support for client allocation pools, and minor -other tweakage. - -Josef Weidendorfer, Jos...@gm.... - -Josef wrote Callgrind and the associated KCachegrind GUI. - -DRD was written by and is maintained by Bart Van Assche. - -Frederic Gobry helped with autoconf and automake. Daniel Berlin -modified readelf's dwarf2 source line reader, written by Nick Clifton, -for use in Valgrind. Michael Matz and Simon Hausmann modified the GNU -binutils demangler(s) for use in Valgrind. - -David Woodhouse and Tom Hughes have helped out with test and build -machines over the course of many releases. - -Many, many people sent bug reports, patches, and helpful feedback. - -Development of Valgrind was supported in part by the Tri-Lab Partners -(Lawrence Livermore National Laboratory, Los Alamos National -Laboratory, and Sandia National Laboratories) of the U.S. Department -of Energy's Advanced Simulation & Computing (ASC) Program. Modified: trunk/AUTHORS =================================================================== --- trunk/AUTHORS 2009-06-12 06:05:54 UTC (rev 10308) +++ trunk/AUTHORS 2009-06-12 07:38:24 UTC (rev 10309) @@ -1,44 +1,57 @@ -Cerion Armour-Brown worked on PowerPC instruction set support using -the Vex dynamic-translation framework. +Julian Seward was the original founder, designer and author of Valgrind, +created the dynamic translation frameworks, wrote Memcheck and 3.3.X +Helgrind, and did lots of other things. +Nicholas Nethercote did the core/tool generalisation, wrote +Cachegrind and Massif, and tons of other stuff. + +Tom Hughes did a vast number of bug fixes, helped out with support for +more recent Linux/glibc versions, set up the present build system, and has +helped out with test and build machines. + Jeremy Fitzhardinge wrote Helgrind (in the 2.X line) and totally overhauled low-level syscall/signal and address space layout stuff, among many other things. -Tom Hughes did a vast number of bug fixes, and helped out with support -for more recent Linux/glibc versions. +Josef Weidendorfer wrote Callgrind and the associated KCachegrind GUI. -Nicholas Nethercote did the core/tool generalisation, wrote -Cachegrind and Massif, and tons of other stuff. - Paul Mackerras did a lot of the initial per-architecture factoring that forms the basis of the 3.0 line and is also to be seen in 2.4.0. He also did UCode-based dynamic translation support for PowerPC, and created a set of ppc-linux derivatives of the 2.X release line. +Greg Parker wrote the Mac OS X port. + Dirk Mueller contributed the malloc-free mismatch checking stuff and other bits and pieces, and acted as our KDE liaison. -Julian Seward was the original founder, designer and author, created -the dynamic translation frameworks, wrote Memcheck and 3.3.X Helgrind, -and did lots of other things. - Robert Walsh added file descriptor leakage checking, new library interception machinery, support for client allocation pools, and minor other tweakage. -Josef Weidendorfer wrote Callgrind and the associated KCachegrind GUI. +Bart Van Assche wrote and maintains DRD. +Cerion Armour-Brown worked on PowerPC instruction set support in +the Vex dynamic-translation framework. + +Donna Robinson created and maintains the very excellent +http://www.valgrind.org. + Frederic Gobry helped with autoconf and automake. Daniel Berlin modified readelf's dwarf2 source line reader, written by Nick -Clifton, for use in Valgrind. +Clifton, for use in Valgrind.o -Michael Matz and Simon Hausmann modified the GNU binutils -demangler(s) for use in Valgrind. +Michael Matz and Simon Hausmann modified the GNU binutils demangler(s) for +use in Valgrind. -DRD was written by and is maintained by Bart Van Assche. +David Woodhouse has helped out with test and build machines over the course +of many releases. -And lots and lots of other people sent bug reports, patches, and very -helpful feedback. Thank you all. +Many, many people sent bug reports, patches, and helpful feedback. + +Development of Valgrind was supported in part by the Tri-Lab Partners +(Lawrence Livermore National Laboratory, Los Alamos National +Laboratory, and Sandia National Laboratories) of the U.S. Department +of Energy's Advanced Simulation & Computing (ASC) Program. Modified: trunk/Makefile.am =================================================================== --- trunk/Makefile.am 2009-06-12 06:05:54 UTC (rev 10308) +++ trunk/Makefile.am 2009-06-12 07:38:24 UTC (rev 10309) @@ -118,7 +118,6 @@ # Nb: no need to include any Makefile.am files here, or files included from # them, as automake includes them automatically. EXTRA_DIST = \ - ACKNOWLEDGEMENTS \ README_DEVELOPERS \ README_PACKAGERS \ README_MISSING_SYSCALL_OR_IOCTL \ Modified: trunk/docs/xml/dist-docs.xml =================================================================== --- trunk/docs/xml/dist-docs.xml 2009-06-12 06:05:54 UTC (rev 10308) +++ trunk/docs/xml/dist-docs.xml 2009-06-12 07:38:24 UTC (rev 10309) @@ -21,14 +21,6 @@ <!-- Nb: because these are all text files, we have to wrap --> <!-- them in suitable XML. Hence the chapter/title stuff --> - <chapter id="dist.acknowledge" xreflabel="Acknowledgements"> - <title>ACKNOWLEDGEMENTS</title> - <literallayout> - <xi:include href="../../ACKNOWLEDGEMENTS" parse="text" - xmlns:xi="http://www.w3.org/2001/XInclude" /> - </literallayout> - </chapter> - <chapter id="dist.authors" xreflabel="Valgrind Developers"> <title id="dist.authors.title">AUTHORS</title> <literallayout> Modified: trunk/valgrind.spec.in =================================================================== --- trunk/valgrind.spec.in 2009-06-12 06:05:54 UTC (rev 10308) +++ trunk/valgrind.spec.in 2009-06-12 07:38:24 UTC (rev 10309) @@ -39,7 +39,7 @@ %files %defattr(-,root,root) -%doc ACKNOWLEDGEMENTS AUTHORS COPYING FAQ.txt INSTALL NEWS README* +%doc AUTHORS COPYING FAQ.txt INSTALL NEWS README* %doc docs.installed/html/*.html docs.installed/html/images/*.png %{_bindir}/* %{_includedir}/valgrind |
|
From: <sv...@va...> - 2009-06-12 06:05:58
|
Author: njn
Date: 2009-06-12 07:05:54 +0100 (Fri, 12 Jun 2009)
New Revision: 10308
Log:
Darwin fix.
Modified:
branches/BUILD_TWEAKS/coregrind/m_coredump/coredump-macho.c
Modified: branches/BUILD_TWEAKS/coregrind/m_coredump/coredump-macho.c
===================================================================
--- branches/BUILD_TWEAKS/coregrind/m_coredump/coredump-macho.c 2009-06-12 05:54:13 UTC (rev 10307)
+++ branches/BUILD_TWEAKS/coregrind/m_coredump/coredump-macho.c 2009-06-12 06:05:54 UTC (rev 10308)
@@ -28,7 +28,7 @@
The GNU General Public License is contained in the file COPYING.
*/
-#if defined(VGP_darwin)
+#if defined(VGO_darwin)
#include "pub_core_basics.h"
#include "pub_core_vki.h"
@@ -40,7 +40,7 @@
// DDD: #warning GrP fixme coredump
}
-#endif // defined(VGP_darwin)
+#endif // defined(VGO_darwin)
/*--------------------------------------------------------------------*/
/*--- end ---*/
|
|
From: <sv...@va...> - 2009-06-12 05:54:21
|
Author: njn
Date: 2009-06-12 06:54:13 +0100 (Fri, 12 Jun 2009)
New Revision: 10307
Log:
m_coredump was needlessly and badly split across multiple files. This
commit mostly merges them, making it much easier to understand. As a
result, all non-built coregrind files are now compiled on all platforms.
Added:
branches/BUILD_TWEAKS/coregrind/m_coredump/coredump-macho.c
branches/BUILD_TWEAKS/coregrind/m_coredump/coredump-xcoff.c
Removed:
branches/BUILD_TWEAKS/coregrind/m_coredump/coredump-amd64-darwin.c
branches/BUILD_TWEAKS/coregrind/m_coredump/coredump-amd64-linux.c
branches/BUILD_TWEAKS/coregrind/m_coredump/coredump-ppc32-aix5.c
branches/BUILD_TWEAKS/coregrind/m_coredump/coredump-ppc32-linux.c
branches/BUILD_TWEAKS/coregrind/m_coredump/coredump-ppc64-aix5.c
branches/BUILD_TWEAKS/coregrind/m_coredump/coredump-ppc64-linux.c
branches/BUILD_TWEAKS/coregrind/m_coredump/coredump-x86-darwin.c
branches/BUILD_TWEAKS/coregrind/m_coredump/coredump-x86-linux.c
branches/BUILD_TWEAKS/coregrind/m_coredump/priv_elf.h
Modified:
branches/BUILD_TWEAKS/coregrind/Makefile.am
branches/BUILD_TWEAKS/coregrind/m_coredump/coredump-elf.c
Modified: branches/BUILD_TWEAKS/coregrind/Makefile.am
===================================================================
--- branches/BUILD_TWEAKS/coregrind/Makefile.am 2009-06-12 05:01:48 UTC (rev 10306)
+++ branches/BUILD_TWEAKS/coregrind/Makefile.am 2009-06-12 05:54:13 UTC (rev 10307)
@@ -195,7 +195,6 @@
pub_core_wordfm.h \
pub_core_xarray.h \
m_aspacemgr/priv_aspacemgr.h \
- m_coredump/priv_elf.h \
m_debuginfo/priv_misc.h \
m_debuginfo/priv_storage.h \
m_debuginfo/priv_tytypes.h \
@@ -236,7 +235,6 @@
CLEANFILES += $(COREGRIND_DARWIN_BUILT_SOURCES)
endif
-# Merge the coredump-$PLATFORM.c files?
COREGRIND_SOURCES_COMMON = \
m_commandline.c \
m_clientstate.c \
@@ -277,14 +275,9 @@
m_aspacemgr/aspacemgr-common.c \
m_aspacemgr/aspacemgr-linux.c \
m_aspacemgr/aspacemgr-aix5.c \
- m_coredump/coredump-x86-linux.c \
- m_coredump/coredump-amd64-linux.c \
- m_coredump/coredump-ppc32-linux.c \
- m_coredump/coredump-ppc64-linux.c \
- m_coredump/coredump-ppc32-aix5.c \
- m_coredump/coredump-ppc64-aix5.c \
- m_coredump/coredump-x86-darwin.c \
- m_coredump/coredump-amd64-darwin.c \
+ m_coredump/coredump-elf.c \
+ m_coredump/coredump-macho.c \
+ m_coredump/coredump-xcoff.c \
m_debuginfo/misc.c \
m_debuginfo/d3basics.c \
m_debuginfo/debuginfo.c \
@@ -358,9 +351,6 @@
m_ume/main.c \
m_ume/script.c
-COREGRIND_LINUX_SOURCE = \
- m_coredump/coredump-elf.c
-
# These are generated using 'mig' from $mach_defs above.
COREGRIND_DARWIN_BUILT_SOURCES = \
m_mach/mach_vmUser.c \
@@ -368,57 +358,45 @@
m_mach/thread_actUser.c \
m_mach/vm_mapUser.c
-libcoregrind_x86_linux_a_SOURCES = \
- $(COREGRIND_SOURCES_COMMON) \
- $(COREGRIND_LINUX_SOURCE)
+libcoregrind_x86_linux_a_SOURCES = $(COREGRIND_SOURCES_COMMON)
libcoregrind_x86_linux_a_CPPFLAGS = $(AM_CPPFLAGS_X86_LINUX)
libcoregrind_x86_linux_a_CFLAGS = $(AM_CFLAGS_X86_LINUX)
libcoregrind_x86_linux_a_CCASFLAGS = $(AM_CCASFLAGS_X86_LINUX)
-libcoregrind_amd64_linux_a_SOURCES = \
- $(COREGRIND_SOURCES_COMMON) \
- $(COREGRIND_LINUX_SOURCE)
+libcoregrind_amd64_linux_a_SOURCES = $(COREGRIND_SOURCES_COMMON)
libcoregrind_amd64_linux_a_CPPFLAGS = $(AM_CPPFLAGS_AMD64_LINUX)
libcoregrind_amd64_linux_a_CFLAGS = $(AM_CFLAGS_AMD64_LINUX)
libcoregrind_amd64_linux_a_CCASFLAGS = $(AM_CCASFLAGS_AMD64_LINUX)
-libcoregrind_ppc32_linux_a_SOURCES = \
- $(COREGRIND_SOURCES_COMMON) \
- $(COREGRIND_LINUX_SOURCE)
+libcoregrind_ppc32_linux_a_SOURCES = $(COREGRIND_SOURCES_COMMON)
libcoregrind_ppc32_linux_a_CPPFLAGS = $(AM_CPPFLAGS_PPC32_LINUX)
libcoregrind_ppc32_linux_a_CFLAGS = $(AM_CFLAGS_PPC32_LINUX)
libcoregrind_ppc32_linux_a_CCASFLAGS = $(AM_CCASFLAGS_PPC32_LINUX)
-libcoregrind_ppc64_linux_a_SOURCES = \
- $(COREGRIND_SOURCES_COMMON) \
- $(COREGRIND_LINUX_SOURCE)
+libcoregrind_ppc64_linux_a_SOURCES = $(COREGRIND_SOURCES_COMMON)
libcoregrind_ppc64_linux_a_CPPFLAGS = $(AM_CPPFLAGS_PPC64_LINUX)
libcoregrind_ppc64_linux_a_CFLAGS = $(AM_CFLAGS_PPC64_LINUX)
libcoregrind_ppc64_linux_a_CCASFLAGS = $(AM_CCASFLAGS_PPC64_LINUX)
-libcoregrind_ppc32_aix5_a_SOURCES = \
- $(COREGRIND_SOURCES_COMMON)
+libcoregrind_ppc32_aix5_a_SOURCES = $(COREGRIND_SOURCES_COMMON)
libcoregrind_ppc32_aix5_a_CPPFLAGS = $(AM_CPPFLAGS_PPC32_AIX5)
libcoregrind_ppc32_aix5_a_CFLAGS = $(AM_CFLAGS_PPC32_AIX5)
libcoregrind_ppc32_aix5_a_CCASFLAGS = $(AM_CCASFLAGS_PPC32_AIX5)
libcoregrind_ppc32_aix5_a_AR = $(AR) -X32 cru
-libcoregrind_ppc64_aix5_a_SOURCES = \
- $(COREGRIND_SOURCES_COMMON)
+libcoregrind_ppc64_aix5_a_SOURCES = $(COREGRIND_SOURCES_COMMON)
libcoregrind_ppc64_aix5_a_CPPFLAGS = $(AM_CPPFLAGS_PPC64_AIX5)
libcoregrind_ppc64_aix5_a_CFLAGS = $(AM_CFLAGS_PPC64_AIX5)
libcoregrind_ppc64_aix5_a_CCASFLAGS = $(AM_CCASFLAGS_PPC64_AIX5)
libcoregrind_ppc64_aix5_a_AR = $(AR) -X64 cru
-libcoregrind_x86_darwin_a_SOURCES = \
- $(COREGRIND_SOURCES_COMMON)
+libcoregrind_x86_darwin_a_SOURCES = $(COREGRIND_SOURCES_COMMON)
nodist_libcoregrind_x86_darwin_a_SOURCES = $(COREGRIND_DARWIN_BUILT_SOURCES)
libcoregrind_x86_darwin_a_CPPFLAGS = $(AM_CPPFLAGS_X86_DARWIN)
libcoregrind_x86_darwin_a_CFLAGS = $(AM_CFLAGS_X86_DARWIN)
libcoregrind_x86_darwin_a_CCASFLAGS = $(AM_CCASFLAGS_X86_DARWIN)
-libcoregrind_amd64_darwin_a_SOURCES = \
- $(COREGRIND_SOURCES_COMMON)
+libcoregrind_amd64_darwin_a_SOURCES = $(COREGRIND_SOURCES_COMMON)
nodist_libcoregrind_amd64_darwin_a_SOURCES = $(COREGRIND_DARWIN_BUILT_SOURCES)
libcoregrind_amd64_darwin_a_CPPFLAGS = $(AM_CPPFLAGS_AMD64_DARWIN)
libcoregrind_amd64_darwin_a_CFLAGS = $(AM_CFLAGS_AMD64_DARWIN)
Deleted: branches/BUILD_TWEAKS/coregrind/m_coredump/coredump-amd64-darwin.c
===================================================================
--- branches/BUILD_TWEAKS/coregrind/m_coredump/coredump-amd64-darwin.c 2009-06-12 05:01:48 UTC (rev 10306)
+++ branches/BUILD_TWEAKS/coregrind/m_coredump/coredump-amd64-darwin.c 2009-06-12 05:54:13 UTC (rev 10307)
@@ -1,47 +0,0 @@
-
-/*--------------------------------------------------------------------*/
-/*--- Dumping core. coredump-amd64-darwin.c ---*/
-/*--------------------------------------------------------------------*/
-
-/*
- This file is part of Valgrind, a dynamic binary instrumentation
- framework.
-
- Copyright (C) 2005 Apple Inc.
- Greg Parker gp...@ap...
-
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of the
- License, or (at your option) any later version.
-
- This program is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- 02111-1307, USA.
-
- The GNU General Public License is contained in the file COPYING.
-*/
-
-#if defined(VGP_amd64_darwin)
-
-#include "pub_core_basics.h"
-#include "pub_core_vki.h"
-#include "pub_core_coredump.h"
-#include "pub_core_threadstate.h"
-
-void VG_(make_coredump)(ThreadId tid, const vki_siginfo_t *si, UInt max_size)
-{
- // DDD: #warning GrP fixme coredump
-}
-
-#endif // defined(VGP_amd64_darwin)
-
-/*--------------------------------------------------------------------*/
-/*--- end ---*/
-/*--------------------------------------------------------------------*/
Deleted: branches/BUILD_TWEAKS/coregrind/m_coredump/coredump-amd64-linux.c
===================================================================
--- branches/BUILD_TWEAKS/coregrind/m_coredump/coredump-amd64-linux.c 2009-06-12 05:01:48 UTC (rev 10306)
+++ branches/BUILD_TWEAKS/coregrind/m_coredump/coredump-amd64-linux.c 2009-06-12 05:54:13 UTC (rev 10307)
@@ -1,94 +0,0 @@
-
-/*--------------------------------------------------------------------*/
-/*--- Dumping core. coredump-amd64-linux.c ---*/
-/*--------------------------------------------------------------------*/
-
-/*
- This file is part of Valgrind, a dynamic binary instrumentation
- framework.
-
- Copyright (C) 2000-2009 Julian Seward
- js...@ac...
-
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of the
- License, or (at your option) any later version.
-
- This program is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- 02111-1307, USA.
-
- The GNU General Public License is contained in the file COPYING.
-*/
-
-#if defined(VGP_amd64_linux)
-
-#include "pub_core_basics.h"
-#include "pub_core_vki.h"
-#include "pub_core_libcbase.h"
-#include "pub_core_coredump.h"
-#include "pub_core_threadstate.h"
-
-#include "priv_elf.h"
-
-void ML_(fill_elfregs_from_tst)(struct vki_user_regs_struct* regs,
- const ThreadArchState* arch)
-{
- regs->eflags = LibVEX_GuestAMD64_get_rflags( &((ThreadArchState*)arch)->vex );
- regs->rsp = arch->vex.guest_RSP;
- regs->rip = arch->vex.guest_RIP;
-
- regs->rbx = arch->vex.guest_RBX;
- regs->rcx = arch->vex.guest_RCX;
- regs->rdx = arch->vex.guest_RDX;
- regs->rsi = arch->vex.guest_RSI;
- regs->rdi = arch->vex.guest_RDI;
- regs->rbp = arch->vex.guest_RBP;
- regs->rax = arch->vex.guest_RAX;
- regs->r8 = arch->vex.guest_R8;
- regs->r9 = arch->vex.guest_R9;
- regs->r10 = arch->vex.guest_R10;
- regs->r11 = arch->vex.guest_R11;
- regs->r12 = arch->vex.guest_R12;
- regs->r13 = arch->vex.guest_R13;
- regs->r14 = arch->vex.guest_R14;
- regs->r15 = arch->vex.guest_R15;
-
-//:: regs->cs = arch->vex.guest_cs;
-//:: regs->fs = arch->vex.guest_fs;
-//:: regs->gs = arch->vex.guest_gs;
-}
-
-void ML_(fill_elffpregs_from_tst)(vki_elf_fpregset_t* fpu,
- const ThreadArchState* arch)
-{
-//:: fpu->cwd = ?;
-//:: fpu->swd = ?;
-//:: fpu->twd = ?;
-//:: fpu->fop = ?;
-//:: fpu->rip = ?;
-//:: fpu->rdp = ?;
-//:: fpu->mxcsr = ?;
-//:: fpu->mxcsr_mask = ?;
-//:: fpu->st_space = ?;
-
-# define DO(n) VG_(memcpy)(fpu->xmm_space + n * 4, &arch->vex.guest_XMM##n, sizeof(arch->vex.guest_XMM##n))
- DO(0); DO(1); DO(2); DO(3); DO(4); DO(5); DO(6); DO(7);
- DO(8); DO(9); DO(10); DO(11); DO(12); DO(13); DO(14); DO(15);
-# undef DO
-
- VG_(memset)(fpu->padding, 0, sizeof(fpu->padding));
-}
-
-#endif // defined(VGP_amd64_linux)
-
-/*--------------------------------------------------------------------*/
-/*--- end ---*/
-/*--------------------------------------------------------------------*/
Modified: branches/BUILD_TWEAKS/coregrind/m_coredump/coredump-elf.c
===================================================================
--- branches/BUILD_TWEAKS/coregrind/m_coredump/coredump-elf.c 2009-06-12 05:01:48 UTC (rev 10306)
+++ branches/BUILD_TWEAKS/coregrind/m_coredump/coredump-elf.c 2009-06-12 05:54:13 UTC (rev 10307)
@@ -28,6 +28,8 @@
The GNU General Public License is contained in the file COPYING.
*/
+#if defined(VGO_linux)
+
#include "pub_core_basics.h"
#include "pub_core_vki.h"
#include "pub_core_aspacehl.h"
@@ -45,8 +47,6 @@
#include "pub_core_clientstate.h"
#include "pub_core_options.h"
-#include "priv_elf.h"
-
/*
Dump core
@@ -218,6 +218,7 @@
const vki_siginfo_t *si)
{
struct vki_user_regs_struct *regs;
+ ThreadArchState* arch = (ThreadArchState*)&tst->arch;
VG_(memset)(prs, 0, sizeof(*prs));
@@ -236,18 +237,189 @@
vg_assert(sizeof(*regs) == sizeof(prs->pr_reg));
- ML_(fill_elfregs_from_tst)(regs, &tst->arch);
+#if defined(VGP_x86_linux)
+ regs->eflags = LibVEX_GuestX86_get_eflags( &arch->vex );
+ regs->esp = arch->vex.guest_ESP;
+ regs->eip = arch->vex.guest_EIP;
+
+ regs->ebx = arch->vex.guest_EBX;
+ regs->ecx = arch->vex.guest_ECX;
+ regs->edx = arch->vex.guest_EDX;
+ regs->esi = arch->vex.guest_ESI;
+ regs->edi = arch->vex.guest_EDI;
+ regs->ebp = arch->vex.guest_EBP;
+ regs->eax = arch->vex.guest_EAX;
+
+ regs->cs = arch->vex.guest_CS;
+ regs->ds = arch->vex.guest_DS;
+ regs->ss = arch->vex.guest_SS;
+ regs->es = arch->vex.guest_ES;
+ regs->fs = arch->vex.guest_FS;
+ regs->gs = arch->vex.guest_GS;
+
+#elif defined(VGP_amd64_linux)
+ regs->eflags = LibVEX_GuestAMD64_get_rflags( &((ThreadArchState*)arch)->vex );
+ regs->rsp = arch->vex.guest_RSP;
+ regs->rip = arch->vex.guest_RIP;
+
+ regs->rbx = arch->vex.guest_RBX;
+ regs->rcx = arch->vex.guest_RCX;
+ regs->rdx = arch->vex.guest_RDX;
+ regs->rsi = arch->vex.guest_RSI;
+ regs->rdi = arch->vex.guest_RDI;
+ regs->rbp = arch->vex.guest_RBP;
+ regs->rax = arch->vex.guest_RAX;
+ regs->r8 = arch->vex.guest_R8;
+ regs->r9 = arch->vex.guest_R9;
+ regs->r10 = arch->vex.guest_R10;
+ regs->r11 = arch->vex.guest_R11;
+ regs->r12 = arch->vex.guest_R12;
+ regs->r13 = arch->vex.guest_R13;
+ regs->r14 = arch->vex.guest_R14;
+ regs->r15 = arch->vex.guest_R15;
+
+//:: regs->cs = arch->vex.guest_CS;
+//:: regs->fs = arch->vex.guest_FS;
+//:: regs->gs = arch->vex.guest_GS;
+
+#elif defined(VGP_ppc32_linux)
+# define DO(n) regs->gpr[n] = arch->vex.guest_GPR##n
+ DO(0); DO(1); DO(2); DO(3); DO(4); DO(5); DO(6); DO(7);
+ DO(8); DO(9); DO(10); DO(11); DO(12); DO(13); DO(14); DO(15);
+ DO(16); DO(17); DO(18); DO(19); DO(20); DO(21); DO(22); DO(23);
+ DO(24); DO(25); DO(26); DO(27); DO(28); DO(29); DO(30); DO(31);
+# undef DO
+
+ regs->nip = arch->vex.guest_CIA;
+ regs->msr = 0xf032; /* pretty arbitrary */
+ regs->orig_gpr3 = arch->vex.guest_GPR3;
+ regs->ctr = arch->vex.guest_CTR;
+ regs->link = arch->vex.guest_LR;
+ regs->xer = LibVEX_GuestPPC32_get_XER( &((ThreadArchState*)arch)->vex );
+ regs->ccr = LibVEX_GuestPPC32_get_CR( &((ThreadArchState*)arch)->vex );
+ regs->mq = 0;
+ regs->trap = 0;
+ regs->dar = 0; /* should be fault address? */
+ regs->dsisr = 0;
+ regs->result = 0;
+
+#elif defined(VGP_ppc64_linux)
+# define DO(n) regs->gpr[n] = arch->vex.guest_GPR##n
+ DO(0); DO(1); DO(2); DO(3); DO(4); DO(5); DO(6); DO(7);
+ DO(8); DO(9); DO(10); DO(11); DO(12); DO(13); DO(14); DO(15);
+ DO(16); DO(17); DO(18); DO(19); DO(20); DO(21); DO(22); DO(23);
+ DO(24); DO(25); DO(26); DO(27); DO(28); DO(29); DO(30); DO(31);
+# undef DO
+
+ regs->nip = arch->vex.guest_CIA;
+ regs->msr = 0xf032; /* pretty arbitrary */
+ regs->orig_gpr3 = arch->vex.guest_GPR3;
+ regs->ctr = arch->vex.guest_CTR;
+ regs->link = arch->vex.guest_LR;
+ regs->xer = LibVEX_GuestPPC64_get_XER( &((ThreadArchState*)arch)->vex );
+ regs->ccr = LibVEX_GuestPPC64_get_CR( &((ThreadArchState*)arch)->vex );
+ /* regs->mq = 0; */
+ regs->trap = 0;
+ regs->dar = 0; /* should be fault address? */
+ regs->dsisr = 0;
+ regs->result = 0;
+
+#else
+# error Unknown ELF platform
+#endif
}
static void fill_fpu(const ThreadState *tst, vki_elf_fpregset_t *fpu)
{
- ML_(fill_elffpregs_from_tst)(fpu, &tst->arch);
+ __attribute__((unused))
+ ThreadArchState* arch = (ThreadArchState*)&tst->arch;
+
+#if defined(VGP_x86_linux)
+//:: static void fill_fpu(vki_elf_fpregset_t *fpu, const Char *from)
+//:: {
+//:: if (VG_(have_ssestate)) {
+//:: UShort *to;
+//:: Int i;
+//::
+//:: /* This is what the kernel does */
+//:: VG_(memcpy)(fpu, from, 7*sizeof(long));
+//::
+//:: to = (UShort *)&fpu->st_space[0];
+//:: from += 18 * sizeof(UShort);
+//::
+//:: for (i = 0; i < 8; i++, to += 5, from += 8)
+//:: VG_(memcpy)(to, from, 5*sizeof(UShort));
+//:: } else
+//:: VG_(memcpy)(fpu, from, sizeof(*fpu));
+//:: }
+
+//:: fill_fpu(fpu, (const Char *)&arch->m_sse);
+
+#elif defined(VGP_amd64_linux)
+//:: fpu->cwd = ?;
+//:: fpu->swd = ?;
+//:: fpu->twd = ?;
+//:: fpu->fop = ?;
+//:: fpu->rip = ?;
+//:: fpu->rdp = ?;
+//:: fpu->mxcsr = ?;
+//:: fpu->mxcsr_mask = ?;
+//:: fpu->st_space = ?;
+
+# define DO(n) VG_(memcpy)(fpu->xmm_space + n * 4, &arch->vex.guest_XMM##n, sizeof(arch->vex.guest_XMM##n))
+ DO(0); DO(1); DO(2); DO(3); DO(4); DO(5); DO(6); DO(7);
+ DO(8); DO(9); DO(10); DO(11); DO(12); DO(13); DO(14); DO(15);
+# undef DO
+
+ VG_(memset)(fpu->padding, 0, sizeof(fpu->padding));
+
+#elif defined(VGP_ppc32_linux)
+ /* The guest state has the FPR fields declared as ULongs, so need
+ to fish out the values without converting them. */
+# define DO(n) (*fpu)[n] = *(double*)(&arch->vex.guest_FPR##n)
+ DO(0); DO(1); DO(2); DO(3); DO(4); DO(5); DO(6); DO(7);
+ DO(8); DO(9); DO(10); DO(11); DO(12); DO(13); DO(14); DO(15);
+ DO(16); DO(17); DO(18); DO(19); DO(20); DO(21); DO(22); DO(23);
+ DO(24); DO(25); DO(26); DO(27); DO(28); DO(29); DO(30); DO(31);
+# undef DO
+
+#elif defined(VGP_ppc64_linux)
+ /* The guest state has the FPR fields declared as ULongs, so need
+ to fish out the values without converting them. */
+# define DO(n) (*fpu)[n] = *(double*)(&arch->vex.guest_FPR##n)
+ DO(0); DO(1); DO(2); DO(3); DO(4); DO(5); DO(6); DO(7);
+ DO(8); DO(9); DO(10); DO(11); DO(12); DO(13); DO(14); DO(15);
+ DO(16); DO(17); DO(18); DO(19); DO(20); DO(21); DO(22); DO(23);
+ DO(24); DO(25); DO(26); DO(27); DO(28); DO(29); DO(30); DO(31);
+# undef DO
+
+#else
+# error Unknown ELF platform
+#endif
}
#if defined(VGP_x86_linux)
static void fill_xfpu(const ThreadState *tst, vki_elf_fpxregset_t *xfpu)
{
- ML_(fill_elffpxregs_from_tst)(xfpu, &tst->arch);
+ ThreadArchState* arch = (ThreadArchState*)&tst->arch;
+
+//:: xfpu->cwd = ?;
+//:: xfpu->swd = ?;
+//:: xfpu->twd = ?;
+//:: xfpu->fop = ?;
+//:: xfpu->fip = ?;
+//:: xfpu->fcs = ?;
+//:: xfpu->foo = ?;
+//:: xfpu->fos = ?;
+//:: xfpu->mxcsr = ?;
+ xfpu->reserved = 0;
+//:: xfpu->st_space = ?;
+
+# define DO(n) VG_(memcpy)(xfpu->xmm_space + n * 4, &arch->vex.guest_XMM##n, sizeof(arch->vex.guest_XMM##n))
+ DO(0); DO(1); DO(2); DO(3); DO(4); DO(5); DO(6); DO(7);
+# undef DO
+
+ VG_(memset)(xfpu->padding, 0, sizeof(xfpu->padding));
}
#endif
@@ -331,16 +503,16 @@
for(i = 1; i < VG_N_THREADS; i++) {
vki_elf_fpregset_t fpu;
-#if defined(VGP_x86_linux)
- vki_elf_fpxregset_t xfpu;
-#endif
if (VG_(threads)[i].status == VgTs_Empty)
continue;
#if defined(VGP_x86_linux)
- fill_xfpu(&VG_(threads)[i], &xfpu);
- add_note(¬elist, "LINUX", NT_PRXFPREG, &xfpu, sizeof(xfpu));
+ {
+ vki_elf_fpxregset_t xfpu;
+ fill_xfpu(&VG_(threads)[i], &xfpu);
+ add_note(¬elist, "LINUX", NT_PRXFPREG, &xfpu, sizeof(xfpu));
+ }
#endif
fill_fpu(&VG_(threads)[i], &fpu);
@@ -418,6 +590,8 @@
make_elf_coredump(tid, si, max_size);
}
+#endif // defined(VGO_linux)
+
/*--------------------------------------------------------------------*/
/*--- end ---*/
/*--------------------------------------------------------------------*/
Copied: branches/BUILD_TWEAKS/coregrind/m_coredump/coredump-macho.c (from rev 10303, branches/BUILD_TWEAKS/coregrind/m_coredump/coredump-x86-darwin.c)
===================================================================
--- branches/BUILD_TWEAKS/coregrind/m_coredump/coredump-macho.c (rev 0)
+++ branches/BUILD_TWEAKS/coregrind/m_coredump/coredump-macho.c 2009-06-12 05:54:13 UTC (rev 10307)
@@ -0,0 +1,47 @@
+
+/*--------------------------------------------------------------------*/
+/*--- Dumping core. coredump-macho.c ---*/
+/*--------------------------------------------------------------------*/
+
+/*
+ This file is part of Valgrind, a dynamic binary instrumentation
+ framework.
+
+ Copyright (C) 2005 Apple Inc.
+ Greg Parker gp...@ap...
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License as
+ published by the Free Software Foundation; either version 2 of the
+ License, or (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307, USA.
+
+ The GNU General Public License is contained in the file COPYING.
+*/
+
+#if defined(VGP_darwin)
+
+#include "pub_core_basics.h"
+#include "pub_core_vki.h"
+#include "pub_core_coredump.h"
+#include "pub_core_threadstate.h"
+
+void VG_(make_coredump)(ThreadId tid, const vki_siginfo_t *si, UInt max_size)
+{
+ // DDD: #warning GrP fixme coredump
+}
+
+#endif // defined(VGP_darwin)
+
+/*--------------------------------------------------------------------*/
+/*--- end ---*/
+/*--------------------------------------------------------------------*/
Property changes on: branches/BUILD_TWEAKS/coregrind/m_coredump/coredump-macho.c
___________________________________________________________________
Name: svn:mergeinfo
+
Deleted: branches/BUILD_TWEAKS/coregrind/m_coredump/coredump-ppc32-aix5.c
===================================================================
--- branches/BUILD_TWEAKS/coregrind/m_coredump/coredump-ppc32-aix5.c 2009-06-12 05:01:48 UTC (rev 10306)
+++ branches/BUILD_TWEAKS/coregrind/m_coredump/coredump-ppc32-aix5.c 2009-06-12 05:54:13 UTC (rev 10307)
@@ -1,52 +0,0 @@
-
-/*--------------------------------------------------------------------*/
-/*--- Dumping core. coredump-ppc32-aix5.c ---*/
-/*--------------------------------------------------------------------*/
-
-/*
- This file is part of Valgrind, a dynamic binary instrumentation
- framework.
-
- Copyright (C) 2006-2009 OpenWorks LLP
- in...@op...
-
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of the
- License, or (at your option) any later version.
-
- This program is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- 02111-1307, USA.
-
- The GNU General Public License is contained in the file COPYING.
-
- Neither the names of the U.S. Department of Energy nor the
- University of California nor the names of its contributors may be
- used to endorse or promote products derived from this software
- without prior written permission.
-*/
-
-#if defined(VGP_ppc32_aix5)
-
-#include "pub_core_basics.h"
-#include "pub_core_vki.h"
-#include "pub_core_libcassert.h"
-#include "pub_core_coredump.h" /* self */
-
-void VG_(make_coredump)(ThreadId tid, const vki_siginfo_t *si, UInt max_size)
-{
- /* not implemented */
-}
-
-#endif // defined(VGP_ppc32_aix5)
-
-/*--------------------------------------------------------------------*/
-/*--- end ---*/
-/*--------------------------------------------------------------------*/
Deleted: branches/BUILD_TWEAKS/coregrind/m_coredump/coredump-ppc32-linux.c
===================================================================
--- branches/BUILD_TWEAKS/coregrind/m_coredump/coredump-ppc32-linux.c 2009-06-12 05:01:48 UTC (rev 10306)
+++ branches/BUILD_TWEAKS/coregrind/m_coredump/coredump-ppc32-linux.c 2009-06-12 05:54:13 UTC (rev 10307)
@@ -1,81 +0,0 @@
-
-/*--------------------------------------------------------------------*/
-/*--- Dumping core. coredump-ppc32-linux.c ---*/
-/*--------------------------------------------------------------------*/
-
-/*
- This file is part of Valgrind, a dynamic binary instrumentation
- framework.
-
- Copyright (C) 2000-2009 Julian Seward
- js...@ac...
-
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of the
- License, or (at your option) any later version.
-
- This program is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- 02111-1307, USA.
-
- The GNU General Public License is contained in the file COPYING.
-*/
-
-#if defined(VGP_ppc32_linux)
-
-#include "pub_core_basics.h"
-#include "pub_core_vki.h"
-#include "pub_core_coredump.h"
-#include "pub_core_threadstate.h"
-
-#include "priv_elf.h"
-
-void ML_(fill_elfregs_from_tst)(struct vki_user_regs_struct* regs,
- const ThreadArchState* arch)
-{
-# define DO(n) regs->gpr[n] = arch->vex.guest_GPR##n
- DO(0); DO(1); DO(2); DO(3); DO(4); DO(5); DO(6); DO(7);
- DO(8); DO(9); DO(10); DO(11); DO(12); DO(13); DO(14); DO(15);
- DO(16); DO(17); DO(18); DO(19); DO(20); DO(21); DO(22); DO(23);
- DO(24); DO(25); DO(26); DO(27); DO(28); DO(29); DO(30); DO(31);
-# undef DO
-
- regs->nip = arch->vex.guest_CIA;
- regs->msr = 0xf032; /* pretty arbitrary */
- regs->orig_gpr3 = arch->vex.guest_GPR3;
- regs->ctr = arch->vex.guest_CTR;
- regs->link = arch->vex.guest_LR;
- regs->xer = LibVEX_GuestPPC32_get_XER( &((ThreadArchState*)arch)->vex );
- regs->ccr = LibVEX_GuestPPC32_get_CR( &((ThreadArchState*)arch)->vex );
- regs->mq = 0;
- regs->trap = 0;
- regs->dar = 0; /* should be fault address? */
- regs->dsisr = 0;
- regs->result = 0;
-}
-
-void ML_(fill_elffpregs_from_tst)(vki_elf_fpregset_t* fpu,
- const ThreadArchState* arch)
-{
- /* The guest state has the FPR fields declared as ULongs, so need
- to fish out the values without converting them. */
-# define DO(n) (*fpu)[n] = *(double*)(&arch->vex.guest_FPR##n)
- DO(0); DO(1); DO(2); DO(3); DO(4); DO(5); DO(6); DO(7);
- DO(8); DO(9); DO(10); DO(11); DO(12); DO(13); DO(14); DO(15);
- DO(16); DO(17); DO(18); DO(19); DO(20); DO(21); DO(22); DO(23);
- DO(24); DO(25); DO(26); DO(27); DO(28); DO(29); DO(30); DO(31);
-# undef DO
-}
-
-#endif // defined(VGP_ppc32_linux)
-
-/*--------------------------------------------------------------------*/
-/*--- end ---*/
-/*--------------------------------------------------------------------*/
Deleted: branches/BUILD_TWEAKS/coregrind/m_coredump/coredump-ppc64-aix5.c
===================================================================
--- branches/BUILD_TWEAKS/coregrind/m_coredump/coredump-ppc64-aix5.c 2009-06-12 05:01:48 UTC (rev 10306)
+++ branches/BUILD_TWEAKS/coregrind/m_coredump/coredump-ppc64-aix5.c 2009-06-12 05:54:13 UTC (rev 10307)
@@ -1,52 +0,0 @@
-
-/*--------------------------------------------------------------------*/
-/*--- Dumping core. coredump-ppc64-aix5.c ---*/
-/*--------------------------------------------------------------------*/
-
-/*
- This file is part of Valgrind, a dynamic binary instrumentation
- framework.
-
- Copyright (C) 2006-2009 OpenWorks LLP
- in...@op...
-
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of the
- License, or (at your option) any later version.
-
- This program is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- 02111-1307, USA.
-
- The GNU General Public License is contained in the file COPYING.
-
- Neither the names of the U.S. Department of Energy nor the
- University of California nor the names of its contributors may be
- used to endorse or promote products derived from this software
- without prior written permission.
-*/
-
-#if defined(VGP_ppc64_aix5)
-
-#include "pub_core_basics.h"
-#include "pub_core_vki.h"
-#include "pub_core_libcassert.h"
-#include "pub_core_coredump.h" /* self */
-
-void VG_(make_coredump)(ThreadId tid, const vki_siginfo_t *si, UInt max_size)
-{
- /* not implemented */
-}
-
-#endif // defined(VGP_ppc64_aix5)
-
-/*--------------------------------------------------------------------*/
-/*--- end ---*/
-/*--------------------------------------------------------------------*/
Deleted: branches/BUILD_TWEAKS/coregrind/m_coredump/coredump-ppc64-linux.c
===================================================================
--- branches/BUILD_TWEAKS/coregrind/m_coredump/coredump-ppc64-linux.c 2009-06-12 05:01:48 UTC (rev 10306)
+++ branches/BUILD_TWEAKS/coregrind/m_coredump/coredump-ppc64-linux.c 2009-06-12 05:54:13 UTC (rev 10307)
@@ -1,81 +0,0 @@
-
-/*--------------------------------------------------------------------*/
-/*--- Dumping core. coredump-ppc32-linux.c ---*/
-/*--------------------------------------------------------------------*/
-
-/*
- This file is part of Valgrind, a dynamic binary instrumentation
- framework.
-
- Copyright (C) 2000-2009 Julian Seward
- js...@ac...
-
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of the
- License, or (at your option) any later version.
-
- This program is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- 02111-1307, USA.
-
- The GNU General Public License is contained in the file COPYING.
-*/
-
-#if defined(VGP_ppc64_linux)
-
-#include "pub_core_basics.h"
-#include "pub_core_vki.h"
-#include "pub_core_coredump.h"
-#include "pub_core_threadstate.h"
-
-#include "priv_elf.h"
-
-void ML_(fill_elfregs_from_tst)(struct vki_user_regs_struct* regs,
- const ThreadArchState* arch)
-{
-# define DO(n) regs->gpr[n] = arch->vex.guest_GPR##n
- DO(0); DO(1); DO(2); DO(3); DO(4); DO(5); DO(6); DO(7);
- DO(8); DO(9); DO(10); DO(11); DO(12); DO(13); DO(14); DO(15);
- DO(16); DO(17); DO(18); DO(19); DO(20); DO(21); DO(22); DO(23);
- DO(24); DO(25); DO(26); DO(27); DO(28); DO(29); DO(30); DO(31);
-# undef DO
-
- regs->nip = arch->vex.guest_CIA;
- regs->msr = 0xf032; /* pretty arbitrary */
- regs->orig_gpr3 = arch->vex.guest_GPR3;
- regs->ctr = arch->vex.guest_CTR;
- regs->link = arch->vex.guest_LR;
- regs->xer = LibVEX_GuestPPC64_get_XER( &((ThreadArchState*)arch)->vex );
- regs->ccr = LibVEX_GuestPPC64_get_CR( &((ThreadArchState*)arch)->vex );
- /* regs->mq = 0; */
- regs->trap = 0;
- regs->dar = 0; /* should be fault address? */
- regs->dsisr = 0;
- regs->result = 0;
-}
-
-void ML_(fill_elffpregs_from_tst)(vki_elf_fpregset_t* fpu,
- const ThreadArchState* arch)
-{
- /* The guest state has the FPR fields declared as ULongs, so need
- to fish out the values without converting them. */
-# define DO(n) (*fpu)[n] = *(double*)(&arch->vex.guest_FPR##n)
- DO(0); DO(1); DO(2); DO(3); DO(4); DO(5); DO(6); DO(7);
- DO(8); DO(9); DO(10); DO(11); DO(12); DO(13); DO(14); DO(15);
- DO(16); DO(17); DO(18); DO(19); DO(20); DO(21); DO(22); DO(23);
- DO(24); DO(25); DO(26); DO(27); DO(28); DO(29); DO(30); DO(31);
-# undef DO
-}
-
-#endif // defined(VGP_ppc64_linux)
-
-/*--------------------------------------------------------------------*/
-/*--- end ---*/
-/*--------------------------------------------------------------------*/
Deleted: branches/BUILD_TWEAKS/coregrind/m_coredump/coredump-x86-darwin.c
===================================================================
--- branches/BUILD_TWEAKS/coregrind/m_coredump/coredump-x86-darwin.c 2009-06-12 05:01:48 UTC (rev 10306)
+++ branches/BUILD_TWEAKS/coregrind/m_coredump/coredump-x86-darwin.c 2009-06-12 05:54:13 UTC (rev 10307)
@@ -1,47 +0,0 @@
-
-/*--------------------------------------------------------------------*/
-/*--- Dumping core. coredump-x86-darwin.c ---*/
-/*--------------------------------------------------------------------*/
-
-/*
- This file is part of Valgrind, a dynamic binary instrumentation
- framework.
-
- Copyright (C) 2005 Apple Inc.
- Greg Parker gp...@ap...
-
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of the
- License, or (at your option) any later version.
-
- This program is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- 02111-1307, USA.
-
- The GNU General Public License is contained in the file COPYING.
-*/
-
-#if defined(VGP_x86_darwin)
-
-#include "pub_core_basics.h"
-#include "pub_core_vki.h"
-#include "pub_core_coredump.h"
-#include "pub_core_threadstate.h"
-
-void VG_(make_coredump)(ThreadId tid, const vki_siginfo_t *si, UInt max_size)
-{
- // DDD: #warning GrP fixme coredump
-}
-
-#endif // defined(VGP_x86_darwin)
-
-/*--------------------------------------------------------------------*/
-/*--- end ---*/
-/*--------------------------------------------------------------------*/
Deleted: branches/BUILD_TWEAKS/coregrind/m_coredump/coredump-x86-linux.c
===================================================================
--- branches/BUILD_TWEAKS/coregrind/m_coredump/coredump-x86-linux.c 2009-06-12 05:01:48 UTC (rev 10306)
+++ branches/BUILD_TWEAKS/coregrind/m_coredump/coredump-x86-linux.c 2009-06-12 05:54:13 UTC (rev 10307)
@@ -1,114 +0,0 @@
-
-/*--------------------------------------------------------------------*/
-/*--- Dumping core. coredump-x86-linux.c ---*/
-/*--------------------------------------------------------------------*/
-
-/*
- This file is part of Valgrind, a dynamic binary instrumentation
- framework.
-
- Copyright (C) 2000-2009 Julian Seward
- js...@ac...
-
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of the
- License, or (at your option) any later version.
-
- This program is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- 02111-1307, USA.
-
- The GNU General Public License is contained in the file COPYING.
-*/
-
-#if defined(VGP_x86_linux)
-
-#include "pub_core_basics.h"
-#include "pub_core_vki.h"
-#include "pub_core_libcbase.h"
-#include "pub_core_coredump.h"
-#include "pub_core_threadstate.h"
-
-#include "priv_elf.h"
-
-void ML_(fill_elfregs_from_tst)(struct vki_user_regs_struct* regs,
- const ThreadArchState* arch)
-{
- regs->eflags = LibVEX_GuestX86_get_eflags( &((ThreadArchState*)arch)->vex );
- regs->esp = arch->vex.guest_ESP;
- regs->eip = arch->vex.guest_EIP;
-
- regs->ebx = arch->vex.guest_EBX;
- regs->ecx = arch->vex.guest_ECX;
- regs->edx = arch->vex.guest_EDX;
- regs->esi = arch->vex.guest_ESI;
- regs->edi = arch->vex.guest_EDI;
- regs->ebp = arch->vex.guest_EBP;
- regs->eax = arch->vex.guest_EAX;
-
- regs->cs = arch->vex.guest_CS;
- regs->ds = arch->vex.guest_DS;
- regs->ss = arch->vex.guest_SS;
- regs->es = arch->vex.guest_ES;
- regs->fs = arch->vex.guest_FS;
- regs->gs = arch->vex.guest_GS;
-}
-
-//:: static void fill_fpu(vki_elf_fpregset_t *fpu, const Char *from)
-//:: {
-//:: if (VG_(have_ssestate)) {
-//:: UShort *to;
-//:: Int i;
-//::
-//:: /* This is what the kernel does */
-//:: VG_(memcpy)(fpu, from, 7*sizeof(long));
-//::
-//:: to = (UShort *)&fpu->st_space[0];
-//:: from += 18 * sizeof(UShort);
-//::
-//:: for (i = 0; i < 8; i++, to += 5, from += 8)
-//:: VG_(memcpy)(to, from, 5*sizeof(UShort));
-//:: } else
-//:: VG_(memcpy)(fpu, from, sizeof(*fpu));
-//:: }
-
-void ML_(fill_elffpregs_from_tst)(vki_elf_fpregset_t* fpu,
- const ThreadArchState* arch)
-{
-//:: fill_fpu(fpu, (const Char *)&arch->m_sse);
-}
-
-void ML_(fill_elffpxregs_from_tst)(vki_elf_fpxregset_t* xfpu,
- const ThreadArchState* arch)
-{
-//:: xfpu->cwd = ?;
-//:: xfpu->swd = ?;
-//:: xfpu->twd = ?;
-//:: xfpu->fop = ?;
-//:: xfpu->fip = ?;
-//:: xfpu->fcs = ?;
-//:: xfpu->foo = ?;
-//:: xfpu->fos = ?;
-//:: xfpu->mxcsr = ?;
- xfpu->reserved = 0;
-//:: xfpu->st_space = ?;
-
-# define DO(n) VG_(memcpy)(xfpu->xmm_space + n * 4, &arch->vex.guest_XMM##n, sizeof(arch->vex.guest_XMM##n))
- DO(0); DO(1); DO(2); DO(3); DO(4); DO(5); DO(6); DO(7);
-# undef DO
-
- VG_(memset)(xfpu->padding, 0, sizeof(xfpu->padding));
-}
-
-#endif // defined(VGP_x86_linux)
-
-/*--------------------------------------------------------------------*/
-/*--- end ---*/
-/*--------------------------------------------------------------------*/
Copied: branches/BUILD_TWEAKS/coregrind/m_coredump/coredump-xcoff.c (from rev 10303, branches/BUILD_TWEAKS/coregrind/m_coredump/coredump-ppc32-aix5.c)
===================================================================
--- branches/BUILD_TWEAKS/coregrind/m_coredump/coredump-xcoff.c (rev 0)
+++ branches/BUILD_TWEAKS/coregrind/m_coredump/coredump-xcoff.c 2009-06-12 05:54:13 UTC (rev 10307)
@@ -0,0 +1,52 @@
+
+/*--------------------------------------------------------------------*/
+/*--- Dumping core. coredump-xcoff.c ---*/
+/*--------------------------------------------------------------------*/
+
+/*
+ This file is part of Valgrind, a dynamic binary instrumentation
+ framework.
+
+ Copyright (C) 2006-2009 OpenWorks LLP
+ in...@op...
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License as
+ published by the Free Software Foundation; either version 2 of the
+ License, or (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307, USA.
+
+ The GNU General Public License is contained in the file COPYING.
+
+ Neither the names of the U.S. Department of Energy nor the
+ University of California nor the names of its contributors may be
+ used to endorse or promote products derived from this software
+ without prior written permission.
+*/
+
+#if defined(VGO_aix5)
+
+#include "pub_core_basics.h"
+#include "pub_core_vki.h"
+#include "pub_core_libcassert.h"
+#include "pub_core_coredump.h" /* self */
+
+void VG_(make_coredump)(ThreadId tid, const vki_siginfo_t *si, UInt max_size)
+{
+ /* not implemented */
+}
+
+#endif // defined(VGO_aix5)
+
+/*--------------------------------------------------------------------*/
+/*--- end ---*/
+/*--------------------------------------------------------------------*/
Property changes on: branches/BUILD_TWEAKS/coregrind/m_coredump/coredump-xcoff.c
___________________________________________________________________
Name: svn:mergeinfo
+
Deleted: branches/BUILD_TWEAKS/coregrind/m_coredump/priv_elf.h
===================================================================
--- branches/BUILD_TWEAKS/coregrind/m_coredump/priv_elf.h 2009-06-12 05:01:48 UTC (rev 10306)
+++ branches/BUILD_TWEAKS/coregrind/m_coredump/priv_elf.h 2009-06-12 05:54:13 UTC (rev 10307)
@@ -1,49 +0,0 @@
-
-/*--------------------------------------------------------------------*/
-/*--- Header for ELF core dump stuff. priv_elf.h ---*/
-/*--------------------------------------------------------------------*/
-
-/*
- This file is part of Valgrind, a dynamic binary instrumentation
- framework.
-
- Copyright (C) 2000-2009 Julian Seward
- js...@ac...
-
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of the
- License, or (at your option) any later version.
-
- This program is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- 02111-1307, USA.
-
- The GNU General Public License is contained in the file COPYING.
-*/
-
-#ifndef __PRIV_ELF_H
-#define __PRIV_ELF_H
-
-void ML_(fill_elfregs_from_tst)(struct vki_user_regs_struct* regs,
- const ThreadArchState* arch);
-
-void ML_(fill_elffpregs_from_tst)(vki_elf_fpregset_t* fpu,
- const ThreadArchState* arch);
-
-#if defined(VGP_x86_linux)
-void ML_(fill_elffpxregs_from_tst)(vki_elf_fpxregset_t* xfpu,
- const ThreadArchState* arch);
-#endif
-
-#endif // __PRIV_ELF_H
-
-/*--------------------------------------------------------------------*/
-/*--- end ---*/
-/*--------------------------------------------------------------------*/
|
|
From: <sv...@va...> - 2009-06-12 05:01:51
|
Author: njn Date: 2009-06-12 06:01:48 +0100 (Fri, 12 Jun 2009) New Revision: 10306 Log: Fix Darwin compile breakage. Modified: branches/BUILD_TWEAKS/coregrind/m_ume/priv_ume.h Modified: branches/BUILD_TWEAKS/coregrind/m_ume/priv_ume.h =================================================================== --- branches/BUILD_TWEAKS/coregrind/m_ume/priv_ume.h 2009-06-12 04:56:25 UTC (rev 10305) +++ branches/BUILD_TWEAKS/coregrind/m_ume/priv_ume.h 2009-06-12 05:01:48 UTC (rev 10306) @@ -37,7 +37,7 @@ #if defined(VGO_linux) extern Bool VG_(match_ELF) ( Char *hdr, Int len ); extern Int VG_(load_ELF) ( Int fd, const HChar *name, ExeInfo *info ); -#elif defined(HAVE_MACHO) +#elif defined(VGO_darwin) extern Bool VG_(match_macho) ( Char *hdr, Int len ); extern Int VG_(load_macho) ( Int fd, const HChar *name, ExeInfo *info ); #else |
|
From: <sv...@va...> - 2009-06-12 04:56:32
|
Author: njn
Date: 2009-06-12 05:56:25 +0100 (Fri, 12 Jun 2009)
New Revision: 10305
Log:
More preprocessor file selection. Also get rid of the
HAVE_{ELF,MACHO,SCRIPT} constants -- they were used only inconsistently.
Perhaps they should be used universally instead of VGO_linux et al, but that
can happen later.
Modified:
branches/BUILD_TWEAKS/coregrind/Makefile.am
branches/BUILD_TWEAKS/coregrind/m_debuginfo/debuginfo.c
branches/BUILD_TWEAKS/coregrind/m_debuginfo/priv_readpdb.h
branches/BUILD_TWEAKS/coregrind/m_debuginfo/readdwarf.c
branches/BUILD_TWEAKS/coregrind/m_debuginfo/readdwarf3.c
branches/BUILD_TWEAKS/coregrind/m_debuginfo/readelf.c
branches/BUILD_TWEAKS/coregrind/m_debuginfo/readmacho.c
branches/BUILD_TWEAKS/coregrind/m_debuginfo/readpdb.c
branches/BUILD_TWEAKS/coregrind/m_debuginfo/readstabs.c
branches/BUILD_TWEAKS/coregrind/m_debuginfo/readxcoff.c
branches/BUILD_TWEAKS/coregrind/m_ume/elf.c
branches/BUILD_TWEAKS/coregrind/m_ume/macho.c
branches/BUILD_TWEAKS/coregrind/m_ume/main.c
branches/BUILD_TWEAKS/coregrind/m_ume/priv_ume.h
branches/BUILD_TWEAKS/coregrind/m_ume/script.c
branches/BUILD_TWEAKS/coregrind/pub_core_ume.h
Modified: branches/BUILD_TWEAKS/coregrind/Makefile.am
===================================================================
--- branches/BUILD_TWEAKS/coregrind/Makefile.am 2009-06-12 03:14:08 UTC (rev 10304)
+++ branches/BUILD_TWEAKS/coregrind/Makefile.am 2009-06-12 04:56:25 UTC (rev 10305)
@@ -287,8 +287,15 @@
m_coredump/coredump-amd64-darwin.c \
m_debuginfo/misc.c \
m_debuginfo/d3basics.c \
- m_debuginfo/storage.c \
m_debuginfo/debuginfo.c \
+ m_debuginfo/readdwarf.c \
+ m_debuginfo/readdwarf3.c \
+ m_debuginfo/readelf.c \
+ m_debuginfo/readmacho.c \
+ m_debuginfo/readpdb.c \
+ m_debuginfo/readstabs.c \
+ m_debuginfo/readxcoff.c \
+ m_debuginfo/storage.c \
m_debuginfo/tytypes.c \
m_demangle/cp-demangle.c \
m_demangle/cplus-dem.c \
@@ -352,23 +359,8 @@
m_ume/script.c
COREGRIND_LINUX_SOURCE = \
- m_coredump/coredump-elf.c \
- m_debuginfo/readelf.c \
- m_debuginfo/readdwarf.c \
- m_debuginfo/readdwarf3.c \
- m_debuginfo/readstabs.c \
- m_debuginfo/readpdb.c
+ m_coredump/coredump-elf.c
-COREGRIND_AIX5_SOURCE = \
- m_debuginfo/readxcoff.c
-
-COREGRIND_DARWIN_SOURCE = \
- m_debuginfo/readdwarf.c \
- m_debuginfo/readdwarf3.c \
- m_debuginfo/readstabs.c \
- m_debuginfo/readmacho.c \
- m_debuginfo/readpdb.c
-
# These are generated using 'mig' from $mach_defs above.
COREGRIND_DARWIN_BUILT_SOURCES = \
m_mach/mach_vmUser.c \
@@ -405,32 +397,28 @@
libcoregrind_ppc64_linux_a_CCASFLAGS = $(AM_CCASFLAGS_PPC64_LINUX)
libcoregrind_ppc32_aix5_a_SOURCES = \
- $(COREGRIND_SOURCES_COMMON) \
- $(COREGRIND_AIX5_SOURCE)
+ $(COREGRIND_SOURCES_COMMON)
libcoregrind_ppc32_aix5_a_CPPFLAGS = $(AM_CPPFLAGS_PPC32_AIX5)
libcoregrind_ppc32_aix5_a_CFLAGS = $(AM_CFLAGS_PPC32_AIX5)
libcoregrind_ppc32_aix5_a_CCASFLAGS = $(AM_CCASFLAGS_PPC32_AIX5)
libcoregrind_ppc32_aix5_a_AR = $(AR) -X32 cru
libcoregrind_ppc64_aix5_a_SOURCES = \
- $(COREGRIND_SOURCES_COMMON) \
- $(COREGRIND_AIX5_SOURCE)
+ $(COREGRIND_SOURCES_COMMON)
libcoregrind_ppc64_aix5_a_CPPFLAGS = $(AM_CPPFLAGS_PPC64_AIX5)
libcoregrind_ppc64_aix5_a_CFLAGS = $(AM_CFLAGS_PPC64_AIX5)
libcoregrind_ppc64_aix5_a_CCASFLAGS = $(AM_CCASFLAGS_PPC64_AIX5)
libcoregrind_ppc64_aix5_a_AR = $(AR) -X64 cru
libcoregrind_x86_darwin_a_SOURCES = \
- $(COREGRIND_SOURCES_COMMON) \
- $(COREGRIND_DARWIN_SOURCE)
+ $(COREGRIND_SOURCES_COMMON)
nodist_libcoregrind_x86_darwin_a_SOURCES = $(COREGRIND_DARWIN_BUILT_SOURCES)
libcoregrind_x86_darwin_a_CPPFLAGS = $(AM_CPPFLAGS_X86_DARWIN)
libcoregrind_x86_darwin_a_CFLAGS = $(AM_CFLAGS_X86_DARWIN)
libcoregrind_x86_darwin_a_CCASFLAGS = $(AM_CCASFLAGS_X86_DARWIN)
libcoregrind_amd64_darwin_a_SOURCES = \
- $(COREGRIND_SOURCES_COMMON) \
- $(COREGRIND_DARWIN_SOURCE)
+ $(COREGRIND_SOURCES_COMMON)
nodist_libcoregrind_amd64_darwin_a_SOURCES = $(COREGRIND_DARWIN_BUILT_SOURCES)
libcoregrind_amd64_darwin_a_CPPFLAGS = $(AM_CPPFLAGS_AMD64_DARWIN)
libcoregrind_amd64_darwin_a_CFLAGS = $(AM_CFLAGS_AMD64_DARWIN)
Modified: branches/BUILD_TWEAKS/coregrind/m_debuginfo/debuginfo.c
===================================================================
--- branches/BUILD_TWEAKS/coregrind/m_debuginfo/debuginfo.c 2009-06-12 03:14:08 UTC (rev 10304)
+++ branches/BUILD_TWEAKS/coregrind/m_debuginfo/debuginfo.c 2009-06-12 04:56:25 UTC (rev 10305)
@@ -28,11 +28,6 @@
The GNU General Public License is contained in the file COPYING.
*/
-/*
- Stabs reader greatly improved by Nick Nethercote, Apr 02.
- This module was also extensively hacked on by Jeremy Fitzhardinge
- and Tom Hughes.
-*/
#include "pub_core_basics.h"
#include "pub_core_vki.h"
@@ -752,15 +747,16 @@
}
vg_assert(nread > 0 && nread <= sizeof(buf1k) );
- /* We're only interested in mappings of ELF object files. */
-#if defined(HAVE_ELF)
+ /* We're only interested in mappings of object files. */
+ // Nb: AIX5 doesn't use this file and so isn't represented here.
+#if defined(VGO_linux)
if (!ML_(is_elf_object_file)( buf1k, (SizeT)nread ))
return 0;
-#elif defined(HAVE_MACHO)
+#elif defined(VGO_darwin)
if (!ML_(is_macho_object_file)( buf1k, (SizeT)nread ))
return 0;
#else
-# error "unknown executable type"
+# error "unknown OS"
#endif
/* See if we have a DebugInfo for this filename. If not,
@@ -813,12 +809,13 @@
discard_DebugInfos_which_overlap_with( di );
/* .. and acquire new info. */
-#if defined(HAVE_ELF)
+ // Nb: AIX5 doesn't use this file and so isn't represented here.
+#if defined(VGO_linux)
ok = ML_(read_elf_debug_info)( di );
-#elif defined(HAVE_MACHO)
+#elif defined(VGO_darwin)
ok = ML_(read_macho_debug_info)( di );
#else
-# error "unknown executable type"
+# error "unknown OS"
#endif
if (ok) {
@@ -1026,7 +1023,7 @@
if (pdbname) ML_(dinfo_free)(pdbname);
}
-#endif /* defined(VGO_linux) */
+#endif /* defined(VGO_linux) || defined(VGO_darwin) */
/*-------------------------------------------------------------*/
Modified: branches/BUILD_TWEAKS/coregrind/m_debuginfo/priv_readpdb.h
===================================================================
--- branches/BUILD_TWEAKS/coregrind/m_debuginfo/priv_readpdb.h 2009-06-12 03:14:08 UTC (rev 10304)
+++ branches/BUILD_TWEAKS/coregrind/m_debuginfo/priv_readpdb.h 2009-06-12 04:56:25 UTC (rev 10305)
@@ -32,6 +32,8 @@
The GNU General Public License is contained in the file COPYING.
*/
+#if defined(VGO_linux) || defined(VGO_darwin)
+
#ifndef __PRIV_READPDB_H
#define __PRIV_READPDB_H
@@ -48,6 +50,8 @@
#endif /* ndef __PRIV_READPDB_H */
+#endif // defined(VGO_linux) || defined(VGO_darwin)
+
/*--------------------------------------------------------------------*/
-/*--- end priv_readpdb.h ---*/
+/*--- end ---*/
/*--------------------------------------------------------------------*/
Modified: branches/BUILD_TWEAKS/coregrind/m_debuginfo/readdwarf.c
===================================================================
--- branches/BUILD_TWEAKS/coregrind/m_debuginfo/readdwarf.c 2009-06-12 03:14:08 UTC (rev 10304)
+++ branches/BUILD_TWEAKS/coregrind/m_debuginfo/readdwarf.c 2009-06-12 04:56:25 UTC (rev 10305)
@@ -27,12 +27,9 @@
The GNU General Public License is contained in the file COPYING.
*/
-/*
- Stabs reader greatly improved by Nick Nethercote, Apr 02.
- This module was also extensively hacked on by Jeremy Fitzhardinge
- and Tom Hughes.
-*/
+#if defined(VGO_linux) || defined(VGO_darwin)
+
#include "pub_core_basics.h"
#include "pub_core_debuginfo.h"
#include "pub_core_libcbase.h"
@@ -3884,6 +3881,7 @@
return;
}
+#endif // defined(VGO_linux) || defined(VGO_darwin)
/*--------------------------------------------------------------------*/
/*--- end ---*/
Modified: branches/BUILD_TWEAKS/coregrind/m_debuginfo/readdwarf3.c
===================================================================
--- branches/BUILD_TWEAKS/coregrind/m_debuginfo/readdwarf3.c 2009-06-12 03:14:08 UTC (rev 10304)
+++ branches/BUILD_TWEAKS/coregrind/m_debuginfo/readdwarf3.c 2009-06-12 04:56:25 UTC (rev 10305)
@@ -34,6 +34,8 @@
without prior written permission.
*/
+#if defined(VGO_linux) || defined(VGO_darwin)
+
/* REFERENCE (without which this code will not make much sense):
DWARF Debugging Information Format, Version 3,
@@ -3904,7 +3906,8 @@
TRACE_SYMTAB("\n");
#endif
+#endif // defined(VGO_linux) || defined(VGO_darwin)
/*--------------------------------------------------------------------*/
-/*--- end readdwarf3.c ---*/
+/*--- end ---*/
/*--------------------------------------------------------------------*/
Modified: branches/BUILD_TWEAKS/coregrind/m_debuginfo/readelf.c
===================================================================
--- branches/BUILD_TWEAKS/coregrind/m_debuginfo/readelf.c 2009-06-12 03:14:08 UTC (rev 10304)
+++ branches/BUILD_TWEAKS/coregrind/m_debuginfo/readelf.c 2009-06-12 04:56:25 UTC (rev 10305)
@@ -28,12 +28,9 @@
The GNU General Public License is contained in the file COPYING.
*/
-/*
- Stabs reader greatly improved by Nick Nethercote, Apr 02.
- This module was also extensively hacked on by Jeremy Fitzhardinge
- and Tom Hughes.
-*/
+#if defined(VGO_linux)
+
#include "pub_core_basics.h"
#include "pub_core_vki.h"
#include "pub_core_debuginfo.h"
@@ -2048,6 +2045,7 @@
}
}
+#endif // defined(VGO_linux)
/*--------------------------------------------------------------------*/
/*--- end ---*/
Modified: branches/BUILD_TWEAKS/coregrind/m_debuginfo/readmacho.c
===================================================================
--- branches/BUILD_TWEAKS/coregrind/m_debuginfo/readmacho.c 2009-06-12 03:14:08 UTC (rev 10304)
+++ branches/BUILD_TWEAKS/coregrind/m_debuginfo/readmacho.c 2009-06-12 04:56:25 UTC (rev 10305)
@@ -29,6 +29,8 @@
The GNU General Public License is contained in the file COPYING.
*/
+#if defined(VGO_darwin)
+
#include "pub_core_basics.h"
#include "pub_core_vki.h"
#include "pub_core_libcbase.h"
@@ -1092,6 +1094,8 @@
return False;
}
+#endif // defined(VGO_darwin)
+
/*--------------------------------------------------------------------*/
-/*--- end readmacho.c ---*/
+/*--- end ---*/
/*--------------------------------------------------------------------*/
Modified: branches/BUILD_TWEAKS/coregrind/m_debuginfo/readpdb.c
===================================================================
--- branches/BUILD_TWEAKS/coregrind/m_debuginfo/readpdb.c 2009-06-12 03:14:08 UTC (rev 10304)
+++ branches/BUILD_TWEAKS/coregrind/m_debuginfo/readpdb.c 2009-06-12 04:56:25 UTC (rev 10305)
@@ -35,6 +35,8 @@
The GNU General Public License is contained in the file COPYING.
*/
+#if defined(VGO_linux) || defined(VGO_darwin)
+
#include "pub_core_basics.h"
#include "pub_core_debuginfo.h"
#include "pub_core_vki.h" // VKI_PAGE_SIZE
@@ -2261,7 +2263,8 @@
return True;
}
+#endif // defined(VGO_linux) || defined(VGO_darwin)
/*--------------------------------------------------------------------*/
-/*--- end readpdb.c ---*/
+/*--- end ---*/
/*--------------------------------------------------------------------*/
Modified: branches/BUILD_TWEAKS/coregrind/m_debuginfo/readstabs.c
===================================================================
--- branches/BUILD_TWEAKS/coregrind/m_debuginfo/readstabs.c 2009-06-12 03:14:08 UTC (rev 10304)
+++ branches/BUILD_TWEAKS/coregrind/m_debuginfo/readstabs.c 2009-06-12 04:56:25 UTC (rev 10305)
@@ -27,6 +27,9 @@
The GNU General Public License is contained in the file COPYING.
*/
+
+#if defined(VGO_linux) || defined(VGO_darwin)
+
/*
Stabs reader greatly improved by Nick Nethercote, Apr 02.
This module was also extensively hacked on by Jeremy Fitzhardinge
@@ -386,6 +389,8 @@
}
}
+#endif // defined(VGO_linux) || defined(VGO_darwin)
+
/*--------------------------------------------------------------------*/
/*--- end ---*/
/*--------------------------------------------------------------------*/
Modified: branches/BUILD_TWEAKS/coregrind/m_debuginfo/readxcoff.c
===================================================================
--- branches/BUILD_TWEAKS/coregrind/m_debuginfo/readxcoff.c 2009-06-12 03:14:08 UTC (rev 10304)
+++ branches/BUILD_TWEAKS/coregrind/m_debuginfo/readxcoff.c 2009-06-12 04:56:25 UTC (rev 10305)
@@ -33,6 +33,8 @@
without prior written permission.
*/
+#if defined(VGO_aix5)
+
/* This file reads XCOFF symbol tables and debug info.
Known limitations:
@@ -2481,6 +2483,8 @@
return ok;
}
+#endif // defined(VGO_aix5)
+
/*--------------------------------------------------------------------*/
/*--- end ---*/
/*--------------------------------------------------------------------*/
Modified: branches/BUILD_TWEAKS/coregrind/m_ume/elf.c
===================================================================
--- branches/BUILD_TWEAKS/coregrind/m_ume/elf.c 2009-06-12 03:14:08 UTC (rev 10304)
+++ branches/BUILD_TWEAKS/coregrind/m_ume/elf.c 2009-06-12 04:56:25 UTC (rev 10305)
@@ -28,6 +28,8 @@
The GNU General Public License is contained in the file COPYING.
*/
+#if defined(VGO_linux)
+
#include "pub_core_basics.h"
#include "pub_core_vki.h"
@@ -44,8 +46,6 @@
#include "priv_ume.h"
-#if defined(HAVE_ELF)
-
/* --- !!! --- EXTERNAL HEADERS start --- !!! --- */
#define _GNU_SOURCE
#define _FILE_OFFSET_BITS 64
@@ -511,7 +511,7 @@
return 0;
}
-#endif /* defined(HAVE_ELF) */
+#endif // defined(VGO_linux)
/*--------------------------------------------------------------------*/
/*--- end ---*/
Modified: branches/BUILD_TWEAKS/coregrind/m_ume/macho.c
===================================================================
--- branches/BUILD_TWEAKS/coregrind/m_ume/macho.c 2009-06-12 03:14:08 UTC (rev 10304)
+++ branches/BUILD_TWEAKS/coregrind/m_ume/macho.c 2009-06-12 04:56:25 UTC (rev 10305)
@@ -28,6 +28,8 @@
The GNU General Public License is contained in the file COPYING.
*/
+#if defined(VGO_darwin)
+
#include "pub_core_basics.h"
#include "pub_core_vki.h"
@@ -45,9 +47,6 @@
#include "priv_ume.h"
-
-#if defined(HAVE_MACHO)
-
#include <mach/mach.h>
#include <mach-o/dyld.h>
@@ -768,7 +767,7 @@
return 0;
}
-#endif // defined(HAVE_MACHO)
+#endif // defined(VGO_darwin)
/*--------------------------------------------------------------------*/
/*--- end ---*/
Modified: branches/BUILD_TWEAKS/coregrind/m_ume/main.c
===================================================================
--- branches/BUILD_TWEAKS/coregrind/m_ume/main.c 2009-06-12 03:14:08 UTC (rev 10304)
+++ branches/BUILD_TWEAKS/coregrind/m_ume/main.c 2009-06-12 04:56:25 UTC (rev 10305)
@@ -46,21 +46,20 @@
typedef struct {
- const HChar *name;
Bool (*match_fn)(Char *hdr, Int len);
Int (*load_fn)(Int fd, const HChar *name, ExeInfo *info);
} ExeHandler;
static ExeHandler exe_handlers[] = {
-# if defined(HAVE_ELF)
- { "ELF", VG_(match_ELF), VG_(load_ELF) },
-# endif
-# if defined(HAVE_SCRIPT)
- { "script", VG_(match_script), VG_(load_script) },
-# endif
-# if defined(HAVE_MACHO)
- { "Mach-O", VG_(match_macho), VG_(load_macho) },
-# endif
+ // Nb: AIX5 doesn't use m_ume, which is why it's not represented here.
+#if defined(VGO_linux)
+ { VG_(match_ELF), VG_(load_ELF) },
+#elif defined(VGO_darwin)
+ { VG_(match_macho), VG_(load_macho) },
+#else
+# error "unknown OS"
+#endif
+ { VG_(match_script), VG_(load_script) },
};
#define EXE_HANDLER_COUNT (sizeof(exe_handlers)/sizeof(exe_handlers[0]))
Modified: branches/BUILD_TWEAKS/coregrind/m_ume/priv_ume.h
===================================================================
--- branches/BUILD_TWEAKS/coregrind/m_ume/priv_ume.h 2009-06-12 03:14:08 UTC (rev 10304)
+++ branches/BUILD_TWEAKS/coregrind/m_ume/priv_ume.h 2009-06-12 04:56:25 UTC (rev 10305)
@@ -27,28 +27,31 @@
The GNU General Public License is contained in the file COPYING.
*/
+#if defined(VGO_linux) || defined(VGO_darwin)
+
#ifndef __PRIV_UME_H
#define __PRIV_UME_H
extern int VG_(do_exec_inner)(const HChar *exe, ExeInfo *info);
-#if defined(HAVE_ELF)
+#if defined(VGO_linux)
extern Bool VG_(match_ELF) ( Char *hdr, Int len );
extern Int VG_(load_ELF) ( Int fd, const HChar *name, ExeInfo *info );
+#elif defined(HAVE_MACHO)
+extern Bool VG_(match_macho) ( Char *hdr, Int len );
+extern Int VG_(load_macho) ( Int fd, const HChar *name, ExeInfo *info );
+#else
+# error Unknown OS
#endif
-#if defined(HAVE_SCRIPT)
extern Bool VG_(match_script) ( Char *hdr, Int len );
extern Int VG_(load_script) ( Int fd, const HChar *name, ExeInfo *info );
-#endif
-#if defined(HAVE_MACHO)
-extern Bool VG_(match_macho) ( Char *hdr, Int len );
-extern Int VG_(load_macho) ( Int fd, const HChar *name, ExeInfo *info );
-#endif
-#endif /* __PRIV_UME_H */
+#endif // __PRIV_UME_H
+#endif // defined(VGO_linux) || defined(VGO_darwin)
+
/*--------------------------------------------------------------------*/
/*--- end ---*/
/*--------------------------------------------------------------------*/
Modified: branches/BUILD_TWEAKS/coregrind/m_ume/script.c
===================================================================
--- branches/BUILD_TWEAKS/coregrind/m_ume/script.c 2009-06-12 03:14:08 UTC (rev 10304)
+++ branches/BUILD_TWEAKS/coregrind/m_ume/script.c 2009-06-12 04:56:25 UTC (rev 10305)
@@ -40,9 +40,6 @@
#include "priv_ume.h"
-
-#if defined(HAVE_SCRIPT)
-
Bool VG_(match_script)(Char *hdr, Int len)
{
Char* end = hdr + len;
@@ -143,8 +140,6 @@
return VG_(do_exec_inner)(interp, info);
}
-#endif /* defined(HAVE_SCRIPT) */
-
/*--------------------------------------------------------------------*/
/*--- end ---*/
/*--------------------------------------------------------------------*/
Modified: branches/BUILD_TWEAKS/coregrind/pub_core_ume.h
===================================================================
--- branches/BUILD_TWEAKS/coregrind/pub_core_ume.h 2009-06-12 03:14:08 UTC (rev 10304)
+++ branches/BUILD_TWEAKS/coregrind/pub_core_ume.h 2009-06-12 04:56:25 UTC (rev 10305)
@@ -36,21 +36,6 @@
// and exec'ing.
//--------------------------------------------------------------------
-#if defined(VGO_linux)
-# define HAVE_ELF
-# define HAVE_SCRIPT
-
-#elif defined(VGO_aix5)
-// The AIX port doesn't use UME.
-
-#elif defined(VGO_darwin)
-# define HAVE_MACHO
-# define HAVE_SCRIPT
-
-#else
-#error unknown architecture
-#endif
-
/*------------------------------------------------------------*/
/*--- Loading files ---*/
/*------------------------------------------------------------*/
|
|
From: <sv...@va...> - 2009-06-12 03:14:20
|
Author: njn
Date: 2009-06-12 04:14:08 +0100 (Fri, 12 Jun 2009)
New Revision: 10304
Log:
And yet more preprocessor-based file inclusion.
Modified:
branches/BUILD_TWEAKS/coregrind/Makefile.am
branches/BUILD_TWEAKS/coregrind/m_aspacemgr/aspacemgr-aix5.c
branches/BUILD_TWEAKS/coregrind/m_aspacemgr/aspacemgr-linux.c
branches/BUILD_TWEAKS/coregrind/m_initimg/initimg-aix5.c
branches/BUILD_TWEAKS/coregrind/m_initimg/initimg-linux.c
branches/BUILD_TWEAKS/coregrind/m_initimg/initimg-pathscan.c
branches/BUILD_TWEAKS/coregrind/m_mach/mach_traps-amd64-darwin.S
branches/BUILD_TWEAKS/coregrind/m_syswrap/syswrap-aix5.c
branches/BUILD_TWEAKS/coregrind/m_syswrap/syswrap-darwin.c
branches/BUILD_TWEAKS/coregrind/m_syswrap/syswrap-generic.c
branches/BUILD_TWEAKS/coregrind/m_syswrap/syswrap-linux-variants.c
branches/BUILD_TWEAKS/coregrind/m_syswrap/syswrap-linux.c
Modified: branches/BUILD_TWEAKS/coregrind/Makefile.am
===================================================================
--- branches/BUILD_TWEAKS/coregrind/Makefile.am 2009-06-12 02:44:22 UTC (rev 10303)
+++ branches/BUILD_TWEAKS/coregrind/Makefile.am 2009-06-12 03:14:08 UTC (rev 10304)
@@ -275,6 +275,8 @@
m_xarray.c \
m_aspacehl.c \
m_aspacemgr/aspacemgr-common.c \
+ m_aspacemgr/aspacemgr-linux.c \
+ m_aspacemgr/aspacemgr-aix5.c \
m_coredump/coredump-x86-linux.c \
m_coredump/coredump-amd64-linux.c \
m_coredump/coredump-ppc32-linux.c \
@@ -301,7 +303,10 @@
m_dispatch/dispatch-ppc64-aix5.S \
m_dispatch/dispatch-x86-darwin.S \
m_dispatch/dispatch-amd64-darwin.S \
+ m_initimg/initimg-linux.c \
+ m_initimg/initimg-aix5.c \
m_initimg/initimg-darwin.c \
+ m_initimg/initimg-pathscan.c \
m_mach/mach_basics.c \
m_mach/mach_msg.c \
m_mach/mach_traps-x86-darwin.S \
@@ -328,6 +333,11 @@
m_syswrap/syscall-x86-darwin.S \
m_syswrap/syscall-amd64-darwin.S \
m_syswrap/syswrap-main.c \
+ m_syswrap/syswrap-generic.c \
+ m_syswrap/syswrap-linux.c \
+ m_syswrap/syswrap-linux-variants.c \
+ m_syswrap/syswrap-aix5.c \
+ m_syswrap/syswrap-darwin.c \
m_syswrap/syswrap-x86-linux.c \
m_syswrap/syswrap-amd64-linux.c \
m_syswrap/syswrap-ppc32-linux.c \
@@ -342,35 +352,22 @@
m_ume/script.c
COREGRIND_LINUX_SOURCE = \
- m_aspacemgr/aspacemgr-linux.c \
m_coredump/coredump-elf.c \
m_debuginfo/readelf.c \
m_debuginfo/readdwarf.c \
m_debuginfo/readdwarf3.c \
m_debuginfo/readstabs.c \
- m_debuginfo/readpdb.c \
- m_initimg/initimg-linux.c \
- m_initimg/initimg-pathscan.c \
- m_syswrap/syswrap-linux.c \
- m_syswrap/syswrap-linux-variants.c \
- m_syswrap/syswrap-generic.c
+ m_debuginfo/readpdb.c
COREGRIND_AIX5_SOURCE = \
- m_aspacemgr/aspacemgr-aix5.c \
- m_debuginfo/readxcoff.c \
- m_initimg/initimg-aix5.c \
- m_syswrap/syswrap-aix5.c
+ m_debuginfo/readxcoff.c
COREGRIND_DARWIN_SOURCE = \
- m_aspacemgr/aspacemgr-linux.c \
m_debuginfo/readdwarf.c \
m_debuginfo/readdwarf3.c \
m_debuginfo/readstabs.c \
m_debuginfo/readmacho.c \
- m_debuginfo/readpdb.c \
- m_initimg/initimg-pathscan.c \
- m_syswrap/syswrap-darwin.c \
- m_syswrap/syswrap-generic.c
+ m_debuginfo/readpdb.c
# These are generated using 'mig' from $mach_defs above.
COREGRIND_DARWIN_BUILT_SOURCES = \
Modified: branches/BUILD_TWEAKS/coregrind/m_aspacemgr/aspacemgr-aix5.c
===================================================================
--- branches/BUILD_TWEAKS/coregrind/m_aspacemgr/aspacemgr-aix5.c 2009-06-12 02:44:22 UTC (rev 10303)
+++ branches/BUILD_TWEAKS/coregrind/m_aspacemgr/aspacemgr-aix5.c 2009-06-12 03:14:08 UTC (rev 10304)
@@ -36,6 +36,8 @@
without prior written permission.
*/
+#if defined(VGO_aix5)
+
/* *************************************************************
DO NOT INCLUDE ANY OTHER FILES HERE.
ADD NEW INCLUDES ONLY TO priv_aspacemgr.h
@@ -2635,6 +2637,7 @@
show_AixSegments(0, "as read from procmap", segs);
}
+#endif // defined(VGO_aix5)
/*--------------------------------------------------------------------*/
/*--- end ---*/
Modified: branches/BUILD_TWEAKS/coregrind/m_aspacemgr/aspacemgr-linux.c
===================================================================
--- branches/BUILD_TWEAKS/coregrind/m_aspacemgr/aspacemgr-linux.c 2009-06-12 02:44:22 UTC (rev 10303)
+++ branches/BUILD_TWEAKS/coregrind/m_aspacemgr/aspacemgr-linux.c 2009-06-12 03:14:08 UTC (rev 10304)
@@ -31,6 +31,8 @@
The GNU General Public License is contained in the file COPYING.
*/
+#if defined(VGO_linux) || defined(VGO_darwin)
+
/* *************************************************************
DO NOT INCLUDE ANY OTHER FILES HERE.
ADD NEW INCLUDES ONLY TO priv_aspacemgr.h
@@ -3470,8 +3472,11 @@
*css_used = css_used_local;
}
-#endif
+#endif // HAVE_PROC
+
+#endif // defined(VGO_linux) || defined(VGO_darwin)
+
/*--------------------------------------------------------------------*/
/*--- end ---*/
/*--------------------------------------------------------------------*/
Modified: branches/BUILD_TWEAKS/coregrind/m_initimg/initimg-aix5.c
===================================================================
--- branches/BUILD_TWEAKS/coregrind/m_initimg/initimg-aix5.c 2009-06-12 02:44:22 UTC (rev 10303)
+++ branches/BUILD_TWEAKS/coregrind/m_initimg/initimg-aix5.c 2009-06-12 03:14:08 UTC (rev 10304)
@@ -34,6 +34,8 @@
without prior written permission.
*/
+#if defined(VGO_aix5)
+
#include "pub_core_basics.h"
#include "pub_core_vki.h"
#include "pub_core_vkiscnums.h"
@@ -540,6 +542,8 @@
of the symbol was not found.
*/
+#endif // defined(VGO_aix5)
+
/*--------------------------------------------------------------------*/
-/*--- initimg-aix5.c ---*/
+/*--- ---*/
/*--------------------------------------------------------------------*/
Modified: branches/BUILD_TWEAKS/coregrind/m_initimg/initimg-linux.c
===================================================================
--- branches/BUILD_TWEAKS/coregrind/m_initimg/initimg-linux.c 2009-06-12 02:44:22 UTC (rev 10303)
+++ branches/BUILD_TWEAKS/coregrind/m_initimg/initimg-linux.c 2009-06-12 03:14:08 UTC (rev 10304)
@@ -29,6 +29,8 @@
The GNU General Public License is contained in the file COPYING.
*/
+#if defined(VGO_linux)
+
#include "pub_core_basics.h"
#include "pub_core_vki.h"
#include "pub_core_debuglog.h"
@@ -986,7 +988,8 @@
sizeof(VexGuestArchState));
}
+#endif // defined(VGO_linux)
/*--------------------------------------------------------------------*/
-/*--- initimg-linux.c ---*/
+/*--- ---*/
/*--------------------------------------------------------------------*/
Modified: branches/BUILD_TWEAKS/coregrind/m_initimg/initimg-pathscan.c
===================================================================
--- branches/BUILD_TWEAKS/coregrind/m_initimg/initimg-pathscan.c 2009-06-12 02:44:22 UTC (rev 10303)
+++ branches/BUILD_TWEAKS/coregrind/m_initimg/initimg-pathscan.c 2009-06-12 03:14:08 UTC (rev 10304)
@@ -147,3 +147,6 @@
return VG_STREQ(executable_name_out, "") ? NULL : executable_name_out;
}
+/*--------------------------------------------------------------------*/
+/*--- end ---*/
+/*--------------------------------------------------------------------*/
Modified: branches/BUILD_TWEAKS/coregrind/m_mach/mach_traps-amd64-darwin.S
===================================================================
--- branches/BUILD_TWEAKS/coregrind/m_mach/mach_traps-amd64-darwin.S 2009-06-12 02:44:22 UTC (rev 10303)
+++ branches/BUILD_TWEAKS/coregrind/m_mach/mach_traps-amd64-darwin.S 2009-06-12 03:14:08 UTC (rev 10304)
@@ -132,7 +132,7 @@
syscall
ret
-#endif defined(VGP_amd64_darwin)
+#endif // defined(VGP_amd64_darwin)
/*--------------------------------------------------------------------*/
/*--- end ---*/
Modified: branches/BUILD_TWEAKS/coregrind/m_syswrap/syswrap-aix5.c
===================================================================
--- branches/BUILD_TWEAKS/coregrind/m_syswrap/syswrap-aix5.c 2009-06-12 02:44:22 UTC (rev 10303)
+++ branches/BUILD_TWEAKS/coregrind/m_syswrap/syswrap-aix5.c 2009-06-12 03:14:08 UTC (rev 10304)
@@ -33,6 +33,8 @@
without prior written permission.
*/
+#if defined(VGO_aix5)
+
#include "pub_core_basics.h"
#include "pub_core_vki.h"
#include "pub_core_vkiscnums.h"
@@ -2574,6 +2576,8 @@
#undef PRE
#undef POST
+#endif // defined(VGO_aix5)
+
/*--------------------------------------------------------------------*/
/*--- end ---*/
/*--------------------------------------------------------------------*/
Modified: branches/BUILD_TWEAKS/coregrind/m_syswrap/syswrap-darwin.c
===================================================================
--- branches/BUILD_TWEAKS/coregrind/m_syswrap/syswrap-darwin.c 2009-06-12 02:44:22 UTC (rev 10303)
+++ branches/BUILD_TWEAKS/coregrind/m_syswrap/syswrap-darwin.c 2009-06-12 03:14:08 UTC (rev 10304)
@@ -28,6 +28,8 @@
The GNU General Public License is contained in the file COPYING.
*/
+#if defined(VGO_darwin)
+
#include "pub_core_basics.h"
#include "pub_core_vki.h"
#include "pub_core_vkiscnums.h"
@@ -7543,7 +7545,8 @@
const UInt ML_(mdep_trap_table_size) =
sizeof(ML_(mdep_trap_table)) / sizeof(ML_(mdep_trap_table)[0]);
+#endif // defined(VGO_darwin)
/*--------------------------------------------------------------------*/
-/*--- end syswrap-darwin.c ---*/
+/*--- end ---*/
/*--------------------------------------------------------------------*/
Modified: branches/BUILD_TWEAKS/coregrind/m_syswrap/syswrap-generic.c
===================================================================
--- branches/BUILD_TWEAKS/coregrind/m_syswrap/syswrap-generic.c 2009-06-12 02:44:22 UTC (rev 10303)
+++ branches/BUILD_TWEAKS/coregrind/m_syswrap/syswrap-generic.c 2009-06-12 03:14:08 UTC (rev 10304)
@@ -1,6 +1,7 @@
/*--------------------------------------------------------------------*/
-/*--- Wrappers for generic Unix system calls syswrap-generic.c ---*/
+/*--- Wrappers for generic (non-AIX5!) Unix system calls ---*/
+/*--- syswrap-generic.c ---*/
/*--------------------------------------------------------------------*/
/*
@@ -28,6 +29,8 @@
The GNU General Public License is contained in the file COPYING.
*/
+#if defined(VGO_linux) || defined(VGO_darwin)
+
#include "pub_core_basics.h"
#include "pub_core_vki.h"
#include "pub_core_vkiscnums.h"
@@ -4096,6 +4099,8 @@
#undef PRE
#undef POST
+#endif // defined(VGO_linux) || defined(VGO_darwin)
+
/*--------------------------------------------------------------------*/
/*--- end ---*/
/*--------------------------------------------------------------------*/
Modified: branches/BUILD_TWEAKS/coregrind/m_syswrap/syswrap-linux-variants.c
===================================================================
--- branches/BUILD_TWEAKS/coregrind/m_syswrap/syswrap-linux-variants.c 2009-06-12 02:44:22 UTC (rev 10303)
+++ branches/BUILD_TWEAKS/coregrind/m_syswrap/syswrap-linux-variants.c 2009-06-12 03:14:08 UTC (rev 10304)
@@ -29,11 +29,12 @@
The GNU General Public License is contained in the file COPYING.
*/
-/* The files syswrap-generic.c, syswrap-linux.c, syswrap-x86-linux.c,
- syswrap-amd64-linux.c and syswrap-ppc32-linux.c, and associated
- vki*.h header files, constitute Valgrind's model of how a vanilla
- Linux kernel behaves with respect to syscalls.
+#if defined(VGO_linux)
+/* The files syswrap-generic.c, syswrap-linux.c, syswrap-*-linux.c,
+ and associated vki*.h header files, constitute Valgrind's model of how a
+ vanilla Linux kernel behaves with respect to syscalls.
+
On a few occasions, it is useful to run with a kernel that has some
(minor) extensions to the vanilla model, either due to running on a
hacked kernel, or using a vanilla kernel which has incorporated a
@@ -86,6 +87,8 @@
{
}
+#endif // defined(VGO_linux)
+
/*--------------------------------------------------------------------*/
/*--- end ---*/
/*--------------------------------------------------------------------*/
Modified: branches/BUILD_TWEAKS/coregrind/m_syswrap/syswrap-linux.c
===================================================================
--- branches/BUILD_TWEAKS/coregrind/m_syswrap/syswrap-linux.c 2009-06-12 02:44:22 UTC (rev 10303)
+++ branches/BUILD_TWEAKS/coregrind/m_syswrap/syswrap-linux.c 2009-06-12 03:14:08 UTC (rev 10304)
@@ -28,6 +28,8 @@
The GNU General Public License is contained in the file COPYING.
*/
+#if defined(VGO_linux)
+
#include "pub_core_basics.h"
#include "pub_core_vki.h"
#include "pub_core_vkiscnums.h"
@@ -5195,12 +5197,11 @@
}
}
-
#undef PRE
#undef POST
+#endif // defined(VGO_linux)
+
/*--------------------------------------------------------------------*/
/*--- end ---*/
/*--------------------------------------------------------------------*/
-
-
|
|
From: Tom H. <th...@cy...> - 2009-06-12 02:47:27
|
Nightly build on lloyd ( x86_64, Fedora 7 ) Started at 2009-06-12 03:05:04 BST Ended at 2009-06-12 03:47:17 BST Results unchanged from 24 hours ago Checking out valgrind source tree ... done Configuring valgrind ... done Building valgrind ... done Running regression tests ... done Regression test results follow == 490 tests, 0 stderr failures, 0 stdout failures, 0 post failures == |
|
From: Tom H. <th...@cy...> - 2009-06-12 02:46:06
|
Nightly build on vauxhall ( x86_64, Fedora 10 )
Started at 2009-06-12 03:20:03 BST
Ended at 2009-06-12 03:45:56 BST
Results differ from 24 hours ago
Checking out valgrind source tree ... done
Configuring valgrind ... done
Building valgrind ... done
Running regression tests ... done
Regression test results follow
== 499 tests, 0 stderr failures, 0 stdout failures, 0 post failures ==
=================================================
== Results from 24 hours ago ==
=================================================
Checking out valgrind source tree ... done
Configuring valgrind ... done
Building valgrind ... done
Running regression tests ... failed
Regression test results follow
== 499 tests, 1 stderr failure, 0 stdout failures, 0 post failures ==
drd/tests/qt4_rwlock (stderr)
=================================================
== Difference between 24 hours ago and now ==
=================================================
*** old.short Fri Jun 12 03:32:58 2009
--- new.short Fri Jun 12 03:45:56 2009
***************
*** 4,6 ****
Building valgrind ... done
! Running regression tests ... failed
--- 4,6 ----
Building valgrind ... done
! Running regression tests ... done
***************
*** 8,11 ****
! == 499 tests, 1 stderr failure, 0 stdout failures, 0 post failures ==
! drd/tests/qt4_rwlock (stderr)
--- 8,10 ----
! == 499 tests, 0 stderr failures, 0 stdout failures, 0 post failures ==
|
|
From: <sv...@va...> - 2009-06-12 02:44:45
|
Author: njn
Date: 2009-06-12 03:44:22 +0100 (Fri, 12 Jun 2009)
New Revision: 10303
Log:
More preprocessor-based file selection.
Modified:
branches/BUILD_TWEAKS/coregrind/Makefile.am
branches/BUILD_TWEAKS/coregrind/m_initimg/initimg-darwin.c
branches/BUILD_TWEAKS/coregrind/m_mach/mach_basics.c
branches/BUILD_TWEAKS/coregrind/m_mach/mach_msg.c
branches/BUILD_TWEAKS/coregrind/m_mach/mach_traps-amd64-darwin.S
branches/BUILD_TWEAKS/coregrind/m_mach/mach_traps-x86-darwin.S
branches/BUILD_TWEAKS/coregrind/m_start-amd64-darwin.S
branches/BUILD_TWEAKS/coregrind/m_start-x86-darwin.S
branches/BUILD_TWEAKS/coregrind/pub_core_mach.h
Modified: branches/BUILD_TWEAKS/coregrind/Makefile.am
===================================================================
--- branches/BUILD_TWEAKS/coregrind/Makefile.am 2009-06-12 02:23:28 UTC (rev 10302)
+++ branches/BUILD_TWEAKS/coregrind/Makefile.am 2009-06-12 02:44:22 UTC (rev 10303)
@@ -167,7 +167,7 @@
pub_core_libcprint.h \
pub_core_libcproc.h \
pub_core_libcsignal.h \
- pub_core_mach.h \
+ pub_core_mach.h \
pub_core_machine.h \
pub_core_mallocfree.h \
pub_core_options.h \
@@ -301,6 +301,11 @@
m_dispatch/dispatch-ppc64-aix5.S \
m_dispatch/dispatch-x86-darwin.S \
m_dispatch/dispatch-amd64-darwin.S \
+ m_initimg/initimg-darwin.c \
+ m_mach/mach_basics.c \
+ m_mach/mach_msg.c \
+ m_mach/mach_traps-x86-darwin.S \
+ m_mach/mach_traps-amd64-darwin.S \
m_replacemalloc/replacemalloc_core.c \
m_scheduler/scheduler.c \
m_scheduler/sema.c \
@@ -312,6 +317,8 @@
m_sigframe/sigframe-ppc64-aix5.c \
m_sigframe/sigframe-x86-darwin.c \
m_sigframe/sigframe-amd64-darwin.c \
+ m_start-x86-darwin.S \
+ m_start-amd64-darwin.S \
m_syswrap/syscall-x86-linux.S \
m_syswrap/syscall-amd64-linux.S \
m_syswrap/syscall-ppc32-linux.S \
@@ -354,8 +361,6 @@
m_initimg/initimg-aix5.c \
m_syswrap/syswrap-aix5.c
- # Note that the *User.c files are generated using 'mig' from $mach_defs
- # above.
COREGRIND_DARWIN_SOURCE = \
m_aspacemgr/aspacemgr-linux.c \
m_debuginfo/readdwarf.c \
@@ -363,13 +368,11 @@
m_debuginfo/readstabs.c \
m_debuginfo/readmacho.c \
m_debuginfo/readpdb.c \
- m_mach/mach_basics.c \
- m_mach/mach_msg.c \
- m_initimg/initimg-darwin.c \
m_initimg/initimg-pathscan.c \
m_syswrap/syswrap-darwin.c \
m_syswrap/syswrap-generic.c
+ # These are generated using 'mig' from $mach_defs above.
COREGRIND_DARWIN_BUILT_SOURCES = \
m_mach/mach_vmUser.c \
m_mach/taskUser.c \
@@ -422,9 +425,7 @@
libcoregrind_x86_darwin_a_SOURCES = \
$(COREGRIND_SOURCES_COMMON) \
- $(COREGRIND_DARWIN_SOURCE) \
- m_mach/mach_traps-x86-darwin.S \
- m_start-x86-darwin.S
+ $(COREGRIND_DARWIN_SOURCE)
nodist_libcoregrind_x86_darwin_a_SOURCES = $(COREGRIND_DARWIN_BUILT_SOURCES)
libcoregrind_x86_darwin_a_CPPFLAGS = $(AM_CPPFLAGS_X86_DARWIN)
libcoregrind_x86_darwin_a_CFLAGS = $(AM_CFLAGS_X86_DARWIN)
@@ -432,9 +433,7 @@
libcoregrind_amd64_darwin_a_SOURCES = \
$(COREGRIND_SOURCES_COMMON) \
- $(COREGRIND_DARWIN_SOURCE) \
- m_mach/mach_traps-amd64-darwin.S \
- m_start-amd64-darwin.S
+ $(COREGRIND_DARWIN_SOURCE)
nodist_libcoregrind_amd64_darwin_a_SOURCES = $(COREGRIND_DARWIN_BUILT_SOURCES)
libcoregrind_amd64_darwin_a_CPPFLAGS = $(AM_CPPFLAGS_AMD64_DARWIN)
libcoregrind_amd64_darwin_a_CFLAGS = $(AM_CFLAGS_AMD64_DARWIN)
Modified: branches/BUILD_TWEAKS/coregrind/m_initimg/initimg-darwin.c
===================================================================
--- branches/BUILD_TWEAKS/coregrind/m_initimg/initimg-darwin.c 2009-06-12 02:23:28 UTC (rev 10302)
+++ branches/BUILD_TWEAKS/coregrind/m_initimg/initimg-darwin.c 2009-06-12 02:44:22 UTC (rev 10303)
@@ -29,6 +29,8 @@
The GNU General Public License is contained in the file COPYING.
*/
+#if defined(VGO_darwin)
+
#include "pub_core_basics.h"
#include "pub_core_vki.h"
#include "pub_core_debuglog.h"
@@ -619,3 +621,9 @@
VG_TRACK( post_reg_write, Vg_CoreStartup, /*tid*/1, /*offset*/0,
sizeof(VexGuestArchState));
}
+
+#endif // defined(VGO_darwin)
+
+/*--------------------------------------------------------------------*/
+/*--- end ---*/
+/*--------------------------------------------------------------------*/
Modified: branches/BUILD_TWEAKS/coregrind/m_mach/mach_basics.c
===================================================================
--- branches/BUILD_TWEAKS/coregrind/m_mach/mach_basics.c 2009-06-12 02:23:28 UTC (rev 10302)
+++ branches/BUILD_TWEAKS/coregrind/m_mach/mach_basics.c 2009-06-12 02:44:22 UTC (rev 10303)
@@ -28,11 +28,11 @@
The GNU General Public License is contained in the file COPYING.
*/
+#if defined(VGO_darwin)
+
#include "pub_core_basics.h"
#include "pub_core_mach.h"
-#if defined(VGO_darwin)
-
#include <mach/mach.h>
#include <mach/machine/ndr_def.h>
@@ -84,18 +84,8 @@
vm_page_size = 4096;
}
+#endif // defined(VGO_darwin)
-#else
-
-// For platforms that don't actually have Mach kernel interfaces
-
-void VG_(mach_init)(void)
-{
- // do nothing
-}
-
-#endif
-
/*--------------------------------------------------------------------*/
/*--- end ---*/
/*--------------------------------------------------------------------*/
Modified: branches/BUILD_TWEAKS/coregrind/m_mach/mach_msg.c
===================================================================
--- branches/BUILD_TWEAKS/coregrind/m_mach/mach_msg.c 2009-06-12 02:23:28 UTC (rev 10302)
+++ branches/BUILD_TWEAKS/coregrind/m_mach/mach_msg.c 2009-06-12 02:44:22 UTC (rev 10303)
@@ -1,8 +1,3 @@
-#include "pub_core_basics.h"
-#include "pub_core_mach.h"
-
-#if defined(VGO_darwin)
-
/*
* Mach Operating System
* Copyright (c) 1991,1990,1989 Carnegie Mellon University
@@ -42,6 +37,11 @@
*
*/
+#if defined(VGO_darwin)
+
+#include "pub_core_basics.h"
+#include "pub_core_mach.h"
+
#include <mach/port.h>
#include <mach/message.h>
@@ -103,4 +103,8 @@
return mr;
}
-#endif
+#endif // defined(VGO_darwin)
+
+/*--------------------------------------------------------------------*/
+/*--- end ---*/
+/*--------------------------------------------------------------------*/
Modified: branches/BUILD_TWEAKS/coregrind/m_mach/mach_traps-amd64-darwin.S
===================================================================
--- branches/BUILD_TWEAKS/coregrind/m_mach/mach_traps-amd64-darwin.S 2009-06-12 02:23:28 UTC (rev 10302)
+++ branches/BUILD_TWEAKS/coregrind/m_mach/mach_traps-amd64-darwin.S 2009-06-12 02:44:22 UTC (rev 10303)
@@ -1,5 +1,5 @@
/*--------------------------------------------------------------------*/
-/*--- Basic Mach traps mach_traps.S ---*/
+/*--- Basic Mach traps. mach_traps-amd64-darwin.S ---*/
/*--------------------------------------------------------------------*/
/*
@@ -27,6 +27,8 @@
The GNU General Public License is contained in the file COPYING.
*/
+#if defined(VGP_amd64_darwin)
+
#include "vki/vki-scnums-darwin.h"
// mach_port_name_t task_self_trap(void)
@@ -130,6 +132,7 @@
syscall
ret
+#endif defined(VGP_amd64_darwin)
/*--------------------------------------------------------------------*/
/*--- end ---*/
Modified: branches/BUILD_TWEAKS/coregrind/m_mach/mach_traps-x86-darwin.S
===================================================================
--- branches/BUILD_TWEAKS/coregrind/m_mach/mach_traps-x86-darwin.S 2009-06-12 02:23:28 UTC (rev 10302)
+++ branches/BUILD_TWEAKS/coregrind/m_mach/mach_traps-x86-darwin.S 2009-06-12 02:44:22 UTC (rev 10303)
@@ -1,5 +1,5 @@
/*--------------------------------------------------------------------*/
-/*--- Basic Mach traps mach_traps.S ---*/
+/*--- Basic Mach traps. mach_traps-x86-darwin.S ---*/
/*--------------------------------------------------------------------*/
/*
@@ -27,7 +27,11 @@
The GNU General Public License is contained in the file COPYING.
*/
+#if defined(VGP_x86_darwin)
+// DDD: should use __NR_ constants in here instead of the trap numbers
+// directly!
+
// mach_port_name_t task_self_trap(void)
.text
.align 4
@@ -118,6 +122,7 @@
int $0x81
ret
+#endif // defined(VGP_x86_darwin)
/*--------------------------------------------------------------------*/
/*--- end ---*/
Modified: branches/BUILD_TWEAKS/coregrind/m_start-amd64-darwin.S
===================================================================
--- branches/BUILD_TWEAKS/coregrind/m_start-amd64-darwin.S 2009-06-12 02:23:28 UTC (rev 10302)
+++ branches/BUILD_TWEAKS/coregrind/m_start-amd64-darwin.S 2009-06-12 02:44:22 UTC (rev 10303)
@@ -28,6 +28,8 @@
The GNU General Public License is contained in the file COPYING.
*/
+#if defined(VGP_amd64_darwin)
+
#include "pub_core_basics_asm.h"
.text
@@ -79,3 +81,8 @@
int $3
int $3
+#endif // defined(VGP_amd64_darwin)
+
+/*--------------------------------------------------------------------*/
+/*--- end ---*/
+/*--------------------------------------------------------------------*/
Modified: branches/BUILD_TWEAKS/coregrind/m_start-x86-darwin.S
===================================================================
--- branches/BUILD_TWEAKS/coregrind/m_start-x86-darwin.S 2009-06-12 02:23:28 UTC (rev 10302)
+++ branches/BUILD_TWEAKS/coregrind/m_start-x86-darwin.S 2009-06-12 02:44:22 UTC (rev 10303)
@@ -28,6 +28,8 @@
The GNU General Public License is contained in the file COPYING.
*/
+#if defined(VGP_x86_darwin)
+
#include "pub_core_basics_asm.h"
.text
@@ -78,3 +80,9 @@
// should not reach here
int $3
int $3
+
+#endif // defined(VGP_x86_darwin)
+
+/*--------------------------------------------------------------------*/
+/*--- end ---*/
+/*--------------------------------------------------------------------*/
Modified: branches/BUILD_TWEAKS/coregrind/pub_core_mach.h
===================================================================
--- branches/BUILD_TWEAKS/coregrind/pub_core_mach.h 2009-06-12 02:23:28 UTC (rev 10302)
+++ branches/BUILD_TWEAKS/coregrind/pub_core_mach.h 2009-06-12 02:44:22 UTC (rev 10303)
@@ -28,6 +28,8 @@
The GNU General Public License is contained in the file COPYING.
*/
+#if defined(VGO_darwin)
+
#ifndef __PUB_CORE_MACH_H
#define __PUB_CORE_MACH_H
@@ -36,13 +38,13 @@
// for operating systems like Darwin / Mac OS X that use it.
//--------------------------------------------------------------------
-#if defined(VGO_darwin)
// Call this early in Valgrind's main(). It depends on nothing.
extern void VG_(mach_init)(void);
-#endif
-#endif // __PUB_CORE_MACH_H
+#endif // __PUB_CORE_MACH_H
+#endif // defined(VGO_darwin)
+
/*--------------------------------------------------------------------*/
/*--- end ---*/
/*--------------------------------------------------------------------*/
|
|
From: Tom H. <th...@cy...> - 2009-06-12 02:28:51
|
Nightly build on mg ( x86_64, Fedora 9 ) Started at 2009-06-12 03:10:06 BST Ended at 2009-06-12 03:28:41 BST Results unchanged from 24 hours ago Checking out valgrind source tree ... done Configuring valgrind ... done Building valgrind ... done Running regression tests ... failed Regression test results follow == 496 tests, 0 stderr failures, 1 stdout failure, 0 post failures == none/tests/linux/mremap2 (stdout) |
|
From: <sv...@va...> - 2009-06-12 02:23:48
|
Author: njn
Date: 2009-06-12 03:23:28 +0100 (Fri, 12 Jun 2009)
New Revision: 10302
Log:
More file selection via preprocessing. And some minor layout changes.
Modified:
branches/BUILD_TWEAKS/coregrind/Makefile.am
branches/BUILD_TWEAKS/coregrind/m_syswrap/syscall-ppc32-linux.S
branches/BUILD_TWEAKS/coregrind/m_syswrap/syswrap-amd64-darwin.c
branches/BUILD_TWEAKS/coregrind/m_syswrap/syswrap-amd64-linux.c
branches/BUILD_TWEAKS/coregrind/m_syswrap/syswrap-linux-variants.c
branches/BUILD_TWEAKS/coregrind/m_syswrap/syswrap-ppc32-aix5.c
branches/BUILD_TWEAKS/coregrind/m_syswrap/syswrap-ppc32-linux.c
branches/BUILD_TWEAKS/coregrind/m_syswrap/syswrap-ppc64-aix5.c
branches/BUILD_TWEAKS/coregrind/m_syswrap/syswrap-ppc64-linux.c
branches/BUILD_TWEAKS/coregrind/m_syswrap/syswrap-x86-darwin.c
branches/BUILD_TWEAKS/coregrind/m_syswrap/syswrap-x86-linux.c
Modified: branches/BUILD_TWEAKS/coregrind/Makefile.am
===================================================================
--- branches/BUILD_TWEAKS/coregrind/Makefile.am 2009-06-11 11:30:02 UTC (rev 10301)
+++ branches/BUILD_TWEAKS/coregrind/Makefile.am 2009-06-12 02:23:28 UTC (rev 10302)
@@ -321,6 +321,14 @@
m_syswrap/syscall-x86-darwin.S \
m_syswrap/syscall-amd64-darwin.S \
m_syswrap/syswrap-main.c \
+ m_syswrap/syswrap-x86-linux.c \
+ m_syswrap/syswrap-amd64-linux.c \
+ m_syswrap/syswrap-ppc32-linux.c \
+ m_syswrap/syswrap-ppc64-linux.c \
+ m_syswrap/syswrap-ppc32-aix5.c \
+ m_syswrap/syswrap-ppc64-aix5.c \
+ m_syswrap/syswrap-x86-darwin.c \
+ m_syswrap/syswrap-amd64-darwin.c \
m_ume/elf.c \
m_ume/macho.c \
m_ume/main.c \
@@ -370,40 +378,35 @@
libcoregrind_x86_linux_a_SOURCES = \
$(COREGRIND_SOURCES_COMMON) \
- $(COREGRIND_LINUX_SOURCE) \
- m_syswrap/syswrap-x86-linux.c
+ $(COREGRIND_LINUX_SOURCE)
libcoregrind_x86_linux_a_CPPFLAGS = $(AM_CPPFLAGS_X86_LINUX)
libcoregrind_x86_linux_a_CFLAGS = $(AM_CFLAGS_X86_LINUX)
libcoregrind_x86_linux_a_CCASFLAGS = $(AM_CCASFLAGS_X86_LINUX)
libcoregrind_amd64_linux_a_SOURCES = \
$(COREGRIND_SOURCES_COMMON) \
- $(COREGRIND_LINUX_SOURCE) \
- m_syswrap/syswrap-amd64-linux.c
+ $(COREGRIND_LINUX_SOURCE)
libcoregrind_amd64_linux_a_CPPFLAGS = $(AM_CPPFLAGS_AMD64_LINUX)
libcoregrind_amd64_linux_a_CFLAGS = $(AM_CFLAGS_AMD64_LINUX)
libcoregrind_amd64_linux_a_CCASFLAGS = $(AM_CCASFLAGS_AMD64_LINUX)
libcoregrind_ppc32_linux_a_SOURCES = \
$(COREGRIND_SOURCES_COMMON) \
- $(COREGRIND_LINUX_SOURCE) \
- m_syswrap/syswrap-ppc32-linux.c
+ $(COREGRIND_LINUX_SOURCE)
libcoregrind_ppc32_linux_a_CPPFLAGS = $(AM_CPPFLAGS_PPC32_LINUX)
libcoregrind_ppc32_linux_a_CFLAGS = $(AM_CFLAGS_PPC32_LINUX)
libcoregrind_ppc32_linux_a_CCASFLAGS = $(AM_CCASFLAGS_PPC32_LINUX)
libcoregrind_ppc64_linux_a_SOURCES = \
$(COREGRIND_SOURCES_COMMON) \
- $(COREGRIND_LINUX_SOURCE) \
- m_syswrap/syswrap-ppc64-linux.c
+ $(COREGRIND_LINUX_SOURCE)
libcoregrind_ppc64_linux_a_CPPFLAGS = $(AM_CPPFLAGS_PPC64_LINUX)
libcoregrind_ppc64_linux_a_CFLAGS = $(AM_CFLAGS_PPC64_LINUX)
libcoregrind_ppc64_linux_a_CCASFLAGS = $(AM_CCASFLAGS_PPC64_LINUX)
libcoregrind_ppc32_aix5_a_SOURCES = \
$(COREGRIND_SOURCES_COMMON) \
- $(COREGRIND_AIX5_SOURCE) \
- m_syswrap/syswrap-ppc32-aix5.c
+ $(COREGRIND_AIX5_SOURCE)
libcoregrind_ppc32_aix5_a_CPPFLAGS = $(AM_CPPFLAGS_PPC32_AIX5)
libcoregrind_ppc32_aix5_a_CFLAGS = $(AM_CFLAGS_PPC32_AIX5)
libcoregrind_ppc32_aix5_a_CCASFLAGS = $(AM_CCASFLAGS_PPC32_AIX5)
@@ -411,8 +414,7 @@
libcoregrind_ppc64_aix5_a_SOURCES = \
$(COREGRIND_SOURCES_COMMON) \
- $(COREGRIND_AIX5_SOURCE) \
- m_syswrap/syswrap-ppc64-aix5.c
+ $(COREGRIND_AIX5_SOURCE)
libcoregrind_ppc64_aix5_a_CPPFLAGS = $(AM_CPPFLAGS_PPC64_AIX5)
libcoregrind_ppc64_aix5_a_CFLAGS = $(AM_CFLAGS_PPC64_AIX5)
libcoregrind_ppc64_aix5_a_CCASFLAGS = $(AM_CCASFLAGS_PPC64_AIX5)
@@ -422,20 +424,17 @@
$(COREGRIND_SOURCES_COMMON) \
$(COREGRIND_DARWIN_SOURCE) \
m_mach/mach_traps-x86-darwin.S \
- m_start-x86-darwin.S \
- m_syswrap/syswrap-x86-darwin.c
+ m_start-x86-darwin.S
nodist_libcoregrind_x86_darwin_a_SOURCES = $(COREGRIND_DARWIN_BUILT_SOURCES)
libcoregrind_x86_darwin_a_CPPFLAGS = $(AM_CPPFLAGS_X86_DARWIN)
libcoregrind_x86_darwin_a_CFLAGS = $(AM_CFLAGS_X86_DARWIN)
libcoregrind_x86_darwin_a_CCASFLAGS = $(AM_CCASFLAGS_X86_DARWIN)
-
libcoregrind_amd64_darwin_a_SOURCES = \
$(COREGRIND_SOURCES_COMMON) \
$(COREGRIND_DARWIN_SOURCE) \
m_mach/mach_traps-amd64-darwin.S \
- m_start-amd64-darwin.S \
- m_syswrap/syswrap-amd64-darwin.c
+ m_start-amd64-darwin.S
nodist_libcoregrind_amd64_darwin_a_SOURCES = $(COREGRIND_DARWIN_BUILT_SOURCES)
libcoregrind_amd64_darwin_a_CPPFLAGS = $(AM_CPPFLAGS_AMD64_DARWIN)
libcoregrind_amd64_darwin_a_CFLAGS = $(AM_CFLAGS_AMD64_DARWIN)
Modified: branches/BUILD_TWEAKS/coregrind/m_syswrap/syscall-ppc32-linux.S
===================================================================
--- branches/BUILD_TWEAKS/coregrind/m_syswrap/syscall-ppc32-linux.S 2009-06-11 11:30:02 UTC (rev 10301)
+++ branches/BUILD_TWEAKS/coregrind/m_syswrap/syscall-ppc32-linux.S 2009-06-12 02:23:28 UTC (rev 10302)
@@ -158,7 +158,7 @@
/* Let the linker know we don't need an executable stack */
.section .note.GNU-stack,"",@progbits
-#endif defined(VGP_ppc32_linux)
+#endif // defined(VGP_ppc32_linux)
/*--------------------------------------------------------------------*/
/*--- end ---*/
Modified: branches/BUILD_TWEAKS/coregrind/m_syswrap/syswrap-amd64-darwin.c
===================================================================
--- branches/BUILD_TWEAKS/coregrind/m_syswrap/syswrap-amd64-darwin.c 2009-06-11 11:30:02 UTC (rev 10301)
+++ branches/BUILD_TWEAKS/coregrind/m_syswrap/syswrap-amd64-darwin.c 2009-06-12 02:23:28 UTC (rev 10302)
@@ -28,6 +28,8 @@
The GNU General Public License is contained in the file COPYING.
*/
+#if defined(VGP_amd64_darwin)
+
#include "pub_core_basics.h"
#include "pub_core_vki.h"
#include "pub_core_threadstate.h"
@@ -455,3 +457,9 @@
/*NOTREACHED*/
vg_assert(0);
}
+
+#endif // defined(VGP_amd64_darwin)
+
+/*--------------------------------------------------------------------*/
+/*--- end ---*/
+/*--------------------------------------------------------------------*/
Modified: branches/BUILD_TWEAKS/coregrind/m_syswrap/syswrap-amd64-linux.c
===================================================================
--- branches/BUILD_TWEAKS/coregrind/m_syswrap/syswrap-amd64-linux.c 2009-06-11 11:30:02 UTC (rev 10301)
+++ branches/BUILD_TWEAKS/coregrind/m_syswrap/syswrap-amd64-linux.c 2009-06-12 02:23:28 UTC (rev 10302)
@@ -28,6 +28,8 @@
The GNU General Public License is contained in the file COPYING.
*/
+#if defined(VGP_amd64_linux)
+
#include "pub_core_basics.h"
#include "pub_core_vki.h"
#include "pub_core_vkiscnums.h"
@@ -1373,6 +1375,8 @@
const UInt ML_(syscall_table_size) =
sizeof(ML_(syscall_table)) / sizeof(ML_(syscall_table)[0]);
+#endif // defined(VGP_amd64_linux)
+
/*--------------------------------------------------------------------*/
/*--- end ---*/
/*--------------------------------------------------------------------*/
Modified: branches/BUILD_TWEAKS/coregrind/m_syswrap/syswrap-linux-variants.c
===================================================================
--- branches/BUILD_TWEAKS/coregrind/m_syswrap/syswrap-linux-variants.c 2009-06-11 11:30:02 UTC (rev 10301)
+++ branches/BUILD_TWEAKS/coregrind/m_syswrap/syswrap-linux-variants.c 2009-06-12 02:23:28 UTC (rev 10302)
@@ -86,7 +86,6 @@
{
}
-
/*--------------------------------------------------------------------*/
-/*--- end syswrap-linux-variants.c ---*/
+/*--- end ---*/
/*--------------------------------------------------------------------*/
Modified: branches/BUILD_TWEAKS/coregrind/m_syswrap/syswrap-ppc32-aix5.c
===================================================================
--- branches/BUILD_TWEAKS/coregrind/m_syswrap/syswrap-ppc32-aix5.c 2009-06-11 11:30:02 UTC (rev 10301)
+++ branches/BUILD_TWEAKS/coregrind/m_syswrap/syswrap-ppc32-aix5.c 2009-06-12 02:23:28 UTC (rev 10302)
@@ -33,6 +33,8 @@
without prior written permission.
*/
+#if defined(VGP_ppc32_aix5)
+
#include "pub_core_basics.h"
#include "pub_core_vki.h"
#include "pub_core_vkiscnums.h"
@@ -908,6 +910,8 @@
return &aix5_ppc32_syscall_table[i].wrappers;
}
+#endif // defined(VGP_ppc32_aix5)
+
/*--------------------------------------------------------------------*/
/*--- end ---*/
/*--------------------------------------------------------------------*/
Modified: branches/BUILD_TWEAKS/coregrind/m_syswrap/syswrap-ppc32-linux.c
===================================================================
--- branches/BUILD_TWEAKS/coregrind/m_syswrap/syswrap-ppc32-linux.c 2009-06-11 11:30:02 UTC (rev 10301)
+++ branches/BUILD_TWEAKS/coregrind/m_syswrap/syswrap-ppc32-linux.c 2009-06-12 02:23:28 UTC (rev 10302)
@@ -28,6 +28,8 @@
The GNU General Public License is contained in the file COPYING.
*/
+#if defined(VGP_ppc32_linux)
+
#include "pub_core_basics.h"
#include "pub_core_vki.h"
#include "pub_core_vkiscnums.h"
@@ -1870,6 +1872,8 @@
const UInt ML_(syscall_table_size) =
sizeof(ML_(syscall_table)) / sizeof(ML_(syscall_table)[0]);
+#endif // defined(VGP_ppc32_linux)
+
/*--------------------------------------------------------------------*/
/*--- end ---*/
/*--------------------------------------------------------------------*/
Modified: branches/BUILD_TWEAKS/coregrind/m_syswrap/syswrap-ppc64-aix5.c
===================================================================
--- branches/BUILD_TWEAKS/coregrind/m_syswrap/syswrap-ppc64-aix5.c 2009-06-11 11:30:02 UTC (rev 10301)
+++ branches/BUILD_TWEAKS/coregrind/m_syswrap/syswrap-ppc64-aix5.c 2009-06-12 02:23:28 UTC (rev 10302)
@@ -33,6 +33,8 @@
without prior written permission.
*/
+#if defined(VGP_ppc64_aix5)
+
#include "pub_core_basics.h"
#include "pub_core_vki.h"
#include "pub_core_vkiscnums.h"
@@ -788,6 +790,8 @@
return &aix5_ppc64_syscall_table[i].wrappers;
}
+#endif // defined(VGP_ppc64_aix5)
+
/*--------------------------------------------------------------------*/
/*--- end ---*/
/*--------------------------------------------------------------------*/
Modified: branches/BUILD_TWEAKS/coregrind/m_syswrap/syswrap-ppc64-linux.c
===================================================================
--- branches/BUILD_TWEAKS/coregrind/m_syswrap/syswrap-ppc64-linux.c 2009-06-11 11:30:02 UTC (rev 10301)
+++ branches/BUILD_TWEAKS/coregrind/m_syswrap/syswrap-ppc64-linux.c 2009-06-12 02:23:28 UTC (rev 10302)
@@ -28,6 +28,8 @@
The GNU General Public License is contained in the file COPYING.
*/
+#if defined(VGP_ppc64_linux)
+
#include "pub_core_basics.h"
#include "pub_core_vki.h"
#include "pub_core_vkiscnums.h"
@@ -1510,6 +1512,8 @@
const UInt ML_(syscall_table_size) =
sizeof(ML_(syscall_table)) / sizeof(ML_(syscall_table)[0]);
+#endif // defined(VGP_ppc64_linux)
+
/*--------------------------------------------------------------------*/
/*--- end ---*/
/*--------------------------------------------------------------------*/
Modified: branches/BUILD_TWEAKS/coregrind/m_syswrap/syswrap-x86-darwin.c
===================================================================
--- branches/BUILD_TWEAKS/coregrind/m_syswrap/syswrap-x86-darwin.c 2009-06-11 11:30:02 UTC (rev 10301)
+++ branches/BUILD_TWEAKS/coregrind/m_syswrap/syswrap-x86-darwin.c 2009-06-12 02:23:28 UTC (rev 10302)
@@ -28,6 +28,8 @@
The GNU General Public License is contained in the file COPYING.
*/
+#if defined(VGP_x86_darwin)
+
#include "pub_core_basics.h"
#include "pub_core_vki.h"
#include "pub_core_threadstate.h"
@@ -497,6 +499,8 @@
vg_assert(0);
}
+#endif // defined(VGP_x86_darwin)
+
/*--------------------------------------------------------------------*/
-/*--- end syswrap-x86-darwin.c ---*/
+/*--- end ---*/
/*--------------------------------------------------------------------*/
Modified: branches/BUILD_TWEAKS/coregrind/m_syswrap/syswrap-x86-linux.c
===================================================================
--- branches/BUILD_TWEAKS/coregrind/m_syswrap/syswrap-x86-linux.c 2009-06-11 11:30:02 UTC (rev 10301)
+++ branches/BUILD_TWEAKS/coregrind/m_syswrap/syswrap-x86-linux.c 2009-06-12 02:23:28 UTC (rev 10302)
@@ -28,6 +28,8 @@
The GNU General Public License is contained in the file COPYING.
*/
+#if defined(VGP_x86_linux)
+
/* TODO/FIXME jrs 20050207: assignments to the syscall return result
in interrupted_syscall() need to be reviewed. They don't seem
to assign the shadow state.
@@ -2244,6 +2246,8 @@
const UInt ML_(syscall_table_size) =
sizeof(ML_(syscall_table)) / sizeof(ML_(syscall_table)[0]);
+#endif // defined(VGP_x86_linux)
+
/*--------------------------------------------------------------------*/
/*--- end ---*/
/*--------------------------------------------------------------------*/
|