diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2021-07-31 21:29:57 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2021-07-31 21:29:57 +0100 |
| commit | 0c633cf0c221922a0a9f9d0b8866cbb111f5e192 (patch) | |
| tree | bce9af4a3fbd81f2418ebd704b09be60cb079dc1 | |
| parent | dbdc621be937d9efe3e4dff994e54e8eea051f7a (diff) | |
| parent | 236f6709ae0da224314c3344c339ed0dc07c15cf (diff) | |
Merge remote-tracking branch 'remotes/rth-gitlab/tags/pull-tcg-20210730' into staging
Fix double bswap in 16-byte atomic store
Mark nios2 raise_exception noreturn
# gpg: Signature made Fri 30 Jul 2021 19:24:44 BST
# gpg: using RSA key 7A481E78868B4DB6A85A05C064DF38E8AF7E215F
# gpg: issuer "richard.henderson@linaro.org"
# gpg: Good signature from "Richard Henderson <richard.henderson@linaro.org>" [full]
# Primary key fingerprint: 7A48 1E78 868B 4DB6 A85A 05C0 64DF 38E8 AF7E 215F
* remotes/rth-gitlab/tags/pull-tcg-20210730:
target/nios2: Mark raise_exception() as noreturn
accel/tcg: Remove double bswap for helper_atomic_sto_*_mmu
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | accel/tcg/atomic_template.h | 1 | ||||
| -rw-r--r-- | target/nios2/helper.h | 2 |
2 files changed, 1 insertions, 2 deletions
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 @@ -252,7 +252,6 @@ void ATOMIC_NAME(st)(CPUArchState *env, target_ulong addr, ABI_TYPE val, uint16_t info = atomic_trace_st_pre(env, addr, oi); val = BSWAP(val); - val = BSWAP(val); atomic16_set(haddr, val); ATOMIC_MMU_CLEANUP; atomic_trace_st_post(env, addr, info); 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 @@ * <http://www.gnu.org/licenses/lgpl-2.1.html> */ -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) |