From patchwork Mon Sep 5 11:54:08 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rabin Vincent X-Patchwork-Id: 9313563 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id DF430607D3 for ; Mon, 5 Sep 2016 12:02:32 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D02612864D for ; Mon, 5 Sep 2016 12:02:32 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C4D8328974; Mon, 5 Sep 2016 12:02:32 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 396D32864D for ; Mon, 5 Sep 2016 12:02:32 +0000 (UTC) Received: from localhost ([::1]:54050 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bgsbf-0007SF-DO for patchwork-qemu-devel@patchwork.kernel.org; Mon, 05 Sep 2016 08:02:31 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33348) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bgsTr-0000xj-If for qemu-devel@nongnu.org; Mon, 05 Sep 2016 07:54:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bgsTi-0001Vc-8r for qemu-devel@nongnu.org; Mon, 05 Sep 2016 07:54:26 -0400 Received: from bes.se.axis.com ([195.60.68.10]:43715) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bgsTh-0001Ux-T2 for qemu-devel@nongnu.org; Mon, 05 Sep 2016 07:54:18 -0400 Received: from localhost (localhost [127.0.0.1]) by bes.se.axis.com (Postfix) with ESMTP id 99FE72E1E5; Mon, 5 Sep 2016 13:54:16 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at bes.se.axis.com Received: from bes.se.axis.com ([IPv6:::ffff:127.0.0.1]) by localhost (bes.se.axis.com [::ffff:127.0.0.1]) (amavisd-new, port 10024) with LMTP id rL+l-qnC3cnu; Mon, 5 Sep 2016 13:54:14 +0200 (CEST) Received: from boulder.se.axis.com (boulder.se.axis.com [10.0.2.104]) by bes.se.axis.com (Postfix) with ESMTP id 4596A2E2F4; Mon, 5 Sep 2016 13:54:14 +0200 (CEST) Received: from boulder.se.axis.com (localhost [127.0.0.1]) by postfix.imss71 (Postfix) with ESMTP id 30E871BA2; Mon, 5 Sep 2016 13:54:14 +0200 (CEST) Received: from thoth.se.axis.com (thoth.se.axis.com [10.0.2.173]) by boulder.se.axis.com (Postfix) with ESMTP id 1E7A61B9D; Mon, 5 Sep 2016 13:54:14 +0200 (CEST) Received: from lnxartpec.se.axis.com (lnxartpec.se.axis.com [10.88.4.9]) by thoth.se.axis.com (Postfix) with ESMTP id 13D25344; Mon, 5 Sep 2016 13:54:14 +0200 (CEST) Received: by lnxartpec.se.axis.com (Postfix, from userid 10564) id 1023E81327; Mon, 5 Sep 2016 13:54:14 +0200 (CEST) From: Rabin Vincent To: edgar.iglesias@gmail.com Date: Mon, 5 Sep 2016 13:54:08 +0200 Message-Id: <1473076452-19795-5-git-send-email-rabin.vincent@axis.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1473076452-19795-1-git-send-email-rabin.vincent@axis.com> References: <1473076452-19795-1-git-send-email-rabin.vincent@axis.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 195.60.68.10 Subject: [Qemu-devel] [PATCH 5/9] target-cris: sync CC state at load/stores. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Edgar E. Iglesias" , qemu-devel@nongnu.org, Rabin Vincent Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: "Edgar E. Iglesias" Icount may choose to abort and recompile a TB at any load/store. We need to sync the CC state at these insns. Signed-off-by: Edgar E. Iglesias Signed-off-by: Rabin Vincent --- target-cris/translate.c | 9 +++++++++ target-cris/translate_v10.c | 3 +++ 2 files changed, 12 insertions(+) diff --git a/target-cris/translate.c b/target-cris/translate.c index f4a8d7d..c280e24 100644 --- a/target-cris/translate.c +++ b/target-cris/translate.c @@ -1098,6 +1098,9 @@ static void gen_load64(DisasContext *dc, TCGv_i64 dst, TCGv addr) { int mem_index = cpu_mmu_index(&dc->cpu->env, false); + /* Due to icount, we need to update the CC flags on load/stores. */ + cris_evaluate_flags(dc); + /* If we get a fault on a delayslot we must keep the jmp state in the cpu-state to be able to re-execute the jmp. */ if (dc->delayed_branch == 1) { @@ -1112,6 +1115,9 @@ static void gen_load(DisasContext *dc, TCGv dst, TCGv addr, { int mem_index = cpu_mmu_index(&dc->cpu->env, false); + /* Due to icount, we need to update the CC flags on load/stores. */ + cris_evaluate_flags(dc); + /* If we get a fault on a delayslot we must keep the jmp state in the cpu-state to be able to re-execute the jmp. */ if (dc->delayed_branch == 1) { @@ -1127,6 +1133,9 @@ static void gen_store (DisasContext *dc, TCGv addr, TCGv val, { int mem_index = cpu_mmu_index(&dc->cpu->env, false); + /* Due to icount, we need to update the CC flags on load/stores. */ + cris_evaluate_flags(dc); + /* If we get a fault on a delayslot we must keep the jmp state in the cpu-state to be able to re-execute the jmp. */ if (dc->delayed_branch == 1) { diff --git a/target-cris/translate_v10.c b/target-cris/translate_v10.c index 4707a18..a3da425 100644 --- a/target-cris/translate_v10.c +++ b/target-cris/translate_v10.c @@ -99,6 +99,9 @@ static void gen_store_v10(DisasContext *dc, TCGv addr, TCGv val, { int mem_index = cpu_mmu_index(&dc->cpu->env, false); + /* Due to icount, we need to update the CC flags on load/stores. */ + cris_evaluate_flags(dc); + /* If we get a fault on a delayslot we must keep the jmp state in the cpu-state to be able to re-execute the jmp. */ if (dc->delayed_branch == 1) {