[Valgrind-developers] vex: r1945 - branches/ARM/priv

[<sv...@va...>]

Author: sewardj
Date: 2009-12-29 14:21:22 +0000 (Tue, 29 Dec 2009)
New Revision: 1945

Log:
iselCondCode: check we're not return _NV or _AL


Modified:
   branches/ARM/priv/host_arm_isel.c


Modified: branches/ARM/priv/host_arm_isel.c
===================================================================
--- branches/ARM/priv/host_arm_isel.c	2009-12-29 13:49:10 UTC (rev 1944)
+++ branches/ARM/priv/host_arm_isel.c	2009-12-29 14:21:22 UTC (rev 1945)
@@ -902,8 +902,9 @@
 
 static ARMCondCode iselCondCode ( ISelEnv* env, IRExpr* e )
 {
-   /* Uh, there's nothing we can sanity check here, unfortunately. */
-   return iselCondCode_wrk(env,e);
+   ARMCondCode cc = iselCondCode_wrk(env,e);
+   vassert(cc != ARMcc_AL && cc != ARMcc_NV);
+   return cc;
 }
 
 static ARMCondCode iselCondCode_wrk ( ISelEnv* env, IRExpr* e )
@@ -1014,8 +1015,6 @@
 /* DO NOT CALL THIS DIRECTLY ! */
 static HReg iselIntExpr_R_wrk ( ISelEnv* env, IRExpr* e )
 {
-//zz   MatchInfo mi;
-
    IRType ty = typeOfIRExpr(env->type_env,e);
    vassert(ty == Ity_I32 || ty == Ity_I16 || ty == Ity_I8);