Fix breakage on ppc{32,64}-linux in post_reg_write_nonptr following

r10084 and also update a comment.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@10439

diff --git a/exp-ptrcheck/h_main.c b/exp-ptrcheck/h_main.c
index f02bf3e0c8c4ca2336b3a65656848185ab8f9778..e5b0284b60a0515950317f05c3fadda9cc625ab7 100644 (file)
--- a/exp-ptrcheck/h_main.c
+++ b/exp-ptrcheck/h_main.c
@@ -1954,9 +1954,17 @@ static void post_reg_write_nonptr ( ThreadId tid, PtrdiffT offset, SizeT size )
    //
    if (is_integer_guest_reg( (Int)offset, (Int)size )) {
       put_guest_intreg( tid, 1, offset, size, (UWord)NONPTR );
-   } else {
+   } 
+   else 
+   if (size == 1 || size == 2) {
+      /* can't possibly be an integer guest reg.  Ignore. */
+   }
+   else {
       // DDD: on Darwin, this assertion fails because we currently do a
       // 'post_reg_write' on the 'guest_CC_DEP1' pseudo-register.
+      // JRS 2009July13: we should change is_integer_guest_reg()
+      // to accept guest_CC_DEP* and guest_CC_NDEP
+      // as legitimate pointer-holding registers
       tl_assert(0);
    }
    //   VG_(set_thread_shadow_archreg)( tid, reg, (UInt)NONPTR );