[Qemu-devel] [PATCH 010/147] target-s390: Fix BCR

[Richard Henderson]

There were are two exit paths for which we forgot to
copy s->cc_op back to the tcg register.

Signed-off-by: Richard Henderson <address@hidden>
---
 target-s390x/translate.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/target-s390x/translate.c b/target-s390x/translate.c
index f0fadf2..3caf386 100644
--- a/target-s390x/translate.c
+++ b/target-s390x/translate.c
@@ -1212,6 +1212,7 @@ static void gen_bcr(DisasContext *s, uint32_t mask, 
TCGv_i64 target,
 
     if (mask == 0xf) {
         /* unconditional */
+        gen_update_cc_op(s);
         tcg_gen_mov_i64(psw_addr, target);
         tcg_gen_exit_tb(0);
     } else if (mask == 0) {
@@ -1223,6 +1224,7 @@ static void gen_bcr(DisasContext *s, uint32_t mask, 
TCGv_i64 target,
         tcg_gen_mov_i64(new_addr, target);
         skip = gen_new_label();
         gen_jcc(s, mask, skip);
+        gen_update_cc_op(s);
         tcg_gen_mov_i64(psw_addr, new_addr);
         tcg_temp_free_i64(new_addr);
         tcg_gen_exit_tb(0);
-- 
1.7.11.4