|
From: <sv...@va...> - 2012-10-07 21:59:50
|
florian 2012-10-07 22:59:42 +0100 (Sun, 07 Oct 2012)
New Revision: 13031
Log:
This is the 2nd installment of the cache info reorganisation.
The host's VexArchInfo is passed to the tool instrumentation
functions. Purely mechanic patch.
Modified files:
trunk/cachegrind/cg_main.c
trunk/callgrind/main.c
trunk/coregrind/m_tooliface.c
trunk/coregrind/m_translate.c
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/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/lackey/lk_main.c (+1 -0)
===================================================================
--- trunk/lackey/lk_main.c 2012-10-07 22:03:27 +01:00 (rev 13030)
+++ trunk/lackey/lk_main.c 2012-10-07 22:59:42 +01:00 (rev 13031)
@@ -605,6 +605,7 @@
IRSB* sbIn,
VexGuestLayout* layout,
VexGuestExtents* vge,
+ VexArchInfo* archinfo_host,
IRType gWordTy, IRType hWordTy )
{
IRDirty* di;
Modified: trunk/memcheck/mc_translate.c (+1 -0)
===================================================================
--- trunk/memcheck/mc_translate.c 2012-10-07 22:03:27 +01:00 (rev 13030)
+++ trunk/memcheck/mc_translate.c 2012-10-07 22:59:42 +01:00 (rev 13031)
@@ -5302,6 +5302,7 @@
IRSB* sb_in,
VexGuestLayout* layout,
VexGuestExtents* vge,
+ VexArchInfo* archinfo_host,
IRType gWordTy, IRType hWordTy )
{
Bool verboze = 0||False;
Modified: trunk/helgrind/hg_main.c (+1 -0)
===================================================================
--- trunk/helgrind/hg_main.c 2012-10-07 22:03:27 +01:00 (rev 13030)
+++ trunk/helgrind/hg_main.c 2012-10-07 22:59:42 +01:00 (rev 13031)
@@ -4326,6 +4326,7 @@
IRSB* bbIn,
VexGuestLayout* layout,
VexGuestExtents* vge,
+ VexArchInfo* archinfo_host,
IRType gWordTy, IRType hWordTy )
{
Int i;
Modified: trunk/exp-dhat/dh_main.c (+1 -0)
===================================================================
--- trunk/exp-dhat/dh_main.c 2012-10-07 22:03:27 +01:00 (rev 13030)
+++ trunk/exp-dhat/dh_main.c 2012-10-07 22:59:42 +01:00 (rev 13031)
@@ -874,6 +874,7 @@
IRSB* sbIn,
VexGuestLayout* layout,
VexGuestExtents* vge,
+ VexArchInfo* archinfo_host,
IRType gWordTy, IRType hWordTy )
{
Int i, n = 0;
Modified: trunk/coregrind/m_tooliface.c (+2 -1)
===================================================================
--- trunk/coregrind/m_tooliface.c 2012-10-07 22:03:27 +01:00 (rev 13030)
+++ trunk/coregrind/m_tooliface.c 2012-10-07 22:59:42 +01:00 (rev 13031)
@@ -41,7 +41,8 @@
void VG_(basic_tool_funcs)(
void(*post_clo_init)(void),
IRSB*(*instrument)(VgCallbackClosure*, IRSB*,
- VexGuestLayout*, VexGuestExtents*, IRType, IRType),
+ VexGuestLayout*, VexGuestExtents*, VexArchInfo*,
+ IRType, IRType),
void(*fini)(Int)
)
{
Modified: trunk/massif/ms_main.c (+1 -0)
===================================================================
--- trunk/massif/ms_main.c 2012-10-07 22:03:27 +01:00 (rev 13030)
+++ trunk/massif/ms_main.c 2012-10-07 22:59:42 +01:00 (rev 13031)
@@ -2117,6 +2117,7 @@
IRSB* sbIn,
VexGuestLayout* layout,
VexGuestExtents* vge,
+ VexArchInfo* archinfo_host,
IRType gWordTy, IRType hWordTy )
{
if (! have_started_executing_code) {
Modified: trunk/drd/drd_load_store.h (+1 -0)
===================================================================
--- trunk/drd/drd_load_store.h 2012-10-07 22:03:27 +01:00 (rev 13030)
+++ trunk/drd/drd_load_store.h 2012-10-07 22:59:42 +01:00 (rev 13031)
@@ -43,6 +43,7 @@
IRSB* const bb_in,
VexGuestLayout* const layout,
VexGuestExtents* const vge,
+ VexArchInfo* const archinfo_host,
IRType const gWordTy,
IRType const hWordTy);
void DRD_(trace_mem_access)(const Addr addr, const SizeT size,
Modified: trunk/drd/drd_load_store.c (+1 -0)
===================================================================
--- trunk/drd/drd_load_store.c 2012-10-07 22:03:27 +01:00 (rev 13030)
+++ trunk/drd/drd_load_store.c 2012-10-07 22:59:42 +01:00 (rev 13031)
@@ -581,6 +581,7 @@
IRSB* const bb_in,
VexGuestLayout* const layout,
VexGuestExtents* const vge,
+ VexArchInfo* archinfo_host,
IRType const gWordTy,
IRType const hWordTy)
{
Modified: trunk/cachegrind/cg_main.c (+1 -0)
===================================================================
--- trunk/cachegrind/cg_main.c 2012-10-07 22:03:27 +01:00 (rev 13030)
+++ trunk/cachegrind/cg_main.c 2012-10-07 22:59:42 +01:00 (rev 13031)
@@ -952,6 +952,7 @@
IRSB* sbIn,
VexGuestLayout* layout,
VexGuestExtents* vge,
+ VexArchInfo* archinfo_host,
IRType gWordTy, IRType hWordTy )
{
Int i, isize;
Modified: trunk/include/pub_tool_tooliface.h (+1 -0)
===================================================================
--- trunk/include/pub_tool_tooliface.h 2012-10-07 22:03:27 +01:00 (rev 13030)
+++ trunk/include/pub_tool_tooliface.h 2012-10-07 22:59:42 +01:00 (rev 13031)
@@ -220,6 +220,7 @@
IRSB* sb_in,
VexGuestLayout* layout,
VexGuestExtents* vge,
+ VexArchInfo* archinfo_host,
IRType gWordTy,
IRType hWordTy),
Modified: trunk/exp-sgcheck/h_main.h (+1 -0)
===================================================================
--- trunk/exp-sgcheck/h_main.h 2012-10-07 22:03:27 +01:00 (rev 13030)
+++ trunk/exp-sgcheck/h_main.h 2012-10-07 22:59:42 +01:00 (rev 13031)
@@ -72,6 +72,7 @@
IRSB* sbIn,
VexGuestLayout* layout,
VexGuestExtents* vge,
+ VexArchInfo* archinfo_host,
IRType gWordTy, IRType hWordTy );
#endif
Modified: trunk/exp-sgcheck/h_main.c (+1 -0)
===================================================================
--- trunk/exp-sgcheck/h_main.c 2012-10-07 22:03:27 +01:00 (rev 13030)
+++ trunk/exp-sgcheck/h_main.c 2012-10-07 22:59:42 +01:00 (rev 13031)
@@ -609,6 +609,7 @@
IRSB* sbIn,
VexGuestLayout* layout,
VexGuestExtents* vge,
+ VexArchInfo* archinfo_host,
IRType gWordTy, IRType hWordTy )
{
Bool verboze = 0||False;
Modified: trunk/coregrind/m_translate.c (+7 -3)
===================================================================
--- trunk/coregrind/m_translate.c 2012-10-07 22:03:27 +01:00 (rev 13030)
+++ trunk/coregrind/m_translate.c 2012-10-07 22:59:42 +01:00 (rev 13031)
@@ -222,6 +222,7 @@
IRSB* sb_in,
VexGuestLayout* layout,
VexGuestExtents* vge,
+ VexArchInfo* vai,
IRType gWordTy,
IRType hWordTy )
{
@@ -230,6 +231,7 @@
sb_in,
layout,
vge,
+ vai,
gWordTy,
hWordTy),
layout,
@@ -261,6 +263,7 @@
IRSB* sb_in,
VexGuestLayout* layout,
VexGuestExtents* vge,
+ VexArchInfo* vai,
IRType gWordTy,
IRType hWordTy )
{
@@ -1505,15 +1508,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*,
+ IRSB*,VexGuestLayout*,VexGuestExtents*, VexArchInfo*,
IRType,IRType)
= VG_(clo_vgdb) != Vg_VgdbNo
? tool_instrument_then_gdbserver_if_needed
: VG_(tdict).tool_instrument;
IRSB*(*g)(void*,
- IRSB*,VexGuestLayout*,VexGuestExtents*,
+ IRSB*,VexGuestLayout*,VexGuestExtents*,VexArchInfo*,
IRType,IRType)
- = (IRSB*(*)(void*,IRSB*,VexGuestLayout*,VexGuestExtents*,IRType,IRType))f;
+ = (IRSB*(*)(void*,IRSB*,VexGuestLayout*,VexGuestExtents*,
+ VexArchInfo*,IRType,IRType))f;
vta.instrument1 = g;
}
/* No need for type kludgery here. */
Modified: trunk/memcheck/mc_include.h (+1 -0)
===================================================================
--- trunk/memcheck/mc_include.h 2012-10-07 22:03:27 +01:00 (rev 13030)
+++ trunk/memcheck/mc_include.h 2012-10-07 22:59:42 +01:00 (rev 13031)
@@ -566,6 +566,7 @@
IRSB* bb_in,
VexGuestLayout* layout,
VexGuestExtents* vge,
+ VexArchInfo* archinfo_host,
IRType gWordTy, IRType hWordTy );
IRSB* MC_(final_tidy) ( IRSB* );
Modified: trunk/exp-bbv/bbv_main.c (+1 -0)
===================================================================
--- trunk/exp-bbv/bbv_main.c 2012-10-07 22:03:27 +01:00 (rev 13030)
+++ trunk/exp-bbv/bbv_main.c 2012-10-07 22:59:42 +01:00 (rev 13031)
@@ -347,6 +347,7 @@
static IRSB* bbv_instrument ( VgCallbackClosure* closure,
IRSB* sbIn, VexGuestLayout* layout,
VexGuestExtents* vge,
+ VexArchInfo* archinfo_host,
IRType gWordTy, IRType hWordTy )
{
Int i,n_instrs=1;
Modified: trunk/coregrind/pub_core_tooliface.h (+1 -1)
===================================================================
--- trunk/coregrind/pub_core_tooliface.h 2012-10-07 22:03:27 +01:00 (rev 13030)
+++ trunk/coregrind/pub_core_tooliface.h 2012-10-07 22:59:42 +01:00 (rev 13031)
@@ -109,7 +109,7 @@
IRSB* (*tool_instrument) (VgCallbackClosure*,
IRSB*,
VexGuestLayout*, VexGuestExtents*,
- IRType, IRType);
+ VexArchInfo*, IRType, IRType);
void (*tool_fini) (Int);
// VG_(needs).core_errors
Modified: trunk/none/nl_main.c (+1 -0)
===================================================================
--- trunk/none/nl_main.c 2012-10-07 22:03:27 +01:00 (rev 13030)
+++ trunk/none/nl_main.c 2012-10-07 22:59:42 +01:00 (rev 13031)
@@ -40,6 +40,7 @@
IRSB* bb,
VexGuestLayout* layout,
VexGuestExtents* vge,
+ VexArchInfo* archinfo_host,
IRType gWordTy, IRType hWordTy )
{
return bb;
Modified: trunk/callgrind/main.c (+1 -0)
===================================================================
--- trunk/callgrind/main.c 2012-10-07 22:03:27 +01:00 (rev 13030)
+++ trunk/callgrind/main.c 2012-10-07 22:59:42 +01:00 (rev 13031)
@@ -909,6 +909,7 @@
IRSB* sbIn,
VexGuestLayout* layout,
VexGuestExtents* vge,
+ VexArchInfo* archinfo_host,
IRType gWordTy, IRType hWordTy )
{
Int i;
|