From patchwork Thu Sep 27 22:39:51 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 187544 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id C271A2C00B6 for ; Fri, 28 Sep 2012 09:27:21 +1000 (EST) Received: from localhost ([::1]:38871 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1THMlP-0004OJ-Gz for incoming@patchwork.ozlabs.org; Thu, 27 Sep 2012 18:40:59 -0400 Received: from eggs.gnu.org ([208.118.235.92]:35947) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1THMkw-0003RQ-Ud for qemu-devel@nongnu.org; Thu, 27 Sep 2012 18:40:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1THMkv-000376-6S for qemu-devel@nongnu.org; Thu, 27 Sep 2012 18:40:30 -0400 Received: from mail-pb0-f45.google.com ([209.85.160.45]:50380) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1THMku-000340-Uf for qemu-devel@nongnu.org; Thu, 27 Sep 2012 18:40:29 -0400 Received: by mail-pb0-f45.google.com with SMTP id rp2so4262225pbb.4 for ; Thu, 27 Sep 2012 15:40:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=mocrT0rB0a63e0slCezwrKLMGXtmdNzEYwkT24mEf8k=; b=FyO+1hBbs0lzVNmTSpXezX1AmYptaybQRRWYgLd0LXuodkUG6eaFSxB9T6W9D+feMW TwA51QnsQg0XIC7QA7V8zCs0xP2L5e3QjtA7gu4CTaT/NvaHOuIrsZyBR8PAa2iJyqBJ tYipmKNxBQ+s/ZTbnhuupsHbBjnd0KfzXDNX4ZN53daSdSEnCWuTAC0JT8bRbVRbzIcO Di7UVfLPqXnusOS71TfsJ5qSAJNP7vn83XQX/q/GfzCw9mmhagIcHb9tdXbZfe+E8/m3 2TDrjIfwtCG4Yum6maS2w2hC58Xl02X8P4M3jD9mtIV9Tio37k+gcDVn7uBivmemh+Bc ltcQ== Received: by 10.68.226.38 with SMTP id rp6mr15491814pbc.116.1348785628577; Thu, 27 Sep 2012 15:40:28 -0700 (PDT) Received: from anchor.twiddle.home.com ([173.160.232.49]) by mx.google.com with ESMTPS id sj5sm4480267pbc.30.2012.09.27.15.40.27 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 27 Sep 2012 15:40:28 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Thu, 27 Sep 2012 15:39:51 -0700 Message-Id: <1348785610-23418-11-git-send-email-rth@twiddle.net> X-Mailer: git-send-email 1.7.11.4 In-Reply-To: <1348785610-23418-1-git-send-email-rth@twiddle.net> References: <1348785610-23418-1-git-send-email-rth@twiddle.net> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.160.45 Cc: Alexander Graf Subject: [Qemu-devel] [PATCH 010/147] target-s390: Fix BCR X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 --- 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);