From: Julian Seward <jseward@acm.org>
Date: Thu, 28 Oct 2004 10:31:15 +0000 (+0000)
Subject: Finally make VG_(bbs_done) agree exactly with what Lackey measures.
X-Git-Tag: svn/VALGRIND_3_0_1^2~888
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c9afe2c4a5eddce4027cfee5da75ec6cda8744ae;p=thirdparty%2Fvalgrind.git

Finally make VG_(bbs_done) agree exactly with what Lackey measures.


git-svn-id: svn://svn.valgrind.org/vex/trunk@446
---

diff --git a/VEX/head20041019/coregrind/vg_dispatch.S b/VEX/head20041019/coregrind/vg_dispatch.S
index edfbb6d1b0..569724b368 100644
--- a/VEX/head20041019/coregrind/vg_dispatch.S
+++ b/VEX/head20041019/coregrind/vg_dispatch.S
@@ -135,11 +135,13 @@ dispatch_boring:
 	
 fast_lookup_failed:
 	/* %EIP is up to date here since dispatch_boring dominates */
+	addl	$1, VG_(dispatch_ctr)
 	movl	$VG_TRC_INNER_FASTMISS, %eax
 	jmp	run_innerloop_exit
 
 counter_is_zero:
 	/* %EIP is up to date here since dispatch_boring dominates */
+	addl	$1, VG_(dispatch_ctr)
 	movl	$VG_TRC_INNER_COUNTERZERO, %eax
 	jmp	run_innerloop_exit
 	
diff --git a/VEX/head20041019/coregrind/vg_scheduler.c b/VEX/head20041019/coregrind/vg_scheduler.c
index 66743301a1..c5a56e1ac2 100644
--- a/VEX/head20041019/coregrind/vg_scheduler.c
+++ b/VEX/head20041019/coregrind/vg_scheduler.c
@@ -352,7 +352,7 @@ UInt run_thread_for_a_while ( ThreadId tid )
 
    save_thread_state ( tid );
 
-   done_this_time = (Int)dispatch_ctr_SAVED - (Int)VG_(dispatch_ctr) - 1;
+   done_this_time = (Int)dispatch_ctr_SAVED - (Int)VG_(dispatch_ctr) - 0;
 
    vg_assert(done_this_time >= 0);
    VG_(bbs_done) += (ULong)done_this_time;
@@ -890,7 +890,7 @@ VgSchedReturnCode do_scheduler ( Int* exitcode, ThreadId* last_run_tid )
          if (trc == VG_TRC_INNER_FASTMISS) {
             Addr ip = ARCH_INSTR_PTR(VG_(threads)[tid].arch);
 
-            vg_assert(VG_(dispatch_ctr) > 0);
+            vg_assert(VG_(dispatch_ctr) > 1);
 
             /* Trivial event.  Miss in the fast-cache.  Do a full
                lookup for it. */
@@ -1068,7 +1068,7 @@ VgSchedReturnCode do_scheduler ( Int* exitcode, ThreadId* last_run_tid )
             /* Timeslice is out.  Let a new thread be scheduled,
                simply by doing nothing, causing us to arrive back at
                Phase 1. */
-            vg_assert(VG_(dispatch_ctr) == 0);
+            vg_assert(VG_(dispatch_ctr) == 1);
             break;
 
          case VG_TRC_UNRESUMABLE_SIGNAL: