mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

target/arm: Change gen_exception_insn* to work on displacements

Browse Source 
In preparation for TARGET_TB_PCREL, reduce reliance on absolute values.

Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20221020030641.2066807-5-richard.henderson@linaro.org
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Richard Henderson 2022-10-20 13:06:36 +10:00 committed by Peter Maydell
parent c44c8b8b99
commit 55086e628f
6 changed files with 43 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
target/arm/translate-a64.c
View File

@ -1155,7 +1155,7 @@ static bool fp_access_check_only(DisasContext *s)
assert(!s->fp_access_checked); assert(!s->fp_access_checked);
s->fp_access_checked = true; s->fp_access_checked = true;
gen_exception_insn_el(s, s->pc_curr, EXCP_UDEF, gen_exception_insn_el(s, 0, EXCP_UDEF,
syn_fp_access_trap(1, 0xe, false, 0), syn_fp_access_trap(1, 0xe, false, 0),
s->fp_excp_el); s->fp_excp_el);
return false; return false;
@ -1170,7 +1170,7 @@ static bool fp_access_check(DisasContext *s)
return false; return false;
} }
if (s->sme_trap_nonstreaming && s->is_nonstreaming) { if (s->sme_trap_nonstreaming && s->is_nonstreaming) {
gen_exception_insn(s, s->pc_curr, EXCP_UDEF, gen_exception_insn(s, 0, EXCP_UDEF,
syn_smetrap(SME_ET_Streaming, false)); syn_smetrap(SME_ET_Streaming, false));
return false; return false;
} }
@ -1190,7 +1190,7 @@ bool sve_access_check(DisasContext *s)
goto fail_exit; goto fail_exit;
} }
} else if (s->sve_excp_el) { } else if (s->sve_excp_el) {
gen_exception_insn_el(s, s->pc_curr, EXCP_UDEF, gen_exception_insn_el(s, 0, EXCP_UDEF,
syn_sve_access_trap(), s->sve_excp_el); syn_sve_access_trap(), s->sve_excp_el);
goto fail_exit; goto fail_exit;
} }
@ -1212,7 +1212,7 @@ bool sve_access_check(DisasContext *s)
static bool sme_access_check(DisasContext *s) static bool sme_access_check(DisasContext *s)
{ {
if (s->sme_excp_el) { if (s->sme_excp_el) {
gen_exception_insn_el(s, s->pc_curr, EXCP_UDEF, gen_exception_insn_el(s, 0, EXCP_UDEF,
syn_smetrap(SME_ET_AccessTrap, false), syn_smetrap(SME_ET_AccessTrap, false),
s->sme_excp_el); s->sme_excp_el);
return false; return false;
@ -1242,12 +1242,12 @@ bool sme_enabled_check_with_svcr(DisasContext *s, unsigned req)
return false; return false;
} }
if (FIELD_EX64(req, SVCR, SM) && !s->pstate_sm) { if (FIELD_EX64(req, SVCR, SM) && !s->pstate_sm) {
gen_exception_insn(s, s->pc_curr, EXCP_UDEF, gen_exception_insn(s, 0, EXCP_UDEF,
syn_smetrap(SME_ET_NotStreaming, false)); syn_smetrap(SME_ET_NotStreaming, false));
return false; return false;
} }
if (FIELD_EX64(req, SVCR, ZA) && !s->pstate_za) { if (FIELD_EX64(req, SVCR, ZA) && !s->pstate_za) {
gen_exception_insn(s, s->pc_curr, EXCP_UDEF, gen_exception_insn(s, 0, EXCP_UDEF,
syn_smetrap(SME_ET_InactiveZA, false)); syn_smetrap(SME_ET_InactiveZA, false));
return false; return false;
} }
@ -1907,7 +1907,7 @@ static void gen_sysreg_undef(DisasContext *s, bool isread,
} else { } else {
syndrome = syn_uncategorized(); syndrome = syn_uncategorized();
} }
gen_exception_insn(s, s->pc_curr, EXCP_UDEF, syndrome); gen_exception_insn(s, 0, EXCP_UDEF, syndrome);
} }
/* MRS - move from system register /* MRS - move from system register
@ -2161,8 +2161,7 @@ static void disas_exc(DisasContext *s, uint32_t insn)
switch (op2_ll) { switch (op2_ll) {
case 1: /* SVC */ case 1: /* SVC */
gen_ss_advance(s); gen_ss_advance(s);
gen_exception_insn(s, s->base.pc_next, EXCP_SWI, gen_exception_insn(s, 4, EXCP_SWI, syn_aa64_svc(imm16));
syn_aa64_svc(imm16));
break; break;
case 2: /* HVC */ case 2: /* HVC */
if (s->current_el == 0) { if (s->current_el == 0) {
@ -2175,8 +2174,7 @@ static void disas_exc(DisasContext *s, uint32_t insn)
gen_a64_update_pc(s, 0); gen_a64_update_pc(s, 0);
gen_helper_pre_hvc(cpu_env); gen_helper_pre_hvc(cpu_env);
gen_ss_advance(s); gen_ss_advance(s);
gen_exception_insn_el(s, s->base.pc_next, EXCP_HVC, gen_exception_insn_el(s, 4, EXCP_HVC, syn_aa64_hvc(imm16), 2);
syn_aa64_hvc(imm16), 2);
break; break;
case 3: /* SMC */ case 3: /* SMC */
if (s->current_el == 0) { if (s->current_el == 0) {
@ -2186,8 +2184,7 @@ static void disas_exc(DisasContext *s, uint32_t insn)
gen_a64_update_pc(s, 0); gen_a64_update_pc(s, 0);
gen_helper_pre_smc(cpu_env, tcg_constant_i32(syn_aa64_smc(imm16))); gen_helper_pre_smc(cpu_env, tcg_constant_i32(syn_aa64_smc(imm16)));
gen_ss_advance(s); gen_ss_advance(s);
gen_exception_insn_el(s, s->base.pc_next, EXCP_SMC, gen_exception_insn_el(s, 4, EXCP_SMC, syn_aa64_smc(imm16), 3);
syn_aa64_smc(imm16), 3);
break; break;
default: default:
unallocated_encoding(s); unallocated_encoding(s);
@ -14824,7 +14821,7 @@ static void aarch64_tr_translate_insn(DisasContextBase *dcbase, CPUState *cpu)
* Illegal execution state. This has priority over BTI * Illegal execution state. This has priority over BTI
* exceptions, but comes after instruction abort exceptions. * exceptions, but comes after instruction abort exceptions.
*/ */
gen_exception_insn(s, s->pc_curr, EXCP_UDEF, syn_illegalstate()); gen_exception_insn(s, 0, EXCP_UDEF, syn_illegalstate());
return; return;
} }
@ -14855,8 +14852,7 @@ static void aarch64_tr_translate_insn(DisasContextBase *dcbase, CPUState *cpu)
if (s->btype != 0 if (s->btype != 0
&& s->guarded_page && s->guarded_page
&& !btype_destination_ok(insn, s->bt, s->btype)) { && !btype_destination_ok(insn, s->bt, s->btype)) {
gen_exception_insn(s, s->pc_curr, EXCP_UDEF, gen_exception_insn(s, 0, EXCP_UDEF, syn_btitrap(s->btype));
syn_btitrap(s->btype));
return; return;
} }
} else { } else {

6
target/arm/translate-m-nocp.c
View File

@ -143,7 +143,7 @@ static bool trans_VSCCLRM(DisasContext *s, arg_VSCCLRM *a)
tcg_gen_brcondi_i32(TCG_COND_EQ, sfpa, 0, s->condlabel); tcg_gen_brcondi_i32(TCG_COND_EQ, sfpa, 0, s->condlabel);
if (s->fp_excp_el != 0) { if (s->fp_excp_el != 0) {
gen_exception_insn_el(s, s->pc_curr, EXCP_NOCP, gen_exception_insn_el(s, 0, EXCP_NOCP,
syn_uncategorized(), s->fp_excp_el); syn_uncategorized(), s->fp_excp_el);
return true; return true;
} }
@ -765,12 +765,12 @@ static bool trans_NOCP(DisasContext *s, arg_nocp *a)
} }
if (a->cp != 10) { if (a->cp != 10) {
gen_exception_insn(s, s->pc_curr, EXCP_NOCP, syn_uncategorized()); gen_exception_insn(s, 0, EXCP_NOCP, syn_uncategorized());
return true; return true;
} }
if (s->fp_excp_el != 0) { if (s->fp_excp_el != 0) {
gen_exception_insn_el(s, s->pc_curr, EXCP_NOCP, gen_exception_insn_el(s, 0, EXCP_NOCP,
syn_uncategorized(), s->fp_excp_el); syn_uncategorized(), s->fp_excp_el);
return true; return true;
} }

2
target/arm/translate-mve.c
View File

@ -100,7 +100,7 @@ bool mve_eci_check(DisasContext *s)
return true; return true;
default: default:
/* Reserved value: INVSTATE UsageFault */ /* Reserved value: INVSTATE UsageFault */
gen_exception_insn(s, s->pc_curr, EXCP_INVSTATE, syn_uncategorized()); gen_exception_insn(s, 0, EXCP_INVSTATE, syn_uncategorized());
return false; return false;
} }
} }

6
target/arm/translate-vfp.c
View File

@ -230,7 +230,7 @@ static bool vfp_access_check_a(DisasContext *s, bool ignore_vfp_enabled)
int coproc = arm_dc_feature(s, ARM_FEATURE_V8) ? 0 : 0xa; int coproc = arm_dc_feature(s, ARM_FEATURE_V8) ? 0 : 0xa;
uint32_t syn = syn_fp_access_trap(1, 0xe, false, coproc); uint32_t syn = syn_fp_access_trap(1, 0xe, false, coproc);
gen_exception_insn_el(s, s->pc_curr, EXCP_UDEF, syn, s->fp_excp_el); gen_exception_insn_el(s, 0, EXCP_UDEF, syn, s->fp_excp_el);
return false; return false;
} }
@ -240,7 +240,7 @@ static bool vfp_access_check_a(DisasContext *s, bool ignore_vfp_enabled)
* appear to be any insns which touch VFP which are allowed. * appear to be any insns which touch VFP which are allowed.
*/ */
if (s->sme_trap_nonstreaming) { if (s->sme_trap_nonstreaming) {
gen_exception_insn(s, s->pc_curr, EXCP_UDEF, gen_exception_insn(s, 0, EXCP_UDEF,
syn_smetrap(SME_ET_Streaming, syn_smetrap(SME_ET_Streaming,
curr_insn_len(s) == 2)); curr_insn_len(s) == 2));
return false; return false;
@ -272,7 +272,7 @@ bool vfp_access_check_m(DisasContext *s, bool skip_context_update)
* the encoding space handled by the patterns in m-nocp.decode, * the encoding space handled by the patterns in m-nocp.decode,
* and for them we may need to raise NOCP here. * and for them we may need to raise NOCP here.
*/ */
gen_exception_insn_el(s, s->pc_curr, EXCP_NOCP, gen_exception_insn_el(s, 0, EXCP_NOCP,
syn_uncategorized(), s->fp_excp_el); syn_uncategorized(), s->fp_excp_el);
return false; return false;
} }

42
target/arm/translate.c
View File

@ -1099,32 +1099,34 @@ static void gen_exception(int excp, uint32_t syndrome)
tcg_constant_i32(syndrome)); tcg_constant_i32(syndrome));
} }
static void gen_exception_insn_el_v(DisasContext *s, uint64_t pc, int excp, static void gen_exception_insn_el_v(DisasContext *s, target_long pc_diff,
uint32_t syn, TCGv_i32 tcg_el) int excp, uint32_t syn, TCGv_i32 tcg_el)
{ {
if (s->aarch64) { if (s->aarch64) {
gen_a64_update_pc(s, pc - s->pc_curr); gen_a64_update_pc(s, pc_diff);
} else { } else {
gen_set_condexec(s); gen_set_condexec(s);
gen_update_pc(s, pc - s->pc_curr); gen_update_pc(s, pc_diff);
} }
gen_exception_el_v(excp, syn, tcg_el); gen_exception_el_v(excp, syn, tcg_el);
s->base.is_jmp = DISAS_NORETURN; s->base.is_jmp = DISAS_NORETURN;
} }
void gen_exception_insn_el(DisasContext *s, uint64_t pc, int excp, void gen_exception_insn_el(DisasContext *s, target_long pc_diff, int excp,
uint32_t syn, uint32_t target_el) uint32_t syn, uint32_t target_el)
{ {
gen_exception_insn_el_v(s, pc, excp, syn, tcg_constant_i32(target_el)); gen_exception_insn_el_v(s, pc_diff, excp, syn,
tcg_constant_i32(target_el));
} }
void gen_exception_insn(DisasContext *s, uint64_t pc, int excp, uint32_t syn) void gen_exception_insn(DisasContext *s, target_long pc_diff,
int excp, uint32_t syn)
{ {
if (s->aarch64) { if (s->aarch64) {
gen_a64_update_pc(s, pc - s->pc_curr); gen_a64_update_pc(s, pc_diff);
} else { } else {
gen_set_condexec(s); gen_set_condexec(s);
gen_update_pc(s, pc - s->pc_curr); gen_update_pc(s, pc_diff);
} }
gen_exception(excp, syn); gen_exception(excp, syn);
s->base.is_jmp = DISAS_NORETURN; s->base.is_jmp = DISAS_NORETURN;
@ -1141,7 +1143,7 @@ static void gen_exception_bkpt_insn(DisasContext *s, uint32_t syn)
void unallocated_encoding(DisasContext *s) void unallocated_encoding(DisasContext *s)
{ {
/* Unallocated and reserved encodings are uncategorized */ /* Unallocated and reserved encodings are uncategorized */
gen_exception_insn(s, s->pc_curr, EXCP_UDEF, syn_uncategorized()); gen_exception_insn(s, 0, EXCP_UDEF, syn_uncategorized());
} }
/* Force a TB lookup after an instruction that changes the CPU state. */ /* Force a TB lookup after an instruction that changes the CPU state. */
@ -2865,7 +2867,7 @@ static bool msr_banked_access_decode(DisasContext *s, int r, int sysm, int rn,
tcg_el = tcg_constant_i32(3); tcg_el = tcg_constant_i32(3);
} }
gen_exception_insn_el_v(s, s->pc_curr, EXCP_UDEF, gen_exception_insn_el_v(s, 0, EXCP_UDEF,
syn_uncategorized(), tcg_el); syn_uncategorized(), tcg_el);
tcg_temp_free_i32(tcg_el); tcg_temp_free_i32(tcg_el);
return false; return false;
@ -2891,7 +2893,7 @@ static bool msr_banked_access_decode(DisasContext *s, int r, int sysm, int rn,
undef: undef:
/* If we get here then some access check did not pass */ /* If we get here then some access check did not pass */
gen_exception_insn(s, s->pc_curr, EXCP_UDEF, syn_uncategorized()); gen_exception_insn(s, 0, EXCP_UDEF, syn_uncategorized());
return false; return false;
} }
@ -5115,8 +5117,7 @@ static void gen_srs(DisasContext *s,
* For the UNPREDICTABLE cases we choose to UNDEF. * For the UNPREDICTABLE cases we choose to UNDEF.
*/ */
if (s->current_el == 1 && !s->ns && mode == ARM_CPU_MODE_MON) { if (s->current_el == 1 && !s->ns && mode == ARM_CPU_MODE_MON) {
gen_exception_insn_el(s, s->pc_curr, EXCP_UDEF, gen_exception_insn_el(s, 0, EXCP_UDEF, syn_uncategorized(), 3);
syn_uncategorized(), 3);
return; return;
} }
@ -8498,7 +8499,7 @@ static bool trans_WLS(DisasContext *s, arg_WLS *a)
* Do the check-and-raise-exception by hand. * Do the check-and-raise-exception by hand.
*/ */
if (s->fp_excp_el) { if (s->fp_excp_el) {
gen_exception_insn_el(s, s->pc_curr, EXCP_NOCP, gen_exception_insn_el(s, 0, EXCP_NOCP,
syn_uncategorized(), s->fp_excp_el); syn_uncategorized(), s->fp_excp_el);
return true; return true;
} }
@ -8601,7 +8602,7 @@ static bool trans_LE(DisasContext *s, arg_LE *a)
tmp = load_cpu_field(v7m.ltpsize); tmp = load_cpu_field(v7m.ltpsize);
tcg_gen_brcondi_i32(TCG_COND_EQ, tmp, 4, skipexc); tcg_gen_brcondi_i32(TCG_COND_EQ, tmp, 4, skipexc);
tcg_temp_free_i32(tmp); tcg_temp_free_i32(tmp);
gen_exception_insn(s, s->pc_curr, EXCP_INVSTATE, syn_uncategorized()); gen_exception_insn(s, 0, EXCP_INVSTATE, syn_uncategorized());
gen_set_label(skipexc); gen_set_label(skipexc);
} }
@ -9069,7 +9070,7 @@ static void disas_arm_insn(DisasContext *s, unsigned int insn)
* UsageFault exception. * UsageFault exception.
*/ */
if (arm_dc_feature(s, ARM_FEATURE_M)) { if (arm_dc_feature(s, ARM_FEATURE_M)) {
gen_exception_insn(s, s->pc_curr, EXCP_INVSTATE, syn_uncategorized()); gen_exception_insn(s, 0, EXCP_INVSTATE, syn_uncategorized());
return; return;
} }
@ -9078,7 +9079,7 @@ static void disas_arm_insn(DisasContext *s, unsigned int insn)
* Illegal execution state. This has priority over BTI * Illegal execution state. This has priority over BTI
* exceptions, but comes after instruction abort exceptions. * exceptions, but comes after instruction abort exceptions.
*/ */
gen_exception_insn(s, s->pc_curr, EXCP_UDEF, syn_illegalstate()); gen_exception_insn(s, 0, EXCP_UDEF, syn_illegalstate());
return; return;
} }
@ -9642,7 +9643,7 @@ static void thumb_tr_translate_insn(DisasContextBase *dcbase, CPUState *cpu)
* Illegal execution state. This has priority over BTI * Illegal execution state. This has priority over BTI
* exceptions, but comes after instruction abort exceptions. * exceptions, but comes after instruction abort exceptions.
*/ */
gen_exception_insn(dc, dc->pc_curr, EXCP_UDEF, syn_illegalstate()); gen_exception_insn(dc, 0, EXCP_UDEF, syn_illegalstate());
return; return;
} }
@ -9715,8 +9716,7 @@ static void thumb_tr_translate_insn(DisasContextBase *dcbase, CPUState *cpu)
*/ */
tcg_remove_ops_after(dc->insn_eci_rewind); tcg_remove_ops_after(dc->insn_eci_rewind);
dc->condjmp = 0; dc->condjmp = 0;
gen_exception_insn(dc, dc->pc_curr, EXCP_INVSTATE, gen_exception_insn(dc, 0, EXCP_INVSTATE, syn_uncategorized());
syn_uncategorized());
} }
arm_post_translate_insn(dc); arm_post_translate_insn(dc);

5
target/arm/translate.h
View File

@ -281,9 +281,10 @@ void arm_jump_cc(DisasCompare *cmp, TCGLabel *label);
void arm_gen_test_cc(int cc, TCGLabel *label); void arm_gen_test_cc(int cc, TCGLabel *label);
MemOp pow2_align(unsigned i); MemOp pow2_align(unsigned i);
void unallocated_encoding(DisasContext *s); void unallocated_encoding(DisasContext *s);
void gen_exception_insn_el(DisasContext *s, uint64_t pc, int excp, void gen_exception_insn_el(DisasContext *s, target_long pc_diff, int excp,
uint32_t syn, uint32_t target_el); uint32_t syn, uint32_t target_el);
void gen_exception_insn(DisasContext *s, uint64_t pc, int excp, uint32_t syn); void gen_exception_insn(DisasContext *s, target_long pc_diff,
int excp, uint32_t syn);
/* Return state of Alternate Half-precision flag, caller frees result */ /* Return state of Alternate Half-precision flag, caller frees result */
static inline TCGv_i32 get_ahp_flag(void) static inline TCGv_i32 get_ahp_flag(void)