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

target/s390x: Use user_or_likely in do_access_memset

Browse Source 
Eliminate the ifdef by using a predicate that is
always true with CONFIG_USER_ONLY.

Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
Richard Henderson 2024-07-09 18:05:59 -07:00
parent f6bcc5b8f9
commit 814e46594d
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
target/s390x/tcg/mem_helper.c
View File

@ -225,10 +225,7 @@ static void do_access_memset(CPUS390XState *env, vaddr vaddr, char *haddr,
uint8_t byte, uint16_t size, int mmu_idx, uint8_t byte, uint16_t size, int mmu_idx,
uintptr_t ra) uintptr_t ra)
{ {
#ifdef CONFIG_USER_ONLY if (user_or_likely(haddr)) {
memset(haddr, byte, size);
#else
if (likely(haddr)) {
memset(haddr, byte, size); memset(haddr, byte, size);
} else { } else {
MemOpIdx oi = make_memop_idx(MO_UB, mmu_idx); MemOpIdx oi = make_memop_idx(MO_UB, mmu_idx);
@ -236,7 +233,6 @@ static void do_access_memset(CPUS390XState *env, vaddr vaddr, char *haddr,
cpu_stb_mmu(env, vaddr + i, byte, oi, ra); cpu_stb_mmu(env, vaddr + i, byte, oi, ra);
} }
} }
#endif
} }
static void access_memset(CPUS390XState *env, S390Access *desta, static void access_memset(CPUS390XState *env, S390Access *desta,