From: Julian Seward <jseward@acm.org>
Date: Fri, 26 Nov 2004 11:57:41 +0000 (+0000)
Subject: Fix overly-restrictive assertion causing many threaded programs to
X-Git-Tag: svn/VALGRIND_3_0_0~1210
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=78e6eed82abab1773d7a18dfb7141fcf59ccd8bc;p=thirdparty%2Fvalgrind.git

Fix overly-restrictive assertion causing many threaded programs to
fail.



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

diff --git a/coregrind/vg_scheduler.c b/coregrind/vg_scheduler.c
index c80cfc752c..81bf552b4f 100644
--- a/coregrind/vg_scheduler.c
+++ b/coregrind/vg_scheduler.c
@@ -297,12 +297,22 @@ UInt run_thread_for_a_while ( ThreadId tid )
    /* Even more paranoia.  Check that what we have matches
       Vex's guest state layout requirements. */
 
-#  define IS_8_ALIGNED(_xx) (0 == ((_xx) & 7))
+#  define IS_4_ALIGNED(_xx)  (0 == ((_xx) & 3))
+#  define IS_8_ALIGNED(_xx)  (0 == ((_xx) & 7))
+#  define IS_16_ALIGNED(_xx) (0 == ((_xx) & 0xF))
+
+   if (0)
+   VG_(printf)("%p %d %p %d %p %d\n",
+	       (void*)a_vex, sz_vex, (void*)a_vexsh, sz_vexsh,
+	       (void*)a_spill, sz_spill );
 
    vg_assert(IS_8_ALIGNED(sz_vex));
    vg_assert(IS_8_ALIGNED(sz_vexsh));
-   vg_assert(IS_8_ALIGNED(a_vex));
-   vg_assert(IS_8_ALIGNED(a_vexsh));
+   vg_assert(IS_16_ALIGNED(sz_spill));
+
+   vg_assert(IS_4_ALIGNED(a_vex));
+   vg_assert(IS_4_ALIGNED(a_vexsh));
+   vg_assert(IS_4_ALIGNED(a_spill));
 
    vg_assert(sz_vex == sz_vexsh);
    vg_assert(a_vex + sz_vex == a_vexsh);
@@ -310,7 +320,9 @@ UInt run_thread_for_a_while ( ThreadId tid )
    vg_assert(sz_spill == LibVEX_N_SPILL_BYTES);
    vg_assert(a_vex + 2 * sz_vex == a_spill);
 
+#  undef IS_4_ALIGNED
 #  undef IS_8_ALIGNED
+#  undef IS_16_ALIGNED
 
    VGP_PUSHCC(VgpRun);