motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-07 09:43:56 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

target/hppa: Use gva_offset_mask() everywhere

Browse source 
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>
This commit is contained in:
Sven Schnelle 2024-03-24 09:09:43 +01:00 • committed by Richard Henderson
parent 6ebebea758
commit 7d50b69660
2 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

10
target/hppa/cpu.h
View file

@ -285,14 +285,20 @@ void hppa_translate_init(void);
#define CPU_RESOLVING_TYPE TYPE_HPPA_CPU #define CPU_RESOLVING_TYPE TYPE_HPPA_CPU
static inline uint64_t gva_offset_mask(target_ulong psw)
{
return (psw & PSW_W
? MAKE_64BIT_MASK(0, 62)
: MAKE_64BIT_MASK(0, 32));
}
static inline target_ulong hppa_form_gva_psw(target_ulong psw, uint64_t spc, static inline target_ulong hppa_form_gva_psw(target_ulong psw, uint64_t spc,
target_ulong off) target_ulong off)
{ {
#ifdef CONFIG_USER_ONLY #ifdef CONFIG_USER_ONLY
return off; return off;
#else #else
off &= psw & PSW_W ? MAKE_64BIT_MASK(0, 62) : MAKE_64BIT_MASK(0, 32); return spc | (off & gva_offset_mask(psw));
return spc | off;
#endif #endif
} }

12
target/hppa/translate.c
View file

@ -586,17 +586,10 @@ static bool nullify_end(DisasContext *ctx)
return true; 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, static void copy_iaoq_entry(DisasContext *ctx, TCGv_i64 dest,
uint64_t ival, TCGv_i64 vval) 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) { if (ival != -1) {
tcg_gen_movi_i64(dest, ival & mask); 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; *pofs = ofs;
*pgva = addr = tcg_temp_new_i64(); *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 #ifndef CONFIG_USER_ONLY
if (!is_phys) { if (!is_phys) {
tcg_gen_or_i64(addr, addr, space_select(ctx, sp, base)); tcg_gen_or_i64(addr, addr, space_select(ctx, sp, base));