SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

target/hppa: Mask inputs in copy_iaoq_entry

Browse Source 
Ensure that the destination is always a valid GVA offset.

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
Richard Henderson 2023-10-26 19:03:34 -07:00
parent 9a91dd8452
commit f13bf343cc
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
target/hppa/translate.c
View File

@ -720,10 +720,22 @@ static target_ureg gva_offset_mask(DisasContext *ctx)
static void copy_iaoq_entry(DisasContext *ctx, TCGv_reg dest, static void copy_iaoq_entry(DisasContext *ctx, TCGv_reg dest,
target_ureg ival, TCGv_reg vval) target_ureg ival, TCGv_reg vval)
{ {
if (unlikely(ival == -1)) { target_ureg mask = gva_offset_mask(ctx);
if (ival != -1) {
tcg_gen_movi_reg(dest, ival & mask);
return;
}
tcg_debug_assert(vval != NULL);
/*
* We know that the IAOQ is already properly masked.
* This optimization is primarily for "iaoq_f = iaoq_b".
*/
if (vval == cpu_iaoq_f || vval == cpu_iaoq_b) {
tcg_gen_mov_reg(dest, vval); tcg_gen_mov_reg(dest, vval);
} else { } else {
tcg_gen_movi_reg(dest, ival); tcg_gen_andi_reg(dest, vval, mask);
} }
} }