diff --git a/qemu/target/arm/translate.c b/qemu/target/arm/translate.c
index 316451e9..aaad64d0 100644
--- a/qemu/target/arm/translate.c
+++ b/qemu/target/arm/translate.c
@@ -631,14 +631,7 @@ static void gen_sar(DisasContext *s, TCGv_i32 dest, TCGv_i32 t0, TCGv_i32 t1)
 static void shifter_out_im(DisasContext *s, TCGv_i32 var, int shift)
 {
     TCGContext *tcg_ctx = s->uc->tcg_ctx;
-    if (shift == 0) {
-        tcg_gen_andi_i32(tcg_ctx, tcg_ctx->cpu_CF, var, 1);
-    } else {
-        tcg_gen_shri_i32(tcg_ctx, tcg_ctx->cpu_CF, var, shift);
-        if (shift != 31) {
-            tcg_gen_andi_i32(tcg_ctx, tcg_ctx->cpu_CF, tcg_ctx->cpu_CF, 1);
-        }
-    }
+    tcg_gen_extract_i32(tcg_ctx, tcg_ctx->cpu_CF, var, shift, 1);
 }
 
 /* Shift by immediate.  Includes special handling for shift == 0.  */