Index: target-arm/translate.c
===================================================================
--- target-arm/translate.c	(revision 5796)
+++ target-arm/translate.c	(working copy)
@@ -421,7 +421,7 @@
 {
     TCGv tmp = new_tmp();
     tcg_gen_shri_i32(tmp, var, 31);
-    gen_set_CF(var);
+    gen_set_CF(tmp);
     dead_tmp(tmp);
 }
 
@@ -496,7 +496,7 @@
         tcg_gen_andi_i32(tmp, var, 1);
     } else {
         tcg_gen_shri_i32(tmp, var, shift);
-        if (shift != 31);
+        if (shift != 31)
             tcg_gen_andi_i32(tmp, tmp, 1);
     }
     gen_set_CF(tmp);
@@ -4644,6 +4644,7 @@
                     imm = (uint32_t)shift;
                     tmp2 = tcg_const_i32(imm);
                     TCGV_UNUSED_I64(tmp64);
+                    break;
                 case 3:
                     tmp64 = tcg_const_i64(shift);
                     TCGV_UNUSED(tmp2);
@@ -6609,6 +6610,7 @@
                         break;
                     case 0x12: case 0x16: case 0x1a: case 0x1e: /* sbfx */
                     case 0x32: case 0x36: case 0x3a: case 0x3e: /* ubfx */
+                        ARCH(6T2);
                         tmp = load_reg(s, rm);
                         shift = (insn >> 7) & 0x1f;
                         i = ((insn >> 16) & 0x1f) + 1;
@@ -8475,7 +8477,7 @@
         case 6: /* cps */
             ARCH(6);
             if (IS_USER(s))
-                break;
+                goto illegal_op;
             if (IS_M(env)) {
                 tmp = tcg_const_i32((insn & (1 << 4)) != 0);
                 /* PRIMASK */