motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-09-01 14:31:52 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

target/arm: Rename helper_exception_with_syndrome

Browse source 
Rename to helper_exception_with_syndrome_el, to emphasize
that the target el is a parameter.

Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20220609202901.1177572-10-richard.henderson@linaro.org
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Richard Henderson 2022-06-10 14:32:31 +01:00 • committed by Peter Maydell
parent a853e3ae55
commit d3c5d50a5c
4 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
target/arm/helper.h
View file

@ -45,7 +45,7 @@ DEF_HELPER_FLAGS_2(usad8, TCG_CALL_NO_RWG_SE, i32, i32, i32)
DEF_HELPER_FLAGS_3(sel_flags, TCG_CALL_NO_RWG_SE, DEF_HELPER_FLAGS_3(sel_flags, TCG_CALL_NO_RWG_SE,
i32, i32, i32, i32) i32, i32, i32, i32)
DEF_HELPER_2(exception_internal, noreturn, env, i32) DEF_HELPER_2(exception_internal, noreturn, env, i32)
DEF_HELPER_4(exception_with_syndrome, noreturn, env, i32, i32, i32) DEF_HELPER_4(exception_with_syndrome_el, noreturn, env, i32, i32, i32)
DEF_HELPER_2(exception_bkpt_insn, noreturn, env, i32) DEF_HELPER_2(exception_bkpt_insn, noreturn, env, i32)
DEF_HELPER_2(exception_pc_alignment, noreturn, env, tl) DEF_HELPER_2(exception_pc_alignment, noreturn, env, tl)
DEF_HELPER_1(setend, void, env) DEF_HELPER_1(setend, void, env)

6
target/arm/op_helper.c
View file

@ -381,7 +381,7 @@ void HELPER(yield)(CPUARMState *env)
* those EXCP values which are special cases for QEMU to interrupt * those EXCP values which are special cases for QEMU to interrupt
* execution and not to be used for exceptions which are passed to * execution and not to be used for exceptions which are passed to
* the guest (those must all have syndrome information and thus should * the guest (those must all have syndrome information and thus should
* use exception_with_syndrome). * use exception_with_syndrome*).
*/ */
void HELPER(exception_internal)(CPUARMState *env, uint32_t excp) void HELPER(exception_internal)(CPUARMState *env, uint32_t excp)
{ {
@ -393,8 +393,8 @@ void HELPER(exception_internal)(CPUARMState *env, uint32_t excp)
} }
/* Raise an exception with the specified syndrome register value */ /* Raise an exception with the specified syndrome register value */
void HELPER(exception_with_syndrome)(CPUARMState *env, uint32_t excp, void HELPER(exception_with_syndrome_el)(CPUARMState *env, uint32_t excp,
uint32_t syndrome, uint32_t target_el) uint32_t syndrome, uint32_t target_el)
{ {
raise_exception(env, excp, syndrome, target_el); raise_exception(env, excp, syndrome, target_el);
} }

6
target/arm/translate.c
View file

@ -1119,9 +1119,9 @@ static void gen_exception_el(DisasContext *s, int excp, uint32_t syn,
{ {
gen_set_condexec(s); gen_set_condexec(s);
gen_set_pc_im(s, s->pc_curr); gen_set_pc_im(s, s->pc_curr);
gen_helper_exception_with_syndrome(cpu_env, gen_helper_exception_with_syndrome_el(cpu_env,
tcg_constant_i32(excp), tcg_constant_i32(excp),
tcg_constant_i32(syn), tcg_el); tcg_constant_i32(syn), tcg_el);
s->base.is_jmp = DISAS_NORETURN; s->base.is_jmp = DISAS_NORETURN;
} }

6
target/arm/translate.h
View file

@ -332,9 +332,9 @@ static inline void gen_ss_advance(DisasContext *s)
static inline void gen_exception(int excp, uint32_t syndrome, static inline void gen_exception(int excp, uint32_t syndrome,
uint32_t target_el) uint32_t target_el)
{ {
gen_helper_exception_with_syndrome(cpu_env, tcg_constant_i32(excp), gen_helper_exception_with_syndrome_el(cpu_env, tcg_constant_i32(excp),
tcg_constant_i32(syndrome), tcg_constant_i32(syndrome),
tcg_constant_i32(target_el)); tcg_constant_i32(target_el));
} }
/* Generate an architectural singlestep exception */ /* Generate an architectural singlestep exception */