In order to restrict lookup_cp_reg() and set_rmode() helpers to VFP translation, un-inline gen_lookup_cp_reg and gen_set / gen_restore_rmode.
Signed-off-by: Philippe Mathieu-Daudé <phi...@linaro.org> --- target/arm/tcg/translate.h | 22 +++------------------- target/arm/tcg/translate-vfp.c | 21 +++++++++++++++++++++ 2 files changed, 24 insertions(+), 19 deletions(-) diff --git a/target/arm/tcg/translate.h b/target/arm/tcg/translate.h index 3d7c55d3b6..d2a98b9f3a 100644 --- a/target/arm/tcg/translate.h +++ b/target/arm/tcg/translate.h @@ -680,29 +680,13 @@ static inline void set_disas_label(DisasContext *s, DisasLabel l) s->pc_save = l.pc_save; } -static inline TCGv_ptr gen_lookup_cp_reg(uint32_t key) -{ - TCGv_ptr ret = tcg_temp_new_ptr(); - gen_helper_lookup_cp_reg(ret, cpu_env, tcg_constant_i32(key)); - return ret; -} +TCGv_ptr gen_lookup_cp_reg(uint32_t key); /* * Set and reset rounding mode around another operation. */ -static inline TCGv_i32 gen_set_rmode(ARMFPRounding rmode, TCGv_ptr fpst) -{ - TCGv_i32 new = tcg_constant_i32(arm_rmode_to_sf(rmode)); - TCGv_i32 old = tcg_temp_new_i32(); - - gen_helper_set_rmode(old, new, fpst); - return old; -} - -static inline void gen_restore_rmode(TCGv_i32 old, TCGv_ptr fpst) -{ - gen_helper_set_rmode(old, old, fpst); -} +TCGv_i32 gen_set_rmode(ARMFPRounding rmode, TCGv_ptr fpst); +void gen_restore_rmode(TCGv_i32 old, TCGv_ptr fpst); /* * Helpers for implementing sets of trans_* functions. diff --git a/target/arm/tcg/translate-vfp.c b/target/arm/tcg/translate-vfp.c index 359b1e3e96..4bfd857141 100644 --- a/target/arm/tcg/translate-vfp.c +++ b/target/arm/tcg/translate-vfp.c @@ -28,6 +28,27 @@ #include "decode-vfp.c.inc" #include "decode-vfp-uncond.c.inc" +TCGv_ptr gen_lookup_cp_reg(uint32_t key) +{ + TCGv_ptr ret = tcg_temp_new_ptr(); + gen_helper_lookup_cp_reg(ret, cpu_env, tcg_constant_i32(key)); + return ret; +} + +TCGv_i32 gen_set_rmode(ARMFPRounding rmode, TCGv_ptr fpst) +{ + TCGv_i32 new = tcg_constant_i32(arm_rmode_to_sf(rmode)); + TCGv_i32 old = tcg_temp_new_i32(); + + gen_helper_set_rmode(old, new, fpst); + return old; +} + +void gen_restore_rmode(TCGv_i32 old, TCGv_ptr fpst) +{ + gen_helper_set_rmode(old, old, fpst); +} + static inline void vfp_load_reg64(TCGv_i64 var, int reg) { tcg_gen_ld_i64(var, cpu_env, vfp_reg_offset(true, reg)); -- 2.38.1