* [PULL 0/2] tcg patch queue for rc2
@ 2021-07-30 18:28 Richard Henderson
2021-07-30 18:28 ` [PULL 1/2] accel/tcg: Remove double bswap for helper_atomic_sto_*_mmu Richard Henderson
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Richard Henderson @ 2021-07-30 18:28 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell
The following changes since commit dbdc621be937d9efe3e4dff994e54e8eea051f7a:
Merge remote-tracking branch 'remotes/stefanha-gitlab/tags/block-pull-request' into staging (2021-07-30 09:14:56 +0100)
are available in the Git repository at:
https://gitlab.com/rth7680/qemu.git tags/pull-tcg-20210730
for you to fetch changes up to 236f6709ae0da224314c3344c339ed0dc07c15cf:
target/nios2: Mark raise_exception() as noreturn (2021-07-30 08:23:12 -1000)
----------------------------------------------------------------
Fix double bswap in 16-byte atomic store
Mark nios2 raise_exception noreturn
----------------------------------------------------------------
Philippe Mathieu-Daudé (1):
target/nios2: Mark raise_exception() as noreturn
Richard Henderson (1):
accel/tcg: Remove double bswap for helper_atomic_sto_*_mmu
accel/tcg/atomic_template.h | 1 -
target/nios2/helper.h | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PULL 1/2] accel/tcg: Remove double bswap for helper_atomic_sto_*_mmu
2021-07-30 18:28 [PULL 0/2] tcg patch queue for rc2 Richard Henderson
@ 2021-07-30 18:28 ` Richard Henderson
2021-07-30 18:28 ` [PULL 2/2] target/nios2: Mark raise_exception() as noreturn Richard Henderson
2021-08-01 12:03 ` [PULL 0/2] tcg patch queue for rc2 Peter Maydell
2 siblings, 0 replies; 4+ messages in thread
From: Richard Henderson @ 2021-07-30 18:28 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell, Philippe Mathieu-Daudé
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é <f4bug@amsat.org>
Message-Id: <20210729004647.282017-24-richard.henderson@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
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;
--
2.25.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PULL 2/2] target/nios2: Mark raise_exception() as noreturn
2021-07-30 18:28 [PULL 0/2] tcg patch queue for rc2 Richard Henderson
2021-07-30 18:28 ` [PULL 1/2] accel/tcg: Remove double bswap for helper_atomic_sto_*_mmu Richard Henderson
@ 2021-07-30 18:28 ` Richard Henderson
2021-08-01 12:03 ` [PULL 0/2] tcg patch queue for rc2 Peter Maydell
2 siblings, 0 replies; 4+ messages in thread
From: Richard Henderson @ 2021-07-30 18:28 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell, Philippe Mathieu-Daudé
From: Philippe Mathieu-Daudé <f4bug@amsat.org>
Raised exceptions don't return, so mark the helper with noreturn.
Fixes: 032c76bc6f9 ("nios2: Add architecture emulation support")
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20210729101315.2318714-1-f4bug@amsat.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
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 @@
* <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)
--
2.25.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PULL 0/2] tcg patch queue for rc2
2021-07-30 18:28 [PULL 0/2] tcg patch queue for rc2 Richard Henderson
2021-07-30 18:28 ` [PULL 1/2] accel/tcg: Remove double bswap for helper_atomic_sto_*_mmu Richard Henderson
2021-07-30 18:28 ` [PULL 2/2] target/nios2: Mark raise_exception() as noreturn Richard Henderson
@ 2021-08-01 12:03 ` Peter Maydell
2 siblings, 0 replies; 4+ messages in thread
From: Peter Maydell @ 2021-08-01 12:03 UTC (permalink / raw)
To: Richard Henderson; +Cc: QEMU Developers
On Fri, 30 Jul 2021 at 19:28, Richard Henderson
<richard.henderson@linaro.org> wrote:
>
> The following changes since commit dbdc621be937d9efe3e4dff994e54e8eea051f7a:
>
> Merge remote-tracking branch 'remotes/stefanha-gitlab/tags/block-pull-request' into staging (2021-07-30 09:14:56 +0100)
>
> are available in the Git repository at:
>
> https://gitlab.com/rth7680/qemu.git tags/pull-tcg-20210730
>
> for you to fetch changes up to 236f6709ae0da224314c3344c339ed0dc07c15cf:
>
> target/nios2: Mark raise_exception() as noreturn (2021-07-30 08:23:12 -1000)
>
> ----------------------------------------------------------------
> Fix double bswap in 16-byte atomic store
> Mark nios2 raise_exception noreturn
>
Applied, thanks.
Please update the changelog at https://wiki.qemu.org/ChangeLog/6.1
for any user-visible changes.
-- PMM
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-08-01 12:05 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-07-30 18:28 [PULL 0/2] tcg patch queue for rc2 Richard Henderson
2021-07-30 18:28 ` [PULL 1/2] accel/tcg: Remove double bswap for helper_atomic_sto_*_mmu Richard Henderson
2021-07-30 18:28 ` [PULL 2/2] target/nios2: Mark raise_exception() as noreturn Richard Henderson
2021-08-01 12:03 ` [PULL 0/2] tcg patch queue for rc2 Peter Maydell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).