diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-04-26 20:50:49 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-04-26 20:50:49 +0100 |
| commit | 81b2d5ceb0cfb4cdc2163492e3169ed714b0cda9 (patch) | |
| tree | da5692f687e2caa9ccbebe2c176a635243f47f5e | |
| parent | 51b9d495f2a99c65c9e524c8f6fe283ebfabae1d (diff) | |
| parent | 79b1af906245558c30e0a5faf26cb52b63f83cce (diff) | |
Merge remote-tracking branch 'remotes/rth/tags/pull-tcg-20170426' into staging
Fix for exit_atomic tcg opcode paths
# gpg: Signature made Wed 26 Apr 2017 18:27:11 BST
# gpg: using RSA key 0xAD1270CC4DD0279B
# gpg: Good signature from "Richard Henderson <rth7680@gmail.com>"
# gpg: aka "Richard Henderson <rth@redhat.com>"
# gpg: aka "Richard Henderson <rth@twiddle.net>"
# Primary key fingerprint: 9CB1 8DDA F8E8 49AD 2AFC 16A4 AD12 70CC 4DD0 279B
* remotes/rth/tags/pull-tcg-20170426:
tcg: Initialize return value after exit_atomic
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | tcg/tcg-op.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/tcg/tcg-op.c b/tcg/tcg-op.c index 95a39b7d8c..6b1f41500c 100644 --- a/tcg/tcg-op.c +++ b/tcg/tcg-op.c @@ -2861,6 +2861,9 @@ void tcg_gen_atomic_cmpxchg_i64(TCGv_i64 retv, TCGv addr, TCGv_i64 cmpv, #endif #else gen_helper_exit_atomic(tcg_ctx.tcg_env); + /* Produce a result, so that we have a well-formed opcode stream + with respect to uses of the result in the (dead) code following. */ + tcg_gen_movi_i64(retv, 0); #endif /* CONFIG_ATOMIC64 */ } else { TCGv_i32 c32 = tcg_temp_new_i32(); @@ -2966,6 +2969,9 @@ static void do_atomic_op_i64(TCGv_i64 ret, TCGv addr, TCGv_i64 val, #endif #else gen_helper_exit_atomic(tcg_ctx.tcg_env); + /* Produce a result, so that we have a well-formed opcode stream + with respect to uses of the result in the (dead) code following. */ + tcg_gen_movi_i64(ret, 0); #endif /* CONFIG_ATOMIC64 */ } else { TCGv_i32 v32 = tcg_temp_new_i32(); |