|
From: <sv...@va...> - 2014-09-25 21:07:48
|
Author: florian
Date: Thu Sep 25 21:07:27 2014
New Revision: 14567
Log:
Merge from trunk.
Modified:
branches/BUF_REMOVAL/ (props changed)
branches/BUF_REMOVAL/NEWS
branches/BUF_REMOVAL/cachegrind/cg_main.c
branches/BUF_REMOVAL/callgrind/main.c
branches/BUF_REMOVAL/coregrind/m_gdbserver/m_gdbserver.c
branches/BUF_REMOVAL/coregrind/m_tooliface.c
branches/BUF_REMOVAL/coregrind/m_translate.c
branches/BUF_REMOVAL/coregrind/pub_core_gdbserver.h
branches/BUF_REMOVAL/coregrind/pub_core_tooliface.h
branches/BUF_REMOVAL/coregrind/vgdb-invoker-ptrace.c
branches/BUF_REMOVAL/docs/xml/manual-core.xml
branches/BUF_REMOVAL/drd/drd_load_store.c
branches/BUF_REMOVAL/drd/drd_load_store.h
branches/BUF_REMOVAL/exp-bbv/bbv_main.c
branches/BUF_REMOVAL/exp-dhat/dh_main.c
branches/BUF_REMOVAL/exp-sgcheck/h_main.c
branches/BUF_REMOVAL/exp-sgcheck/h_main.h
branches/BUF_REMOVAL/exp-sgcheck/sg_main.c
branches/BUF_REMOVAL/exp-sgcheck/sg_main.h
branches/BUF_REMOVAL/helgrind/hg_main.c
branches/BUF_REMOVAL/include/pub_tool_tooliface.h
branches/BUF_REMOVAL/lackey/lk_main.c
branches/BUF_REMOVAL/massif/ms_main.c
branches/BUF_REMOVAL/memcheck/mc_include.h
branches/BUF_REMOVAL/memcheck/mc_main.c
branches/BUF_REMOVAL/memcheck/mc_translate.c
branches/BUF_REMOVAL/none/nl_main.c
branches/BUF_REMOVAL/none/tests/ppc32/Makefile.am
branches/BUF_REMOVAL/none/tests/ppc64/Makefile.am
Modified: branches/BUF_REMOVAL/NEWS
==============================================================================
--- branches/BUF_REMOVAL/NEWS (original)
+++ branches/BUF_REMOVAL/NEWS Thu Sep 25 21:07:27 2014
@@ -27,9 +27,11 @@
https://bugs.kde.org/show_bug.cgi?id=XXXXXX
where XXXXXX is the bug number as listed below.
+338731 ppc: Fix testuite build for toolchains not supporting -maltivec
339020 ppc64: memcheck/tests/ppc64/power_ISA2_05 failing in nightly build
339156 - gdbsrv not called for fatal signal
n-i-bz Old STABS code is still being compiled, but never used. Remove it.
+n-i-bz Fix compilation on distros with glibc < 2.5
Release 3.10.0 (10 September 2014)
Modified: branches/BUF_REMOVAL/cachegrind/cg_main.c
==============================================================================
--- branches/BUF_REMOVAL/cachegrind/cg_main.c (original)
+++ branches/BUF_REMOVAL/cachegrind/cg_main.c Thu Sep 25 21:07:27 2014
@@ -1045,9 +1045,9 @@
static
IRSB* cg_instrument ( VgCallbackClosure* closure,
IRSB* sbIn,
- VexGuestLayout* layout,
- VexGuestExtents* vge,
- VexArchInfo* archinfo_host,
+ const VexGuestLayout* layout,
+ const VexGuestExtents* vge,
+ const VexArchInfo* archinfo_host,
IRType gWordTy, IRType hWordTy )
{
Int i, isize;
Modified: branches/BUF_REMOVAL/callgrind/main.c
==============================================================================
--- branches/BUF_REMOVAL/callgrind/main.c (original)
+++ branches/BUF_REMOVAL/callgrind/main.c Thu Sep 25 21:07:27 2014
@@ -950,10 +950,10 @@
static
IRSB* CLG_(instrument)( VgCallbackClosure* closure,
- IRSB* sbIn,
- VexGuestLayout* layout,
- VexGuestExtents* vge,
- VexArchInfo* archinfo_host,
+ IRSB* sbIn,
+ const VexGuestLayout* layout,
+ const VexGuestExtents* vge,
+ const VexArchInfo* archinfo_host,
IRType gWordTy, IRType hWordTy )
{
Int i;
Modified: branches/BUF_REMOVAL/coregrind/m_gdbserver/m_gdbserver.c
==============================================================================
--- branches/BUF_REMOVAL/coregrind/m_gdbserver/m_gdbserver.c (original)
+++ branches/BUF_REMOVAL/coregrind/m_gdbserver/m_gdbserver.c Thu Sep 25 21:07:27 2014
@@ -491,7 +491,7 @@
}
/* Returns the reason for which gdbserver instrumentation is needed */
-static VgVgdb VG_(gdbserver_instrumentation_needed) (VexGuestExtents* vge)
+static VgVgdb VG_(gdbserver_instrumentation_needed) (const VexGuestExtents* vge)
{
GS_Address* g;
int e;
@@ -1096,8 +1096,8 @@
static void VG_(add_stmt_call_invalidate_if_not_gdbserved)
( IRSB* sb_in,
- VexGuestLayout* layout,
- VexGuestExtents* vge,
+ const VexGuestLayout* layout,
+ const VexGuestExtents* vge,
IRTemp jmp,
IRSB* irsb)
{
@@ -1134,8 +1134,8 @@
debugger statement will be inserted for all instructions of a block. */
static void VG_(add_stmt_call_gdbserver)
(IRSB* sb_in, /* block being translated */
- VexGuestLayout* layout,
- VexGuestExtents* vge,
+ const VexGuestLayout* layout,
+ const VexGuestExtents* vge,
IRType gWordTy, IRType hWordTy,
Addr iaddr, /* Addr of instruction being instrumented */
UChar delta, /* delta to add to iaddr to obtain IP */
@@ -1209,8 +1209,8 @@
or VG_(add_stmt_call_invalidate_if_not_gdbserved). */
static void VG_(add_stmt_call_invalidate_exit_target_if_not_gdbserved)
(IRSB* sb_in,
- VexGuestLayout* layout,
- VexGuestExtents* vge,
+ const VexGuestLayout* layout,
+ const VexGuestExtents* vge,
IRType gWordTy,
IRSB* irsb)
{
@@ -1228,8 +1228,8 @@
IRSB* VG_(instrument_for_gdbserver_if_needed)
(IRSB* sb_in,
- VexGuestLayout* layout,
- VexGuestExtents* vge,
+ const VexGuestLayout* layout,
+ const VexGuestExtents* vge,
IRType gWordTy, IRType hWordTy)
{
IRSB* sb_out;
Modified: branches/BUF_REMOVAL/coregrind/m_tooliface.c
==============================================================================
--- branches/BUF_REMOVAL/coregrind/m_tooliface.c (original)
+++ branches/BUF_REMOVAL/coregrind/m_tooliface.c Thu Sep 25 21:07:27 2014
@@ -41,8 +41,8 @@
void VG_(basic_tool_funcs)(
void(*post_clo_init)(void),
IRSB*(*instrument)(VgCallbackClosure*, IRSB*,
- VexGuestLayout*, VexGuestExtents*, VexArchInfo*,
- IRType, IRType),
+ const VexGuestLayout*, const VexGuestExtents*,
+ const VexArchInfo*, IRType, IRType),
void(*fini)(Int)
)
{
Modified: branches/BUF_REMOVAL/coregrind/m_translate.c
==============================================================================
--- branches/BUF_REMOVAL/coregrind/m_translate.c (original)
+++ branches/BUF_REMOVAL/coregrind/m_translate.c Thu Sep 25 21:07:27 2014
@@ -59,7 +59,7 @@
#include "pub_core_execontext.h" // VG_(make_depth_1_ExeContext_from_Addr)
-#include "pub_core_gdbserver.h" // VG_(tool_instrument_then_gdbserver_if_needed)
+#include "pub_core_gdbserver.h" // VG_(instrument_for_gdbserver_if_needed)
#include "libvex_emnote.h" // For PPC, EmWarn_PPC64_redir_underflow
@@ -219,10 +219,10 @@
*/
static
IRSB* tool_instrument_then_gdbserver_if_needed ( VgCallbackClosure* closureV,
- IRSB* sb_in,
- VexGuestLayout* layout,
- VexGuestExtents* vge,
- VexArchInfo* vai,
+ IRSB* sb_in,
+ const VexGuestLayout* layout,
+ const VexGuestExtents* vge,
+ const VexArchInfo* vai,
IRType gWordTy,
IRType hWordTy )
{
@@ -261,9 +261,9 @@
static
IRSB* vg_SP_update_pass ( void* closureV,
IRSB* sb_in,
- VexGuestLayout* layout,
- VexGuestExtents* vge,
- VexArchInfo* vai,
+ const VexGuestLayout* layout,
+ const VexGuestExtents* vge,
+ const VexArchInfo* vai,
IRType gWordTy,
IRType hWordTy )
{
@@ -776,7 +776,7 @@
return convention. */
static UInt needs_self_check ( void* closureV,
- VexGuestExtents* vge )
+ const VexGuestExtents* vge )
{
VgCallbackClosure* closure = (VgCallbackClosure*)closureV;
UInt i, bitset;
@@ -1418,7 +1418,6 @@
if (!vex_init_done) {
LibVEX_Init ( &failure_exit, &log_bytes,
1, /* debug_paranoia */
- False, /* valgrind support */
&VG_(clo_vex_control) );
vex_init_done = True;
}
@@ -1630,16 +1629,16 @@
They are entirely legal but longwinded so as to maximise the
chance of the C typechecker picking up any type snafus. */
IRSB*(*f)(VgCallbackClosure*,
- IRSB*,VexGuestLayout*,VexGuestExtents*, VexArchInfo*,
- IRType,IRType)
+ IRSB*,const VexGuestLayout*,const VexGuestExtents*,
+ const VexArchInfo*,IRType,IRType)
= VG_(clo_vgdb) != Vg_VgdbNo
? tool_instrument_then_gdbserver_if_needed
: VG_(tdict).tool_instrument;
IRSB*(*g)(void*,
- IRSB*,VexGuestLayout*,VexGuestExtents*,VexArchInfo*,
- IRType,IRType)
- = (IRSB*(*)(void*,IRSB*,VexGuestLayout*,VexGuestExtents*,
- VexArchInfo*,IRType,IRType))f;
+ IRSB*,const VexGuestLayout*,const VexGuestExtents*,
+ const VexArchInfo*,IRType,IRType)
+ = (IRSB*(*)(void*,IRSB*,const VexGuestLayout*,
+ const VexGuestExtents*, const VexArchInfo*,IRType,IRType))f;
vta.instrument1 = g;
}
/* No need for type kludgery here. */
Modified: branches/BUF_REMOVAL/coregrind/pub_core_gdbserver.h
==============================================================================
--- branches/BUF_REMOVAL/coregrind/pub_core_gdbserver.h (original)
+++ branches/BUF_REMOVAL/coregrind/pub_core_gdbserver.h Thu Sep 25 21:07:27 2014
@@ -150,8 +150,8 @@
gdbserver. */
extern IRSB* VG_(instrument_for_gdbserver_if_needed)
(IRSB* sb_in, /* block to be instrumented */
- VexGuestLayout* layout,
- VexGuestExtents* vge,
+ const VexGuestLayout* layout,
+ const VexGuestExtents* vge,
IRType gWordTy, IRType hWordTy);
/* reason for which gdbserver connection must be finished */
Modified: branches/BUF_REMOVAL/coregrind/pub_core_tooliface.h
==============================================================================
--- branches/BUF_REMOVAL/coregrind/pub_core_tooliface.h (original)
+++ branches/BUF_REMOVAL/coregrind/pub_core_tooliface.h Thu Sep 25 21:07:27 2014
@@ -110,8 +110,8 @@
void (*tool_post_clo_init)(void);
IRSB* (*tool_instrument) (VgCallbackClosure*,
IRSB*,
- VexGuestLayout*, VexGuestExtents*,
- VexArchInfo*, IRType, IRType);
+ const VexGuestLayout*, const VexGuestExtents*,
+ const VexArchInfo*, IRType, IRType);
void (*tool_fini) (Int);
// VG_(needs).core_errors
Modified: branches/BUF_REMOVAL/coregrind/vgdb-invoker-ptrace.c
==============================================================================
--- branches/BUF_REMOVAL/coregrind/vgdb-invoker-ptrace.c (original)
+++ branches/BUF_REMOVAL/coregrind/vgdb-invoker-ptrace.c Thu Sep 25 21:07:27 2014
@@ -64,8 +64,9 @@
#include <sys/procfs.h>
-#if defined(VGA_s390x)
-/* RHEL 5 uses glibc 2.3.4 which does not define PTRACE_GETSIGINFO */
+// glibc versions prior to 2.5 do not define PTRACE_GETSIGINFO on
+// the platforms we support.
+#if !((__GLIBC__ > 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 5))
# ifndef PTRACE_GETSIGINFO
# define PTRACE_GETSIGINFO 0x4202
# endif
Modified: branches/BUF_REMOVAL/docs/xml/manual-core.xml
==============================================================================
--- branches/BUF_REMOVAL/docs/xml/manual-core.xml (original)
+++ branches/BUF_REMOVAL/docs/xml/manual-core.xml Thu Sep 25 21:07:27 2014
@@ -1852,7 +1852,7 @@
==15363== by 0x8048550: main (varinfo1.c:56)
==15363== Address 0xbea0d0cc is on thread 1's stack
==15363== in frame #1, created by main (varinfo1.c:45)
-></programlisting>
+]]></programlisting>
<para>And here are the same errors with
<option>--read-var-info=yes</option>:</para>
Modified: branches/BUF_REMOVAL/drd/drd_load_store.c
==============================================================================
--- branches/BUF_REMOVAL/drd/drd_load_store.c (original)
+++ branches/BUF_REMOVAL/drd/drd_load_store.c Thu Sep 25 21:07:27 2014
@@ -590,9 +590,9 @@
IRSB* DRD_(instrument)(VgCallbackClosure* const closure,
IRSB* const bb_in,
- VexGuestLayout* const layout,
- VexGuestExtents* const vge,
- VexArchInfo* archinfo_host,
+ const VexGuestLayout* const layout,
+ const VexGuestExtents* const vge,
+ const VexArchInfo* archinfo_host,
IRType const gWordTy,
IRType const hWordTy)
{
Modified: branches/BUF_REMOVAL/drd/drd_load_store.h
==============================================================================
--- branches/BUF_REMOVAL/drd/drd_load_store.h (original)
+++ branches/BUF_REMOVAL/drd/drd_load_store.h Thu Sep 25 21:07:27 2014
@@ -41,9 +41,9 @@
void DRD_(set_first_race_only)(const Bool fro);
IRSB* DRD_(instrument)(VgCallbackClosure* const closure,
IRSB* const bb_in,
- VexGuestLayout* const layout,
- VexGuestExtents* const vge,
- VexArchInfo* const archinfo_host,
+ const VexGuestLayout* const layout,
+ const VexGuestExtents* const vge,
+ const VexArchInfo* const archinfo_host,
IRType const gWordTy,
IRType const hWordTy);
void DRD_(trace_mem_access)(const Addr addr, const SizeT size,
Modified: branches/BUF_REMOVAL/exp-bbv/bbv_main.c
==============================================================================
--- branches/BUF_REMOVAL/exp-bbv/bbv_main.c (original)
+++ branches/BUF_REMOVAL/exp-bbv/bbv_main.c Thu Sep 25 21:07:27 2014
@@ -337,10 +337,10 @@
/* gWordTy = size of guest word */
/* hWordTy = size of host word */
static IRSB* bbv_instrument ( VgCallbackClosure* closure,
- IRSB* sbIn, VexGuestLayout* layout,
- VexGuestExtents* vge,
- VexArchInfo* archinfo_host,
- IRType gWordTy, IRType hWordTy )
+ IRSB* sbIn, const VexGuestLayout* layout,
+ const VexGuestExtents* vge,
+ const VexArchInfo* archinfo_host,
+ IRType gWordTy, IRType hWordTy )
{
Int i,n_instrs=1;
IRSB *sbOut;
Modified: branches/BUF_REMOVAL/exp-dhat/dh_main.c
==============================================================================
--- branches/BUF_REMOVAL/exp-dhat/dh_main.c (original)
+++ branches/BUF_REMOVAL/exp-dhat/dh_main.c Thu Sep 25 21:07:27 2014
@@ -872,9 +872,9 @@
static
IRSB* dh_instrument ( VgCallbackClosure* closure,
IRSB* sbIn,
- VexGuestLayout* layout,
- VexGuestExtents* vge,
- VexArchInfo* archinfo_host,
+ const VexGuestLayout* layout,
+ const VexGuestExtents* vge,
+ const VexArchInfo* archinfo_host,
IRType gWordTy, IRType hWordTy )
{
Int i, n = 0;
Modified: branches/BUF_REMOVAL/exp-sgcheck/h_main.c
==============================================================================
--- branches/BUF_REMOVAL/exp-sgcheck/h_main.c (original)
+++ branches/BUF_REMOVAL/exp-sgcheck/h_main.c Thu Sep 25 21:07:27 2014
@@ -607,9 +607,9 @@
IRSB* h_instrument ( VgCallbackClosure* closure,
IRSB* sbIn,
- VexGuestLayout* layout,
- VexGuestExtents* vge,
- VexArchInfo* archinfo_host,
+ const VexGuestLayout* layout,
+ const VexGuestExtents* vge,
+ const VexArchInfo* archinfo_host,
IRType gWordTy, IRType hWordTy )
{
Bool verboze = 0||False;
Modified: branches/BUF_REMOVAL/exp-sgcheck/h_main.h
==============================================================================
--- branches/BUF_REMOVAL/exp-sgcheck/h_main.h (original)
+++ branches/BUF_REMOVAL/exp-sgcheck/h_main.h Thu Sep 25 21:07:27 2014
@@ -70,9 +70,9 @@
/* Note that this also does the sg_ instrumentation. */
IRSB* h_instrument ( VgCallbackClosure* closure,
IRSB* sbIn,
- VexGuestLayout* layout,
- VexGuestExtents* vge,
- VexArchInfo* archinfo_host,
+ const VexGuestLayout* layout,
+ const VexGuestExtents* vge,
+ const VexArchInfo* archinfo_host,
IRType gWordTy, IRType hWordTy );
#endif
Modified: branches/BUF_REMOVAL/exp-sgcheck/sg_main.c
==============================================================================
--- branches/BUF_REMOVAL/exp-sgcheck/sg_main.c (original)
+++ branches/BUF_REMOVAL/exp-sgcheck/sg_main.c Thu Sep 25 21:07:27 2014
@@ -2079,7 +2079,7 @@
static IRTemp gen_Get_SP ( struct _SGEnv* sge,
IRSB* bbOut,
- VexGuestLayout* layout,
+ const VexGuestLayout* layout,
Int hWordTy_szB )
{
IRExpr* sp_expr;
@@ -2097,7 +2097,7 @@
static IRTemp gen_Get_FP ( struct _SGEnv* sge,
IRSB* bbOut,
- VexGuestLayout* layout,
+ const VexGuestLayout* layout,
Int hWordTy_szB )
{
IRExpr* fp_expr;
@@ -2120,7 +2120,7 @@
Bool isStore,
Int hWordTy_szB,
Addr curr_IP,
- VexGuestLayout* layout )
+ const VexGuestLayout* layout )
{
IRType tyAddr = Ity_INVALID;
XArray* frameBlocks = NULL;
@@ -2198,7 +2198,7 @@
void sg_instrument_IRStmt ( /*MOD*/struct _SGEnv * env,
/*MOD*/IRSB* sbOut,
IRStmt* st,
- VexGuestLayout* layout,
+ const VexGuestLayout* layout,
IRType gWordTy, IRType hWordTy )
{
if (!sg_clo_enable_sg_checks)
@@ -2333,7 +2333,7 @@
/*MOD*/IRSB* sbOut,
IRExpr* next,
IRJumpKind jumpkind,
- VexGuestLayout* layout,
+ const VexGuestLayout* layout,
IRType gWordTy, IRType hWordTy )
{
if (!sg_clo_enable_sg_checks)
Modified: branches/BUF_REMOVAL/exp-sgcheck/sg_main.h
==============================================================================
--- branches/BUF_REMOVAL/exp-sgcheck/sg_main.h (original)
+++ branches/BUF_REMOVAL/exp-sgcheck/sg_main.h Thu Sep 25 21:07:27 2014
@@ -62,14 +62,14 @@
void sg_instrument_IRStmt ( /*MOD*/struct _SGEnv * env,
/*MOD*/IRSB* sbOut,
IRStmt* st,
- VexGuestLayout* layout,
+ const VexGuestLayout* layout,
IRType gWordTy, IRType hWordTy );
void sg_instrument_final_jump ( /*MOD*/struct _SGEnv * env,
/*MOD*/IRSB* sbOut,
IRExpr* next,
IRJumpKind jumpkind,
- VexGuestLayout* layout,
+ const VexGuestLayout* layout,
IRType gWordTy, IRType hWordTy );
#endif
Modified: branches/BUF_REMOVAL/helgrind/hg_main.c
==============================================================================
--- branches/BUF_REMOVAL/helgrind/hg_main.c (original)
+++ branches/BUF_REMOVAL/helgrind/hg_main.c Thu Sep 25 21:07:27 2014
@@ -4478,9 +4478,9 @@
static
IRSB* hg_instrument ( VgCallbackClosure* closure,
IRSB* bbIn,
- VexGuestLayout* layout,
- VexGuestExtents* vge,
- VexArchInfo* archinfo_host,
+ const VexGuestLayout* layout,
+ const VexGuestExtents* vge,
+ const VexArchInfo* archinfo_host,
IRType gWordTy, IRType hWordTy )
{
Int i;
Modified: branches/BUF_REMOVAL/include/pub_tool_tooliface.h
==============================================================================
--- branches/BUF_REMOVAL/include/pub_tool_tooliface.h (original)
+++ branches/BUF_REMOVAL/include/pub_tool_tooliface.h Thu Sep 25 21:07:27 2014
@@ -218,9 +218,9 @@
*/
IRSB*(*instrument)(VgCallbackClosure* closure,
IRSB* sb_in,
- VexGuestLayout* layout,
- VexGuestExtents* vge,
- VexArchInfo* archinfo_host,
+ const VexGuestLayout* layout,
+ const VexGuestExtents* vge,
+ const VexArchInfo* archinfo_host,
IRType gWordTy,
IRType hWordTy),
Modified: branches/BUF_REMOVAL/lackey/lk_main.c
==============================================================================
--- branches/BUF_REMOVAL/lackey/lk_main.c (original)
+++ branches/BUF_REMOVAL/lackey/lk_main.c Thu Sep 25 21:07:27 2014
@@ -652,9 +652,9 @@
static
IRSB* lk_instrument ( VgCallbackClosure* closure,
IRSB* sbIn,
- VexGuestLayout* layout,
- VexGuestExtents* vge,
- VexArchInfo* archinfo_host,
+ const VexGuestLayout* layout,
+ const VexGuestExtents* vge,
+ const VexArchInfo* archinfo_host,
IRType gWordTy, IRType hWordTy )
{
IRDirty* di;
Modified: branches/BUF_REMOVAL/massif/ms_main.c
==============================================================================
--- branches/BUF_REMOVAL/massif/ms_main.c (original)
+++ branches/BUF_REMOVAL/massif/ms_main.c Thu Sep 25 21:07:27 2014
@@ -2079,9 +2079,9 @@
static
IRSB* ms_instrument ( VgCallbackClosure* closure,
IRSB* sbIn,
- VexGuestLayout* layout,
- VexGuestExtents* vge,
- VexArchInfo* archinfo_host,
+ const VexGuestLayout* layout,
+ const VexGuestExtents* vge,
+ const VexArchInfo* archinfo_host,
IRType gWordTy, IRType hWordTy )
{
if (! have_started_executing_code) {
Modified: branches/BUF_REMOVAL/memcheck/mc_include.h
==============================================================================
--- branches/BUF_REMOVAL/memcheck/mc_include.h (original)
+++ branches/BUF_REMOVAL/memcheck/mc_include.h Thu Sep 25 21:07:27 2014
@@ -657,9 +657,9 @@
/* Functions defined in mc_translate.c */
IRSB* MC_(instrument) ( VgCallbackClosure* closure,
IRSB* bb_in,
- VexGuestLayout* layout,
- VexGuestExtents* vge,
- VexArchInfo* archinfo_host,
+ const VexGuestLayout* layout,
+ const VexGuestExtents* vge,
+ const VexArchInfo* archinfo_host,
IRType gWordTy, IRType hWordTy );
IRSB* MC_(final_tidy) ( IRSB* );
Modified: branches/BUF_REMOVAL/memcheck/mc_main.c
==============================================================================
--- branches/BUF_REMOVAL/memcheck/mc_main.c (original)
+++ branches/BUF_REMOVAL/memcheck/mc_main.c Thu Sep 25 21:07:27 2014
@@ -138,11 +138,11 @@
On 64-bit machines it's more complicated. If we followed the same basic
scheme we'd have a four-level table which would require too many memory
- accesses. So instead the top-level map table has 2^19 entries (indexed
- using bits 16..34 of the address); this covers the bottom 32GB. Any
- accesses above 32GB are handled with a slow, sparse auxiliary table.
+ accesses. So instead the top-level map table has 2^20 entries (indexed
+ using bits 16..35 of the address); this covers the bottom 64GB. Any
+ accesses above 64GB are handled with a slow, sparse auxiliary table.
Valgrind's address space manager tries very hard to keep things below
- this 32GB barrier so that performance doesn't suffer too much.
+ this 64GB barrier so that performance doesn't suffer too much.
Note that this file has a lot of different functions for reading and
writing shadow memory. Only a couple are strictly necessary (eg.
Modified: branches/BUF_REMOVAL/memcheck/mc_translate.c
==============================================================================
--- branches/BUF_REMOVAL/memcheck/mc_translate.c (original)
+++ branches/BUF_REMOVAL/memcheck/mc_translate.c Thu Sep 25 21:07:27 2014
@@ -210,7 +210,7 @@
/* READONLY: the guest layout. This indicates which parts of
the guest state should be regarded as 'always defined'. */
- VexGuestLayout* layout;
+ const VexGuestLayout* layout;
/* READONLY: the host word type. Needed for constructing
arguments of type 'HWord' to be passed to helper functions.
@@ -6197,9 +6197,9 @@
IRSB* MC_(instrument) ( VgCallbackClosure* closure,
IRSB* sb_in,
- VexGuestLayout* layout,
- VexGuestExtents* vge,
- VexArchInfo* archinfo_host,
+ const VexGuestLayout* layout,
+ const VexGuestExtents* vge,
+ const VexArchInfo* archinfo_host,
IRType gWordTy, IRType hWordTy )
{
Bool verboze = 0||False;
Modified: branches/BUF_REMOVAL/none/nl_main.c
==============================================================================
--- branches/BUF_REMOVAL/none/nl_main.c (original)
+++ branches/BUF_REMOVAL/none/nl_main.c Thu Sep 25 21:07:27 2014
@@ -38,9 +38,9 @@
static
IRSB* nl_instrument ( VgCallbackClosure* closure,
IRSB* bb,
- VexGuestLayout* layout,
- VexGuestExtents* vge,
- VexArchInfo* archinfo_host,
+ const VexGuestLayout* layout,
+ const VexGuestExtents* vge,
+ const VexArchInfo* archinfo_host,
IRType gWordTy, IRType hWordTy )
{
return bb;
Modified: branches/BUF_REMOVAL/none/tests/ppc32/Makefile.am
==============================================================================
--- branches/BUF_REMOVAL/none/tests/ppc32/Makefile.am (original)
+++ branches/BUF_REMOVAL/none/tests/ppc32/Makefile.am Thu Sep 25 21:07:27 2014
@@ -72,8 +72,12 @@
allexec_CFLAGS = $(AM_CFLAGS) @FLAG_W_NO_NONNULL@
if HAS_ALTIVEC
+BUILD_FLAG_ALTIVEC = -maltivec
+BUILD_FLAG_ABI_ALTIVEC = -mabi=altivec
ALTIVEC_FLAG = -DHAS_ALTIVEC
else
+BUILD_FLAG_ALTIVEC =
+BUILD_FLAG_ABI_ALTIVEC =
ALTIVEC_FLAG =
endif
@@ -101,11 +105,12 @@
ISA_2_07_FLAG =
endif
-jm_insns_CFLAGS = $(AM_CFLAGS) -Winline -Wall -O -g -mregnames -maltivec \
- @FLAG_M32@ $(ALTIVEC_FLAG)
+jm_insns_CFLAGS = $(AM_CFLAGS) -Winline -Wall -O -g -mregnames \
+ @FLAG_M32@ $(ALTIVEC_FLAG) $(BUILD_FLAG_ALTIVEC)
-testVMX_CFLAGS = $(AM_CFLAGS) -O -g -Wall -maltivec -mabi=altivec -DALTIVEC \
- -DGCC_COMPILER @FLAG_M32@
+testVMX_CFLAGS = $(AM_CFLAGS) -O -g -Wall -DALTIVEC \
+ -DGCC_COMPILER @FLAG_M32@ $(BUILD_FLAG_ALTIVEC) \
+ $(BUILD_FLAG_ABI_ALTIVEC)
test_isa_2_06_part1_CFLAGS = $(AM_CFLAGS) -Winline -Wall -O -g -mregnames $(VSX_FLAG) \
@FLAG_M32@ $(ALTIVEC_FLAG) $(BUILD_FLAG_VSX)
Modified: branches/BUF_REMOVAL/none/tests/ppc64/Makefile.am
==============================================================================
--- branches/BUF_REMOVAL/none/tests/ppc64/Makefile.am (original)
+++ branches/BUF_REMOVAL/none/tests/ppc64/Makefile.am Thu Sep 25 21:07:27 2014
@@ -50,8 +50,10 @@
allexec_CFLAGS = $(AM_CFLAGS) @FLAG_W_NO_NONNULL@
if HAS_ALTIVEC
+BUILD_FLAG_ALTIVEC = -maltivec
ALTIVEC_FLAG = -DHAS_ALTIVEC
else
+BUILD_FLAG_ALTIVEC =
ALTIVEC_FLAG =
endif
@@ -88,8 +90,8 @@
test_isa_2_06_part3_CFLAGS = $(AM_CFLAGS) -Winline -Wall -O -g -mregnames $(VSX_FLAG) \
@FLAG_M64@ $(ALTIVEC_FLAG) $(BUILD_FLAG_VSX)
-jm_insns_CFLAGS = $(AM_CFLAGS) -Winline -Wall -O -g -mregnames -maltivec \
- @FLAG_M64@ $(ALTIVEC_FLAG)
+jm_insns_CFLAGS = $(AM_CFLAGS) -Winline -Wall -O -g -mregnames \
+ @FLAG_M64@ $(ALTIVEC_FLAG) $(BUILD_FLAG_ALTIVEC)
test_dfp1_CFLAGS = $(AM_CFLAGS) -Winline -Wall -O -g -mregnames $(DFP_FLAG) \
@FLAG_M64@ $(BUILD_FLAGS_DFP)
|