From: Julian Seward <jseward@acm.org>
Date: Fri, 27 Sep 2013 12:11:50 +0000 (+0000)
Subject: armg_calculate_condition: add missing masking (probably pointless,
X-Git-Tag: svn/VALGRIND_3_9_0^2~20
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=64f93128e8ee35304a9f88bd842c5d99fad7fe0a;p=thirdparty%2Fvalgrind.git

armg_calculate_condition: add missing masking (probably pointless,
but makes it easy to verify).


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

diff --git a/VEX/priv/guest_arm_helpers.c b/VEX/priv/guest_arm_helpers.c
index 6b2fd436bd..bb61afc97b 100644
--- a/VEX/priv/guest_arm_helpers.c
+++ b/VEX/priv/guest_arm_helpers.c
@@ -507,7 +507,7 @@ UInt armg_calculate_condition ( UInt cond_n_op /* (ARMCondcode << 4) | cc_op */,
       case ARMCondLS:    // C=0 || Z=1
          cf = armg_calculate_flag_c(cc_op, cc_dep1, cc_dep2, cc_dep3);
          zf = armg_calculate_flag_z(cc_op, cc_dep1, cc_dep2, cc_dep3);
-         return inv ^ (cf & ~zf);
+         return inv ^ (1 & (cf & ~zf));
 
       case ARMCondGE:    // N=V          => ~(n^v)
       case ARMCondLT:    // N!=V