From: Nicholas Nethercote Date: Mon, 22 Nov 2004 19:26:27 +0000 (+0000) Subject: Last few skin-->tool changes, in various places. X-Git-Tag: svn/VALGRIND_3_0_0~1255 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5197cfe79dd9164152dff303349bbf42694e57ad;p=thirdparty%2Fvalgrind.git Last few skin-->tool changes, in various places. git-svn-id: svn://svn.valgrind.org/valgrind/trunk@3063 --- diff --git a/coregrind/docs/coregrind_tools.html b/coregrind/docs/coregrind_tools.html index 90203ae7c2..e185244523 100644 --- a/coregrind/docs/coregrind_tools.html +++ b/coregrind/docs/coregrind_tools.html @@ -353,7 +353,7 @@ In what follows, all filenames are relative to Valgrind's top-level directory occurrence of the string ``nl_'' with ``fb_''. It might be worth trying to understand this file, at least a little; you might have to do more complicated things with it later on. In - particular, the name of the vgskin_foobar_so_SOURCES variable + particular, the name of the vgtool_foobar_so_SOURCES variable determines the name of the tool's shared object, which determines what name must be passed to the --tool option to use the tool.

@@ -381,7 +381,7 @@ In what follows, all filenames are relative to Valgrind's top-level directory make install It should automake, configure and compile without errors, putting copies - of the tool's shared object vgskin_foobar.so in + of the tool's shared object vgtool_foobar.so in foobar/ and inst/lib/valgrind/.

@@ -428,9 +428,8 @@ A tool must define at least these four functions: Also, it must use the macro VG_DETERMINE_INTERFACE_VERSION exactly once in its source code. If it doesn't, you will get a link error -involving VG_(skin_interface_major_version). This macro is -used to ensure the core/tool interface used by the core and a plugged-in -tool are binary compatible. +explaining the problem. This macro is used to ensure the core/tool interface +used by the core and a plugged-in tool are binary compatible. In addition, if a tool wants to use some of the optional services provided by the core, it may have to define other functions. diff --git a/coregrind/vg_errcontext.c b/coregrind/vg_errcontext.c index cd4c22508b..d1e8f6ed32 100644 --- a/coregrind/vg_errcontext.c +++ b/coregrind/vg_errcontext.c @@ -821,7 +821,7 @@ static void load_one_suppressions_file ( Char* filename ) if (eof) goto syntax_error; - /* Check it has the "skin1,skin2,...:supp" form (look for ':') */ + /* Check it has the "tool1,tool2,...:supp" form (look for ':') */ i = 0; while (True) { if (buf[i] == ':') break; diff --git a/coregrind/vg_mylibc.c b/coregrind/vg_mylibc.c index ef80acaa86..9f474075ad 100644 --- a/coregrind/vg_mylibc.c +++ b/coregrind/vg_mylibc.c @@ -1153,7 +1153,7 @@ static void assert_fail ( const Char* expr, const Char* name, const Char* report report_and_quit(report, NULL); } -void VG_(skin_assert_fail) ( const Char* expr, const Char* file, Int line, const Char* fn ) +void VG_(tool_assert_fail) ( const Char* expr, const Char* file, Int line, const Char* fn ) { assert_fail(expr, VG_(details).name, VG_(details).bug_reports_to, file, line, fn); diff --git a/helgrind/hg_main.c b/helgrind/hg_main.c index 407110ec57..fb2738eecc 100644 --- a/helgrind/hg_main.c +++ b/helgrind/hg_main.c @@ -53,9 +53,9 @@ static UInt n_lockorder_warnings = 0; #define DEBUG_VIRGIN_READS 0 /* Dump around address on VIRGIN reads */ #if SLOW_ASSERTS -#define SK_ASSERT(x) tl_assert(x) +#define TL_ASSERT(x) tl_assert(x) #else -#define SK_ASSERT(x) +#define TL_ASSERT(x) #endif /* heavyweight LockSet sanity checking: @@ -240,7 +240,7 @@ typedef struct EC_IP { static inline UInt packEC(ExeContext *ec) { - SK_ASSERT(((UWord)ec & ((1 << STATE_BITS)-1)) == 0); + TL_ASSERT(((UWord)ec & ((1 << STATE_BITS)-1)) == 0); return ((UWord)ec) >> STATE_BITS; } @@ -445,7 +445,7 @@ static Bool tlsIsDisjoint(const ThreadLifeSeg *tls, static inline UInt packTLS(ThreadLifeSeg *tls) { - SK_ASSERT(((UWord)tls & ((1 << STATE_BITS)-1)) == 0); + TL_ASSERT(((UWord)tls & ((1 << STATE_BITS)-1)) == 0); return ((UWord)tls) >> STATE_BITS; } @@ -656,7 +656,7 @@ static inline UInt packLockSet(const LockSet *p) { UInt id; - SK_ASSERT(((UWord)p & ((1 << STATE_BITS)-1)) == 0); + TL_ASSERT(((UWord)p & ((1 << STATE_BITS)-1)) == 0); id = ((UWord)p) >> STATE_BITS; return id; diff --git a/include/tool.h.base b/include/tool.h.base index 6af7a0d7ed..f9ff77ea7b 100644 --- a/include/tool.h.base +++ b/include/tool.h.base @@ -168,7 +168,7 @@ extern Bool VG_(clo_profile); /* Call this if a recognised option was bad for some reason. Note: don't use it just because an option was unrecognised -- return 'False' - from SKN_(process_cmd_line_option) to indicate that. */ + from TL_(process_cmd_line_option) to indicate that. */ extern void VG_(bad_option) ( Char* opt ); /* Client args */ @@ -480,12 +480,12 @@ extern Bool VG_(getcwd_alloc) ( Char** cwd ); #define tl_assert(expr) \ ((void) ((expr) ? 0 : \ - (VG_(skin_assert_fail) (VG__STRING(expr), \ + (VG_(tool_assert_fail) (VG__STRING(expr), \ __FILE__, __LINE__, \ __PRETTY_FUNCTION__), 0))) __attribute__ ((__noreturn__)) -extern void VG_(skin_assert_fail) ( const Char* expr, const Char* file, +extern void VG_(tool_assert_fail) ( const Char* expr, const Char* file, Int line, const Char* fn );