Move VG_(bbs_done) out of main and make it local in scheduler.c. This
removes the dependence of m_translate.c and m_libcassert.c on m_main.c.
git-svn-id: svn://svn.valgrind.org/valgrind/trunk@3954 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/coregrind/m_translate.c b/coregrind/m_translate.c
index d64914d..7e229e8 100644
--- a/coregrind/m_translate.c
+++ b/coregrind/m_translate.c
@@ -36,7 +36,6 @@
#include "pub_core_libcbase.h"
#include "pub_core_libcassert.h"
#include "pub_core_libcprint.h"
-#include "pub_core_main.h" // for VG_(bbs_done)
#include "pub_core_options.h"
#include "pub_core_profile.h"
#include "pub_core_redir.h"
@@ -417,7 +416,8 @@
Bool VG_(translate) ( ThreadId tid,
Addr64 orig_addr,
Bool debugging_translation,
- Int debugging_verbosity )
+ Int debugging_verbosity,
+ ULong bbs_done )
{
Addr64 redir, orig_addr0 = orig_addr;
Int tmpbuf_used, verbosity;
@@ -501,9 +501,9 @@
Char fnname[64] = "";
VG_(get_fnname_w_offset)(orig_addr, fnname, 64);
VG_(printf)(
- "==== BB %d %s(0x%llx) approx BBs exec'd %lld ====\n",
+ "==== BB %d %s(0x%llx) BBs exec'd %lld ====\n",
VG_(get_bbs_translated)(), fnname, orig_addr,
- VG_(bbs_done));
+ bbs_done);
}
if (seg == NULL ||