aboutsummaryrefslogtreecommitdiff
path: root/target/hppa/translate.c
diff options
context:
space:
mode:
authorSven Schnelle <svens@stackframe.org>2024-03-24 09:09:43 +0100
committerRichard Henderson <richard.henderson@linaro.org>2024-03-27 12:15:25 -1000
commit7d50b696601deecfcefcfb2d8ba9eaf98cb294b6 (patch)
treed6d7a018ae7e1e483a01ec7424699829fdbff640 /target/hppa/translate.c
parent6ebebea758998b4da6472aad5eecc641c3b8c6dc (diff)
downloadqemu-7d50b696601deecfcefcfb2d8ba9eaf98cb294b6.zip
qemu-7d50b696601deecfcefcfb2d8ba9eaf98cb294b6.tar.gz
qemu-7d50b696601deecfcefcfb2d8ba9eaf98cb294b6.tar.bz2
target/hppa: Use gva_offset_mask() everywhere
Move it to cpu.h, so it can also be used in hppa_form_gva_psw(). Signed-off-by: Sven Schnelle <svens@stackframe.org> Reviewed-by: Helge Deller <deller@gmx.de> Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Message-Id: <20240324080945.991100-2-svens@stackframe.org> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Diffstat (limited to 'target/hppa/translate.c')
-rw-r--r--target/hppa/translate.c12
1 files changed, 3 insertions, 9 deletions
diff --git a/target/hppa/translate.c b/target/hppa/translate.c
index 46b2d65..e041310 100644
--- a/target/hppa/translate.c
+++ b/target/hppa/translate.c
@@ -586,17 +586,10 @@ static bool nullify_end(DisasContext *ctx)
return true;
}
-static uint64_t gva_offset_mask(DisasContext *ctx)
-{
- return (ctx->tb_flags & PSW_W
- ? MAKE_64BIT_MASK(0, 62)
- : MAKE_64BIT_MASK(0, 32));
-}
-
static void copy_iaoq_entry(DisasContext *ctx, TCGv_i64 dest,
uint64_t ival, TCGv_i64 vval)
{
- uint64_t mask = gva_offset_mask(ctx);
+ uint64_t mask = gva_offset_mask(ctx->tb_flags);
if (ival != -1) {
tcg_gen_movi_i64(dest, ival & mask);
@@ -1430,7 +1423,8 @@ static void form_gva(DisasContext *ctx, TCGv_i64 *pgva, TCGv_i64 *pofs,
*pofs = ofs;
*pgva = addr = tcg_temp_new_i64();
- tcg_gen_andi_i64(addr, modify <= 0 ? ofs : base, gva_offset_mask(ctx));
+ tcg_gen_andi_i64(addr, modify <= 0 ? ofs : base,
+ gva_offset_mask(ctx->tb_flags));
#ifndef CONFIG_USER_ONLY
if (!is_phys) {
tcg_gen_or_i64(addr, addr, space_select(ctx, sp, base));