| Message ID | 1491820793-5348-5-git-send-email-peter.maydell@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | arm: Implement M profile exception return properly | expand |
On 04/10/2017 07:39 AM, Peter Maydell wrote: > Move the utility routines gen_set_condexec() and gen_set_pc_im() > up in the file, as we will want to use them from a function > placed earlier in the file than their current location. > > Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > --- > target/arm/translate.c | 31 +++++++++++++++---------------- > 1 file changed, 15 insertions(+), 16 deletions(-) > > diff --git a/target/arm/translate.c b/target/arm/translate.c > index 870e320..a1a0e73 100644 > --- a/target/arm/translate.c > +++ b/target/arm/translate.c > @@ -893,6 +893,21 @@ static const uint8_t table_logic_cc[16] = { > 1, /* mvn */ > }; > > +static inline void gen_set_condexec(DisasContext *s) > +{ > + if (s->condexec_mask) { > + uint32_t val = (s->condexec_cond << 4) | (s->condexec_mask >> 1); > + TCGv_i32 tmp = tcg_temp_new_i32(); > + tcg_gen_movi_i32(tmp, val); > + store_cpu_field(tmp, condexec_bits); > + } > +} > + > +static inline void gen_set_pc_im(DisasContext *s, target_ulong val) > +{ > + tcg_gen_movi_i32(cpu_R[15], val); > +} > + > /* Set PC and Thumb state from an immediate address. */ > static inline void gen_bx_im(DisasContext *s, uint32_t addr) > { > @@ -1069,11 +1084,6 @@ DO_GEN_ST(8, MO_UB) > DO_GEN_ST(16, MO_UW) > DO_GEN_ST(32, MO_UL) > > -static inline void gen_set_pc_im(DisasContext *s, target_ulong val) > -{ > - tcg_gen_movi_i32(cpu_R[15], val); > -} > - > static inline void gen_hvc(DisasContext *s, int imm16) > { > /* The pre HVC helper handles cases when HVC gets trapped > @@ -1107,17 +1117,6 @@ static inline void gen_smc(DisasContext *s) > s->is_jmp = DISAS_SMC; > } > > -static inline void > -gen_set_condexec (DisasContext *s) > -{ > - if (s->condexec_mask) { > - uint32_t val = (s->condexec_cond << 4) | (s->condexec_mask >> 1); > - TCGv_i32 tmp = tcg_temp_new_i32(); > - tcg_gen_movi_i32(tmp, val); > - store_cpu_field(tmp, condexec_bits); > - } > -} > - > static void gen_exception_internal_insn(DisasContext *s, int offset, int excp) > { > gen_set_condexec(s); >
diff --git a/target/arm/translate.c b/target/arm/translate.c index 870e320..a1a0e73 100644 --- a/target/arm/translate.c +++ b/target/arm/translate.c @@ -893,6 +893,21 @@ static const uint8_t table_logic_cc[16] = { 1, /* mvn */ }; +static inline void gen_set_condexec(DisasContext *s) +{ + if (s->condexec_mask) { + uint32_t val = (s->condexec_cond << 4) | (s->condexec_mask >> 1); + TCGv_i32 tmp = tcg_temp_new_i32(); + tcg_gen_movi_i32(tmp, val); + store_cpu_field(tmp, condexec_bits); + } +} + +static inline void gen_set_pc_im(DisasContext *s, target_ulong val) +{ + tcg_gen_movi_i32(cpu_R[15], val); +} + /* Set PC and Thumb state from an immediate address. */ static inline void gen_bx_im(DisasContext *s, uint32_t addr) { @@ -1069,11 +1084,6 @@ DO_GEN_ST(8, MO_UB) DO_GEN_ST(16, MO_UW) DO_GEN_ST(32, MO_UL) -static inline void gen_set_pc_im(DisasContext *s, target_ulong val) -{ - tcg_gen_movi_i32(cpu_R[15], val); -} - static inline void gen_hvc(DisasContext *s, int imm16) { /* The pre HVC helper handles cases when HVC gets trapped @@ -1107,17 +1117,6 @@ static inline void gen_smc(DisasContext *s) s->is_jmp = DISAS_SMC; } -static inline void -gen_set_condexec (DisasContext *s) -{ - if (s->condexec_mask) { - uint32_t val = (s->condexec_cond << 4) | (s->condexec_mask >> 1); - TCGv_i32 tmp = tcg_temp_new_i32(); - tcg_gen_movi_i32(tmp, val); - store_cpu_field(tmp, condexec_bits); - } -} - static void gen_exception_internal_insn(DisasContext *s, int offset, int excp) { gen_set_condexec(s);
Move the utility routines gen_set_condexec() and gen_set_pc_im() up in the file, as we will want to use them from a function placed earlier in the file than their current location. Signed-off-by: Peter Maydell <peter.maydell@linaro.org> --- target/arm/translate.c | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) -- 2.7.4