diff options
| author | Richard Henderson <richard.henderson@linaro.org> | 2022-04-21 16:45:41 -0700 |
|---|---|---|
| committer | Richard Henderson <richard.henderson@linaro.org> | 2022-04-21 16:45:41 -0700 |
| commit | 4ba2565831688a83f9b7465d228cdef19aea412c (patch) | |
| tree | db23252e6c9a57634476145c8beb6c00296643b7 /target/rx/op_helper.c | |
| parent | da5006445a92bb7801f54a93452fac63ca2f634c (diff) | |
| parent | 724eaecec6d22cf3842f896684bdc5b79492f093 (diff) | |
Merge tag 'pull-rx-20220421' of https://gitlab.com/rth7680/qemu into staging
Fix usp/isp swapping upon clrpsw/setpsw.
Fix psw.i/pc upon wait.
Align dtb in ram.
# -----BEGIN PGP SIGNATURE-----
#
# iQFRBAABCgA7FiEEekgeeIaLTbaoWgXAZN846K9+IV8FAmJhlJYdHHJpY2hhcmQu
# aGVuZGVyc29uQGxpbmFyby5vcmcACgkQZN846K9+IV/ipQf+JLeXW1HaD5iNnyUl
# Uh0CLvwwkXvuiDAlaoGCKl2mcVJR/2d/ScTPTGx44VEwmLpV2mgF8/VUWoRtao/C
# Kal5DsaOAC2pUKkYbnorsCpq4ty2QMPYXZXOKULPcfLa3tbsr9bE6JkCQ6gZeAAk
# ITuB+dfdBTpW2lc0eoQ7cDMcQkD1cxyfNVwZ7rP2i9N6tjTW1488kxsBthhQIr0t
# sNrrBIiK7nhdgXNfhWDPP/6f8osZwhLGO8G9tyOTtkPOF6o6Dy27B0Bmlf5T6OY+
# SeTwC2O197gd0YkPWvZgMQbJWnX0kHgHwlFEBaMSxMXAcrlccNZQMyBN4cYoC+ie
# e3vyWA==
# =lj1s
# -----END PGP SIGNATURE-----
# gpg: Signature made Thu 21 Apr 2022 10:29:58 AM PDT
# gpg: using RSA key 7A481E78868B4DB6A85A05C064DF38E8AF7E215F
# gpg: issuer "richard.henderson@linaro.org"
# gpg: Good signature from "Richard Henderson <richard.henderson@linaro.org>" [ultimate]
* tag 'pull-rx-20220421' of https://gitlab.com/rth7680/qemu:
target/rx: update PC correctly in wait instruction
target/rx: set PSW.I when executing wait instruction
hw/rx: rx-gdbsim DTB load address aligned of 16byte.
target/rx: Swap stack pointers on clrpsw/setpsw instruction
target/rx: Move DISAS_UPDATE check for write to PSW
target/rx: Store PSW.U in tb->flags
target/rx: Put tb_flags into DisasContext
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Diffstat (limited to 'target/rx/op_helper.c')
| -rw-r--r-- | target/rx/op_helper.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/target/rx/op_helper.c b/target/rx/op_helper.c index 76a746300e..9ca32dcc82 100644 --- a/target/rx/op_helper.c +++ b/target/rx/op_helper.c @@ -450,6 +450,7 @@ G_NORETURN void helper_wait(CPURXState *env) cs->halted = 1; env->in_sleep = 1; + env->psw_i = 1; raise_exception(env, EXCP_HLT, 0); } |