target-cris: Use clz opcode

Signed-off-by: Richard Henderson <[email protected]>

diff --git a/target/cris/helper.h b/target/cris/helper.h
index ff3595641aace5ff4c2f38693ee8a7294c8e2d48..20d21c4358508b5dfc68bdfb24093750013b41aa 100644 (file)
--- a/target/cris/helper.h
+++ b/target/cris/helper.h
@@ -7,7 +7,6 @@ DEF_HELPER_1(rfn, void, env)
 DEF_HELPER_3(movl_sreg_reg, void, env, i32, i32)
 DEF_HELPER_3(movl_reg_sreg, void, env, i32, i32)
 
-DEF_HELPER_FLAGS_1(lz, TCG_CALL_NO_SE, i32, i32)
 DEF_HELPER_FLAGS_4(btst, TCG_CALL_NO_SE, i32, env, i32, i32, i32)
 
 DEF_HELPER_FLAGS_4(evaluate_flags_muls, TCG_CALL_NO_SE, i32, env, i32, i32, i32)

diff --git a/target/cris/op_helper.c b/target/cris/op_helper.c
index 504303913c6c044fade39f33e9264a698b5c7274..e92505c907ce6b47065acc45282de26d20e2f925 100644 (file)
--- a/target/cris/op_helper.c
+++ b/target/cris/op_helper.c
@@ -230,11 +230,6 @@ void helper_rfn(CPUCRISState *env)
        env->pregs[PR_CCS] |= M_FLAG_V32;
 }
 
-uint32_t helper_lz(uint32_t t0)
-{
-       return clz32(t0);
-}
-
 uint32_t helper_btst(CPUCRISState *env, uint32_t t0, uint32_t t1, uint32_t ccs)
 {
        /* FIXME: clean this up.  */

diff --git a/target/cris/translate.c b/target/cris/translate.c
index b91042743fea95d815d1246b32aa1615b01849b7..0ee05ca02d9ba6c3c0e112bd86f4124f89ad8dfe 100644 (file)
--- a/target/cris/translate.c
+++ b/target/cris/translate.c
@@ -767,7 +767,7 @@ static void cris_alu_op_exec(DisasContext *dc, int op,
         t_gen_subx_carry(dc, dst);
         break;
     case CC_OP_LZ:
-        gen_helper_lz(dst, b);
+        tcg_gen_clzi_tl(dst, b, TARGET_LONG_BITS);
         break;
     case CC_OP_MULS:
         tcg_gen_muls2_tl(dst, cpu_PR[PR_MOF], a, b);