fridtjof/qemu-cr16
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

target/arm: Add gcs record for BLR with PAuth

Browse source 
Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20251008215613.300150-58-richard.henderson@linaro.org
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Richard Henderson 2025-10-08 14:55:57 -07:00 • committed by Peter Maydell
parent 978bad65f8
commit d28bb06dc8
1 changed files with 16 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

31
target/arm/tcg/translate-a64.c
View file

@ -1842,21 +1842,21 @@ static bool trans_BRAZ(DisasContext *s, arg_braz *a)
static bool trans_BLRAZ(DisasContext *s, arg_braz *a)
{
TCGv_i64 dst, lr;
TCGv_i64 dst, link;
if (!dc_isar_feature(aa64_pauth, s)) {
return false;
}
dst = auth_branch_target(s, cpu_reg(s, a->rn), tcg_constant_i64(0), !a->m);
lr = cpu_reg(s, 30);
if (dst == lr) {
TCGv_i64 tmp = tcg_temp_new_i64();
tcg_gen_mov_i64(tmp, dst);
dst = tmp;
link = tcg_temp_new_i64();
gen_pc_plus_diff(s, link, 4);
if (s->gcs_en) {
gen_add_gcs_record(s, link);
}
gen_pc_plus_diff(s, lr, curr_insn_len(s));
gen_a64_set_pc(s, dst);
tcg_gen_mov_i64(cpu_reg(s, 30), link);
set_btype_for_blr(s);
s->base.is_jmp = DISAS_JUMP;
return true;
@ -1892,20 +1892,21 @@ static bool trans_BRA(DisasContext *s, arg_bra *a)
static bool trans_BLRA(DisasContext *s, arg_bra *a)
{
TCGv_i64 dst, lr;
TCGv_i64 dst, link;
if (!dc_isar_feature(aa64_pauth, s)) {
return false;
}
dst = auth_branch_target(s, cpu_reg(s, a->rn), cpu_reg_sp(s, a->rm), !a->m);
lr = cpu_reg(s, 30);
if (dst == lr) {
TCGv_i64 tmp = tcg_temp_new_i64();
tcg_gen_mov_i64(tmp, dst);
dst = tmp;
link = tcg_temp_new_i64();
gen_pc_plus_diff(s, link, 4);
if (s->gcs_en) {
gen_add_gcs_record(s, link);
}
gen_pc_plus_diff(s, lr, curr_insn_len(s));
gen_a64_set_pc(s, dst);
tcg_gen_mov_i64(cpu_reg(s, 30), link);
set_btype_for_blr(s);
s->base.is_jmp = DISAS_JUMP;
return true;