Author: florian
Date: Wed Sep 24 12:06:55 2014
New Revision: 14564
Log:
Ripple from constifying parameters of instrumentation functions and
callbacks from VexTranslateArgs. See VEX r2958.
Modified:
trunk/cachegrind/cg_main.c
trunk/callgrind/main.c
trunk/coregrind/m_gdbserver/m_gdbserver.c
trunk/coregrind/m_tooliface.c
trunk/coregrind/m_translate.c
trunk/coregrind/pub_core_gdbserver.h
trunk/coregrind/pub_core_tooliface.h
trunk/drd/drd_load_store.c
trunk/drd/drd_load_store.h
trunk/exp-bbv/bbv_main.c
trunk/exp-dhat/dh_main.c
trunk/exp-sgcheck/h_main.c
trunk/exp-sgcheck/h_main.h
trunk/exp-sgcheck/sg_main.c
trunk/exp-sgcheck/sg_main.h
trunk/helgrind/hg_main.c
trunk/include/pub_tool_tooliface.h
trunk/lackey/lk_main.c
trunk/massif/ms_main.c
trunk/memcheck/mc_include.h
trunk/memcheck/mc_translate.c
trunk/none/nl_main.c
Modified: trunk/cachegrind/cg_main.c
==============================================================================
--- trunk/cachegrind/cg_main.c (original)
+++ trunk/cachegrind/cg_main.c Wed Sep 24 12:06:55 2014
@@ -1048,9 +1048,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: trunk/callgrind/main.c
==============================================================================
--- trunk/callgrind/main.c (original)
+++ trunk/callgrind/main.c Wed Sep 24 12:06:55 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: trunk/coregrind/m_gdbserver/m_gdbserver.c
==============================================================================
--- trunk/coregrind/m_gdbserver/m_gdbserver.c (original)
+++ trunk/coregrind/m_gdbserver/m_gdbserver.c Wed Sep 24 12:06:55 2014
@@ -483,7 +483,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;
@@ -1088,8 +1088,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)
{
@@ -1126,8 +1126,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 */
@@ -1201,8 +1201,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)
{
@@ -1220,8 +1220,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: trunk/coregrind/m_tooliface.c
==============================================================================
--- trunk/coregrind/m_tooliface.c (original)
+++ trunk/coregrind/m_tooliface.c Wed Sep 24 12:06:55 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: trunk/coregrind/m_translate.c
==============================================================================
--- trunk/coregrind/m_translate.c (original)
+++ trunk/coregrind/m_translate.c Wed Sep 24 12:06:55 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;
@@ -1622,16 +1622,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: trunk/coregrind/pub_core_gdbserver.h
==============================================================================
--- trunk/coregrind/pub_core_gdbserver.h (original)
+++ trunk/coregrind/pub_core_gdbserver.h Wed Sep 24 12:06:55 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: trunk/coregrind/pub_core_tooliface.h
==============================================================================
--- trunk/coregrind/pub_core_tooliface.h (original)
+++ trunk/coregrind/pub_core_tooliface.h Wed Sep 24 12:06:55 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: trunk/drd/drd_load_store.c
==============================================================================
--- trunk/drd/drd_load_store.c (original)
+++ trunk/drd/drd_load_store.c Wed Sep 24 12:06:55 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: trunk/drd/drd_load_store.h
==============================================================================
--- trunk/drd/drd_load_store.h (original)
+++ trunk/drd/drd_load_store.h Wed Sep 24 12:06:55 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: trunk/exp-bbv/bbv_main.c
==============================================================================
--- trunk/exp-bbv/bbv_main.c (original)
+++ trunk/exp-bbv/bbv_main.c Wed Sep 24 12:06:55 2014
@@ -345,10 +345,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: trunk/exp-dhat/dh_main.c
==============================================================================
--- trunk/exp-dhat/dh_main.c (original)
+++ trunk/exp-dhat/dh_main.c Wed Sep 24 12:06:55 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: trunk/exp-sgcheck/h_main.c
==============================================================================
--- trunk/exp-sgcheck/h_main.c (original)
+++ trunk/exp-sgcheck/h_main.c Wed Sep 24 12:06:55 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: trunk/exp-sgcheck/h_main.h
==============================================================================
--- trunk/exp-sgcheck/h_main.h (original)
+++ trunk/exp-sgcheck/h_main.h Wed Sep 24 12:06:55 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: trunk/exp-sgcheck/sg_main.c
==============================================================================
--- trunk/exp-sgcheck/sg_main.c (original)
+++ trunk/exp-sgcheck/sg_main.c Wed Sep 24 12:06:55 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: trunk/exp-sgcheck/sg_main.h
==============================================================================
--- trunk/exp-sgcheck/sg_main.h (original)
+++ trunk/exp-sgcheck/sg_main.h Wed Sep 24 12:06:55 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: trunk/helgrind/hg_main.c
==============================================================================
--- trunk/helgrind/hg_main.c (original)
+++ trunk/helgrind/hg_main.c Wed Sep 24 12:06:55 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: trunk/include/pub_tool_tooliface.h
==============================================================================
--- trunk/include/pub_tool_tooliface.h (original)
+++ trunk/include/pub_tool_tooliface.h Wed Sep 24 12:06:55 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: trunk/lackey/lk_main.c
==============================================================================
--- trunk/lackey/lk_main.c (original)
+++ trunk/lackey/lk_main.c Wed Sep 24 12:06:55 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: trunk/massif/ms_main.c
==============================================================================
--- trunk/massif/ms_main.c (original)
+++ trunk/massif/ms_main.c Wed Sep 24 12:06:55 2014
@@ -2087,9 +2087,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: trunk/memcheck/mc_include.h
==============================================================================
--- trunk/memcheck/mc_include.h (original)
+++ trunk/memcheck/mc_include.h Wed Sep 24 12:06:55 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: trunk/memcheck/mc_translate.c
==============================================================================
--- trunk/memcheck/mc_translate.c (original)
+++ trunk/memcheck/mc_translate.c Wed Sep 24 12:06:55 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: trunk/none/nl_main.c
==============================================================================
--- trunk/none/nl_main.c (original)
+++ trunk/none/nl_main.c Wed Sep 24 12:06:55 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;
|