Fix Char/HChar mixups in helgrind and then some.
Also fix all usages of the wordFM data structure. Once upon a time
wordFM used Words but now it uses UWords.
Likewise for WordBag.


git-svn-id: svn://svn.valgrind.org/valgrind/trunk@13070 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/helgrind/hg_lock_n_thread.c b/helgrind/hg_lock_n_thread.c
index 5316ab2..73c8647 100644
--- a/helgrind/hg_lock_n_thread.c
+++ b/helgrind/hg_lock_n_thread.c
@@ -52,9 +52,9 @@
 static Bool is_sane_Bag_of_Threads ( WordBag* bag )
 {
    Thread* thr;
-   Word    count;
+   UWord   count;
    VG_(initIterBag)( bag );
-   while (VG_(nextIterBag)( bag, (Word*)&thr, &count )) {
+   while (VG_(nextIterBag)( bag, (UWord*)&thr, &count )) {
       if (count < 1) return False;
       if (!HG_(is_sane_Thread)(thr)) return False;
    }