|
From: <sv...@va...> - 2016-10-20 05:37:14
|
Author: sewardj
Date: Thu Oct 20 06:37:07 2016
New Revision: 3278
Log:
Merge from trunk:
3272 Fix incorrect register-number constraint check for LDAEX{,B,H,D}
Modified:
branches/VEX_3_12_BRANCH/ (props changed)
branches/VEX_3_12_BRANCH/priv/guest_arm_toIR.c
Modified: branches/VEX_3_12_BRANCH/priv/guest_arm_toIR.c
==============================================================================
--- branches/VEX_3_12_BRANCH/priv/guest_arm_toIR.c (original)
+++ branches/VEX_3_12_BRANCH/priv/guest_arm_toIR.c Thu Oct 20 06:37:07 2016
@@ -13329,7 +13329,7 @@
if (szBlg2 < 3) {
if (! (tt != 15 && nn != 15)) gate = False;
} else {
- if (! (tt & 1) == 0 && tt != 14 && nn != 15) gate = False;
+ if (! ((tt & 1) == 0 && tt != 14 && nn != 15)) gate = False;
vassert(tt2 == 16/*invalid*/);
tt2 = tt + 1;
}
|