From 7039e1f60486662d238ea1a16992a3efe80d7840 Mon Sep 17 00:00:00 2001 From: Richard Henderson Date: Mon, 26 Jul 2021 08:10:23 -1000 Subject: [PATCH 1/2] accel/tcg: Remove double bswap for helper_atomic_sto_*_mmu MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This crept in as either a cut-and-paste error, or rebase error. Fixes: cfec388518d ("atomic_template: add inline trace/plugin helpers") Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20210729004647.282017-24-richard.henderson@linaro.org> Signed-off-by: Richard Henderson --- accel/tcg/atomic_template.h | 1 - 1 file changed, 1 deletion(-) diff --git a/accel/tcg/atomic_template.h b/accel/tcg/atomic_template.h index d89af4cc1e..8098a1be31 100644 --- a/accel/tcg/atomic_template.h +++ b/accel/tcg/atomic_template.h @@ -251,7 +251,6 @@ void ATOMIC_NAME(st)(CPUArchState *env, target_ulong addr, ABI_TYPE val, PAGE_WRITE, retaddr); uint16_t info = atomic_trace_st_pre(env, addr, oi); - val = BSWAP(val); val = BSWAP(val); atomic16_set(haddr, val); ATOMIC_MMU_CLEANUP; From 236f6709ae0da224314c3344c339ed0dc07c15cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Date: Thu, 29 Jul 2021 12:13:15 +0200 Subject: [PATCH 2/2] target/nios2: Mark raise_exception() as noreturn MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Raised exceptions don't return, so mark the helper with noreturn. Fixes: 032c76bc6f9 ("nios2: Add architecture emulation support") Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Message-Id: <20210729101315.2318714-1-f4bug@amsat.org> Signed-off-by: Richard Henderson --- target/nios2/helper.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/nios2/helper.h b/target/nios2/helper.h index b0cb9146a5..6c8f0b5b35 100644 --- a/target/nios2/helper.h +++ b/target/nios2/helper.h @@ -18,7 +18,7 @@ * */ -DEF_HELPER_2(raise_exception, void, env, i32) +DEF_HELPER_FLAGS_2(raise_exception, TCG_CALL_NO_WG, noreturn, env, i32) #if !defined(CONFIG_USER_ONLY) DEF_HELPER_2(mmu_read_debug, void, env, i32)