To avoid namespace collision with ARM helper of the same name. Marking hack, as really all helpers should be consistently renamed or something should be figured out to allow per-target separation of the helper.h namespace.
Signed-off-by: Peter Crosthwaite <crosthwaite.pe...@gmail.com> --- target-microblaze/helper.h | 2 +- target-microblaze/op_helper.c | 2 +- target-microblaze/translate.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/target-microblaze/helper.h b/target-microblaze/helper.h index bd13826..c7d1c9e 100644 --- a/target-microblaze/helper.h +++ b/target-microblaze/helper.h @@ -3,7 +3,7 @@ DEF_HELPER_1(debug, void, env) DEF_HELPER_FLAGS_3(carry, TCG_CALL_NO_RWG_SE, i32, i32, i32, i32) DEF_HELPER_2(cmp, i32, i32, i32) DEF_HELPER_2(cmpu, i32, i32, i32) -DEF_HELPER_FLAGS_1(clz, TCG_CALL_NO_RWG_SE, i32, i32) +DEF_HELPER_FLAGS_1(mb_clz, TCG_CALL_NO_RWG_SE, i32, i32) DEF_HELPER_3(divs, i32, env, i32, i32) DEF_HELPER_3(divu, i32, env, i32, i32) diff --git a/target-microblaze/op_helper.c b/target-microblaze/op_helper.c index 1e7db6a..df2d74f 100644 --- a/target-microblaze/op_helper.c +++ b/target-microblaze/op_helper.c @@ -144,7 +144,7 @@ uint32_t helper_cmpu(uint32_t a, uint32_t b) return t; } -uint32_t helper_clz(uint32_t t0) +uint32_t helper_mb_clz(uint32_t t0) { return clz32(t0); } diff --git a/target-microblaze/translate.c b/target-microblaze/translate.c index b199d1d..ec655fd 100644 --- a/target-microblaze/translate.c +++ b/target-microblaze/translate.c @@ -821,7 +821,7 @@ static void dec_bit(DisasContext *dc) t_gen_raise_exception(dc, MB_EXCP_HW_EXCP); } if (dc->cpu->env.pvr.regs[2] & PVR2_USE_PCMP_INSTR) { - gen_helper_clz(cpu_R[dc->rd], cpu_R[dc->ra]); + gen_helper_mb_clz(cpu_R[dc->rd], cpu_R[dc->ra]); } break; case 0x1e0: -- 1.9.1