diff options
| author | Richard Henderson <richard.henderson@linaro.org> | 2024-07-09 18:05:59 -0700 |
|---|---|---|
| committer | Richard Henderson <richard.henderson@linaro.org> | 2024-07-23 10:57:19 +1000 |
| commit | 814e46594da891955a6e111e2c253137fcd43f07 (patch) | |
| tree | 57dc0b325d6da7f0f70414f8bf72adfa3510a3c8 | |
| parent | f6bcc5b8f91e3c1b855c3078d9133f3918080276 (diff) | |
| download | focaccia-qemu-814e46594da891955a6e111e2c253137fcd43f07.tar.gz focaccia-qemu-814e46594da891955a6e111e2c253137fcd43f07.zip | |
target/s390x: Use user_or_likely in do_access_memset
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>
| -rw-r--r-- | target/s390x/tcg/mem_helper.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/target/s390x/tcg/mem_helper.c b/target/s390x/tcg/mem_helper.c index 6cdbc34178..5311a15a09 100644 --- a/target/s390x/tcg/mem_helper.c +++ b/target/s390x/tcg/mem_helper.c @@ -225,10 +225,7 @@ static void do_access_memset(CPUS390XState *env, vaddr vaddr, char *haddr, uint8_t byte, uint16_t size, int mmu_idx, uintptr_t ra) { -#ifdef CONFIG_USER_ONLY - memset(haddr, byte, size); -#else - if (likely(haddr)) { + if (user_or_likely(haddr)) { memset(haddr, byte, size); } else { 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); } } -#endif } static void access_memset(CPUS390XState *env, S390Access *desta, |