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

target/ppc: Merge helper_{dcbz,dcbzep}

Browse source 
Merge the two and pass the mmu_idx directly from translation.
Swap the argument order in dcbz_common to avoid extra swaps.

Reviewed-by: Nicholas Piggin <npiggin@gmail.com>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
Richard Henderson 2024-07-01 20:10:53 -07:00
parent 62fe57c6d2
commit c6d84fd7cf
3 changed files with 7 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

3
target/ppc/helper.h
View file

@ -46,8 +46,7 @@ DEF_HELPER_FLAGS_3(stmw, TCG_CALL_NO_WG, void, env, tl, i32)
DEF_HELPER_4(lsw, void, env, tl, i32, i32) DEF_HELPER_4(lsw, void, env, tl, i32, i32)
DEF_HELPER_5(lswx, void, env, tl, i32, i32, i32) DEF_HELPER_5(lswx, void, env, tl, i32, i32, i32)
DEF_HELPER_FLAGS_4(stsw, TCG_CALL_NO_WG, void, env, tl, i32, i32) DEF_HELPER_FLAGS_4(stsw, TCG_CALL_NO_WG, void, env, tl, i32, i32)
DEF_HELPER_FLAGS_2(dcbz, TCG_CALL_NO_WG, void, env, tl) DEF_HELPER_FLAGS_3(dcbz, TCG_CALL_NO_WG, void, env, tl, int)
DEF_HELPER_FLAGS_2(dcbzep, TCG_CALL_NO_WG, void, env, tl)
#ifdef TARGET_PPC64 #ifdef TARGET_PPC64
DEF_HELPER_FLAGS_2(dcbzl, TCG_CALL_NO_WG, void, env, tl) DEF_HELPER_FLAGS_2(dcbzl, TCG_CALL_NO_WG, void, env, tl)
#endif #endif

14
target/ppc/mem_helper.c
View file

@ -271,7 +271,7 @@ void helper_stsw(CPUPPCState *env, target_ulong addr, uint32_t nb,
} }
static void dcbz_common(CPUPPCState *env, target_ulong addr, static void dcbz_common(CPUPPCState *env, target_ulong addr,
int dcbz_size, int mmu_idx, uintptr_t retaddr) int mmu_idx, int dcbz_size, uintptr_t retaddr)
{ {
target_ulong mask = ~(target_ulong)(dcbz_size - 1); target_ulong mask = ~(target_ulong)(dcbz_size - 1);
void *haddr; void *haddr;
@ -296,15 +296,9 @@ static void dcbz_common(CPUPPCState *env, target_ulong addr,
} }
} }
void helper_dcbz(CPUPPCState *env, target_ulong addr) void helper_dcbz(CPUPPCState *env, target_ulong addr, int mmu_idx)
{ {
dcbz_common(env, addr, env->dcache_line_size, dcbz_common(env, addr, mmu_idx, env->dcache_line_size, GETPC());
ppc_env_mmu_index(env, false), GETPC());
}
void helper_dcbzep(CPUPPCState *env, target_ulong addr)
{
dcbz_common(env, addr, env->dcache_line_size, PPC_TLB_EPID_STORE, GETPC());
} }
#ifdef TARGET_PPC64 #ifdef TARGET_PPC64
@ -320,7 +314,7 @@ void helper_dcbzl(CPUPPCState *env, target_ulong addr)
dcbz_size = 32; dcbz_size = 32;
} }
dcbz_common(env, addr, dcbz_size, ppc_env_mmu_index(env, false), GETPC()); dcbz_common(env, addr, ppc_env_mmu_index(env, false), dcbz_size, GETPC());
} }
#endif #endif

4
target/ppc/translate.c
View file

@ -4458,7 +4458,7 @@ static void gen_dcbz(DisasContext *ctx)
} }
#endif #endif
gen_helper_dcbz(tcg_env, tcgv_addr); gen_helper_dcbz(tcg_env, tcgv_addr, tcg_constant_i32(ctx->mem_idx));
} }
/* dcbzep */ /* dcbzep */
@ -4468,7 +4468,7 @@ static void gen_dcbzep(DisasContext *ctx)
gen_set_access_type(ctx, ACCESS_CACHE); gen_set_access_type(ctx, ACCESS_CACHE);
gen_addr_reg_index(ctx, tcgv_addr); gen_addr_reg_index(ctx, tcgv_addr);
gen_helper_dcbzep(tcg_env, tcgv_addr); gen_helper_dcbz(tcg_env, tcgv_addr, tcg_constant_i32(PPC_TLB_EPID_STORE));
} }
/* dst / dstt */ /* dst / dstt */