Converted all functions visible from vg_skin.h with names in CamelCaps to
use_under_scores instead, to be consistent.
Also added some missing 'extern's on function declarations in vg_skin.h.
Also added a quick note in vg_regtest.in on the simplest way to run regression
tests.
git-svn-id: svn://svn.valgrind.org/valgrind/trunk@1135 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/lackey/lk_main.c b/lackey/lk_main.c
index 12dfea9..3da3339 100644
--- a/lackey/lk_main.c
+++ b/lackey/lk_main.c
@@ -30,8 +30,8 @@
#include "vg_skin.h"
-//#define uInstr0 VG_(newUInstr0)
-//#define uLiteral VG_(setLiteralField)
+//#define uInstr0 VG_(new_UInstr0)
+//#define uLiteral VG_(set_lit_field)
/* Nb: use ULongs because the numbers can get very big */
static ULong n_dlrr_calls = 0;
@@ -140,18 +140,18 @@
UInstr* u;
Char fnname[100];
- cb = VG_(allocCodeBlock)();
+ cb = VG_(alloc_UCodeBlock)();
cb->nextTemp = cb_in->nextTemp;
/* Count call to dlrr(), if this BB is dlrr()'s entry point */
if (VG_(get_fnname_if_entry)(orig_addr, fnname, 100) &&
0 == VG_(strcmp)(fnname, "_dl_runtime_resolve"))
{
- VG_(callHelper_0_0)(cb, (Addr) & add_one_dlrr_call);
+ VG_(call_helper_0_0)(cb, (Addr) & add_one_dlrr_call);
}
/* Count basic block */
- VG_(callHelper_0_0)(cb, (Addr) & add_one_BB);
+ VG_(call_helper_0_0)(cb, (Addr) & add_one_BB);
for (i = 0; i < cb_in->used; i++) {
u = &cb_in->instrs[i];
@@ -162,31 +162,31 @@
case INCEIP:
/* Count x86 instr */
- VG_(callHelper_0_0)(cb, (Addr) & add_one_x86_instr);
- VG_(copyUInstr)(cb, u);
+ VG_(call_helper_0_0)(cb, (Addr) & add_one_x86_instr);
+ VG_(copy_UInstr)(cb, u);
break;
case JMP:
if (u->cond != CondAlways) {
/* Count Jcc */
- VG_(callHelper_0_0)(cb, (Addr) & add_one_Jcc);
- VG_(copyUInstr)(cb, u);
+ VG_(call_helper_0_0)(cb, (Addr) & add_one_Jcc);
+ VG_(copy_UInstr)(cb, u);
/* Count non-taken Jcc */
- VG_(callHelper_0_0)(cb, (Addr) & add_one_Jcc_untaken);
+ VG_(call_helper_0_0)(cb, (Addr) & add_one_Jcc_untaken);
} else {
- VG_(copyUInstr)(cb, u);
+ VG_(copy_UInstr)(cb, u);
}
break;
default:
/* Count UInstr */
- VG_(callHelper_0_0)(cb, (Addr) & add_one_UInstr);
- VG_(copyUInstr)(cb, u);
+ VG_(call_helper_0_0)(cb, (Addr) & add_one_UInstr);
+ VG_(copy_UInstr)(cb, u);
break;
}
}
- VG_(freeCodeBlock)(cb_in);
+ VG_(free_UCodeBlock)(cb_in);
return cb;
}