OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

Fix double bswap in 16-byte atomic store 

Mark nios2 raise_exception noreturn
 -----BEGIN PGP SIGNATURE-----
 
 iQFRBAABCgA7FiEEekgeeIaLTbaoWgXAZN846K9+IV8FAmEEQ+wdHHJpY2hhcmQu
 aGVuZGVyc29uQGxpbmFyby5vcmcACgkQZN846K9+IV+rcAf/UQDtjvdLvyeytQTI
 1fhb6SFM4oSAyHQ2keSQR5tpCRY1kzBhiIxzDQ1hwffMxsZ6cTxDlXPdxlfAl/zs
 qeKQ0UI9QlQWzC9q5FI/qCaGtcEjkiXdWTab9w82Es3PSNKU38e438ZirPzejHRr
 yqj4JfVFTW4YEXEWFqL8cwOOUYrHCIcdzsJ4Qu0M1e1IYjUGma9yZaG65vYbheEZ
 CxTaQibeYia7nrTOaJIc5U2ZH8jLgOgbI4bn5uKIgoqODVLyhkTN2Wxmqz9Z3bx9
 6uk+fnaHiHc3r0ri4XNvuSfuMbFsprKYokUHXa91UvYt2cVtHuD8VCnlhmx95tbj
 2nokQg==
 =rbz2
 -----END PGP SIGNATURE-----

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>
This commit is contained in:
Peter Maydell 2021-07-31 21:29:57 +01:00
parent dbdc621be9 236f6709ae
commit 0c633cf0c2
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
accel/tcg/atomic_template.h
View File

@ -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
target/nios2/helper.h
View File

@ -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)