commit 6c83d5e38fa00ce5c1532b274b4e61834ec1db48
author njn <njn@a5019735-40e9-0310-863c-91ae7b9d1cf9> Tue May 05 23:46:24 2009 +0000
committer njn <njn@a5019735-40e9-0310-863c-91ae7b9d1cf9> Tue May 05 23:46:24 2009 +0000
tree 2271cf65ca230d936d28468ecbad93bd3816c506
parent 1ee02e331936e399e97fcddcfb5d1cde612887f6

Don't store the frames hash in .frames[0] and the actual frames in
.frames[1..N_FRAMES].  Instead store the hash in a separate .frames_hash
field, and the actual frames in .frames[0..N_FRAMES-1].



git-svn-id: svn://svn.valgrind.org/valgrind/trunk@9778 a5019735-40e9-0310-863c-91ae7b9d1cf9

helgrind/libhb_core.c

diff --git a/helgrind/libhb_core.c b/helgrind/libhb_core.c
index 572b26b..b2142ec 100644
--- a/helgrind/libhb_core.c
+++ b/helgrind/libhb_core.c
@@ -2729,7 +2729,8 @@
       struct _RCEC* next;
       UWord rc;
       UWord rcX; /* used for crosschecking */
-      UWord frames[1 + N_FRAMES]; /* first word is hash of all the rest */
+      UWord frames_hash;          /* hash of all the frames */
+      UWord frames[N_FRAMES];
    }
    RCEC;
 
@@ -2741,11 +2742,11 @@
    Word i;
    tl_assert(ec1 && ec1->magic == RCEC_MAGIC);
    tl_assert(ec2 && ec2->magic == RCEC_MAGIC);
-   if (ec1->frames[0] < ec2->frames[0]) return -1;
-   if (ec1->frames[0] > ec2->frames[0]) return 1;
-   for (i = 1; i < 1 + N_FRAMES; i++) {
+   if (ec1->frames_hash < ec2->frames_hash) return -1;
+   if (ec1->frames_hash > ec2->frames_hash) return  1;
+   for (i = 0; i < N_FRAMES; i++) {
       if (ec1->frames[i] < ec2->frames[i]) return -1;
-      if (ec1->frames[i] > ec2->frames[i]) return 1;
+      if (ec1->frames[i] > ec2->frames[i]) return  1;
    }
    return 0;
 }
@@ -2841,7 +2842,7 @@
 
    /* Search the hash table to see if we already have it. */
    stats__ctxt_tab_qs++;
-   hent = example->frames[0] % N_RCEC_TAB;
+   hent = example->frames_hash % N_RCEC_TAB;
    copy = contextTab[hent];
    while (1) {
       if (!copy) break;
@@ -2886,13 +2887,13 @@
    example.magic = RCEC_MAGIC;
    example.rc = 0;
    example.rcX = 0;
-   main_get_stacktrace( thr, &example.frames[1], N_FRAMES );
+   main_get_stacktrace( thr, &example.frames[0], N_FRAMES );
    hash = 0;
-   for (i = 1; i < 1 + N_FRAMES; i++) {
+   for (i = 0; i < N_FRAMES; i++) {
       hash ^= example.frames[i];
       hash = ROLW(hash, 19);
    }
-   example.frames[0] = hash;
+   example.frames_hash = hash;
    return ctxt__find_or_add( &example );
 }
 
@@ -3189,7 +3190,7 @@
          tl_assert(cand_rcec->magic == RCEC_MAGIC);
          tl_assert(cand_szB >= 1);
          *resEC  = VG_(make_ExeContext_from_StackTrace)(
-                      &cand_rcec->frames[1],
+                      &cand_rcec->frames[0],
                       min_UInt(N_FRAMES, VG_(clo_backtrace_size))
                    );
          *resThr = cand_thr;