From nobody Wed May 8 22:12:23 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1497639545711820.9141097773272; Fri, 16 Jun 2017 11:59:05 -0700 (PDT) Received: from localhost ([::1]:60377 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dLwSW-0007oM-1d for importer@patchew.org; Fri, 16 Jun 2017 14:59:04 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45123) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dLwQI-0005MC-4J for qemu-devel@nongnu.org; Fri, 16 Jun 2017 14:56:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dLwQH-00078t-BQ for qemu-devel@nongnu.org; Fri, 16 Jun 2017 14:56:46 -0400 Received: from out3-smtp.messagingengine.com ([66.111.4.27]:35599) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dLwQC-00076Q-Tt; Fri, 16 Jun 2017 14:56:40 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id 2EC9020966; Fri, 16 Jun 2017 14:56:40 -0400 (EDT) Received: from frontend2 ([10.202.2.161]) by compute4.internal (MEProxy); Fri, 16 Jun 2017 14:56:40 -0400 Received: from localhost (flamenco.cs.columbia.edu [128.59.20.216]) by mail.messagingengine.com (Postfix) with ESMTPA id DA2422475C; Fri, 16 Jun 2017 14:56:39 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=braap.org; h=cc :date:from:in-reply-to:message-id:references:subject:to :x-me-sender:x-me-sender:x-sasl-enc:x-sasl-enc; s=mesmtp; bh=Keh G2H6g2JJPim4VJsGrUuL15iT7nxEP+mulIPNgcMc=; b=EQVXqGgA/14q5wUfhYu 6pjSJSU8H1yypzpBdItmPhpptLmrrmQtDEGQDRedwNq/Z3jAagbpnmFGDhdU1SO2 1OqT0vgsdUm6F7dyKsZX42GnWSjPtTSG+2jD06/I0UTpK42Rr3ZNudfMHliyjEmw 399AGtbVg2tyvTOmroo70RQk= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:date:from:in-reply-to:message-id :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc :x-sasl-enc; s=fm1; bh=KehG2H6g2JJPim4VJsGrUuL15iT7nxEP+mulIPNgc Mc=; b=gfK1Kg8hT1YX9+tRHTYys7Su9COpt+VkD7lWxfqCwOX8TgEqamhGD9kK7 e4ByjyRWQAX2ec/FBn/wBhPRhCCx832QhQ/mGnlz67HSABvdxQKND7Qe/p52NT3S 12nXZQEB2yZBfjGhvTSJCGSFxdTdqTQIvHcChLmDaSycupI+/b2EKVluRJr2WEb4 ZKH09KzMROQuOAei+AL9J+DoCtkvE5jOCYbpqEPgBfBaCR1Ky5btxjvdDp4Nec3M 8KiKT5ELzjPkKBgAfx5GDWjTCEBoSU2KgglRGrkw6tTHL8uvZdH5NyToo7jp/QBH ylYaFXdDhErq+klghrY1DThR04EEw== X-ME-Sender: X-Sasl-enc: mCrvMqdj2aV0CgbaWAe4Ju7Iao6AaqZgeXpLLiPVk416 1497639399 From: "Emilio G. Cota" To: qemu-devel@nongnu.org Date: Fri, 16 Jun 2017 14:56:36 -0400 Message-Id: <1497639397-19453-2-git-send-email-cota@braap.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1497639397-19453-1-git-send-email-cota@braap.org> References: <1497639397-19453-1-git-send-email-cota@braap.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.111.4.27 Subject: [Qemu-devel] [PATCH v2 1/2] gen-icount: add missing inline to gen_tb_end 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: Peter Maydell , Anthony Green , Mark Cave-Ayland , Max Filippov , "Edgar E . Iglesias" , Guan Xuetao , =?UTF-8?q?Llu=C3=ADs=20Vilanova?= , Marek Vasut , Alexander Graf , Richard Henderson , Artyom Tarasenko , Eduardo Habkost , qemu-arm@nongnu.org, Yongbok Kim , Stafford Horne , David Gibson , Bastian Koppelmann , Chris Wulff , Laurent Vivier , Michael Walle , qemu-ppc@nongnu.org, Paolo Bonzini , Aurelien Jarno Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Reviewed-by: Richard Henderson Signed-off-by: Emilio G. Cota --- include/exec/gen-icount.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/exec/gen-icount.h b/include/exec/gen-icount.h index 62d462e..547c979 100644 --- a/include/exec/gen-icount.h +++ b/include/exec/gen-icount.h @@ -44,7 +44,7 @@ static inline void gen_tb_start(TranslationBlock *tb) tcg_temp_free_i32(count); } =20 -static void gen_tb_end(TranslationBlock *tb, int num_insns) +static inline void gen_tb_end(TranslationBlock *tb, int num_insns) { if (tb->cflags & CF_USE_ICOUNT) { /* Update the num_insn immediate parameter now that we know --=20 2.7.4 From nobody Wed May 8 22:12:23 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1497639668228634.0762167248462; Fri, 16 Jun 2017 12:01:08 -0700 (PDT) Received: from localhost ([::1]:60393 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dLwUU-0000t0-2V for importer@patchew.org; Fri, 16 Jun 2017 15:01:06 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45133) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dLwQI-0005Mm-IV for qemu-devel@nongnu.org; Fri, 16 Jun 2017 14:56:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dLwQH-000790-F6 for qemu-devel@nongnu.org; Fri, 16 Jun 2017 14:56:46 -0400 Received: from out3-smtp.messagingengine.com ([66.111.4.27]:55611) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dLwQD-00076U-1F; Fri, 16 Jun 2017 14:56:41 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id 6571B20940; Fri, 16 Jun 2017 14:56:40 -0400 (EDT) Received: from frontend1 ([10.202.2.160]) by compute4.internal (MEProxy); Fri, 16 Jun 2017 14:56:40 -0400 Received: from localhost (flamenco.cs.columbia.edu [128.59.20.216]) by mail.messagingengine.com (Postfix) with ESMTPA id 1A81F7E7B1; Fri, 16 Jun 2017 14:56:40 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=braap.org; h=cc :date:from:in-reply-to:message-id:references:subject:to :x-me-sender:x-me-sender:x-sasl-enc:x-sasl-enc; s=mesmtp; bh=8i6 DWtzZCJEZRiO9XOzRI/VMJtfoHMMooljxjk+2CqI=; b=MuLa2xAQcNPEKp/bbiS qX37ASsh90Qs2DF+zKCdU+qd6qVkJx/XP9jXXuLYHroKSAhNYaLboYDimXLWdrc1 p36v/MHya/FqBy05r0nx52YnTRdB9HwAprYAMYXkTJA9LAdnSXwB6cKwO9fFrJ23 mXAfs0mWMo4d/05QXCrisa9s= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:date:from:in-reply-to:message-id :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc :x-sasl-enc; s=fm1; bh=8i6DWtzZCJEZRiO9XOzRI/VMJtfoHMMooljxjk+2C qI=; b=MGBbHUmWX2lWunkU3nktybtnkQSoDgGN7SBS4Pc0RA3bV/mzavmjJJCZ6 TITOXMhGAywQgla8ZQPaGRJzg7ZwYfDuGXI+g6YAbKESt8w8ZY+35hi1hfPQtAAR eC+UMTz7MaxJFtiSFfyq2wIhpZy05Ge/hucgNqXiU8XjbYUKlSsCBFb72l+rN557 2yw7TLCdDLFJgyCG0RTz1OJo2rC9ecdI5sxwjbs4UO7owc2rQl6gE5+DLp0kj89a EPh7J7cGmLSwcXNcE/wNYaWUJfwXwRIJTts7XODQeMdUq6DktvF2tX/nknP79eqA wdMQAxWAnig49igxW34b6JxAij+LQ== X-ME-Sender: X-Sasl-enc: BuoGGiL0taezhUpne0UPU6z37XxKWtzd2Z5o+TYis7Qq 1497639400 From: "Emilio G. Cota" To: qemu-devel@nongnu.org Date: Fri, 16 Jun 2017 14:56:37 -0400 Message-Id: <1497639397-19453-3-git-send-email-cota@braap.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1497639397-19453-1-git-send-email-cota@braap.org> References: <1497639397-19453-1-git-send-email-cota@braap.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.111.4.27 Subject: [Qemu-devel] [PATCH v2 2/2] gen-icount: use tcg_ctx.tcg_env instead of cpu_env 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: Peter Maydell , Anthony Green , Mark Cave-Ayland , Max Filippov , "Edgar E . Iglesias" , Guan Xuetao , =?UTF-8?q?Llu=C3=ADs=20Vilanova?= , Marek Vasut , Alexander Graf , Richard Henderson , Artyom Tarasenko , Eduardo Habkost , qemu-arm@nongnu.org, Yongbok Kim , Stafford Horne , David Gibson , Bastian Koppelmann , Chris Wulff , Laurent Vivier , Michael Walle , qemu-ppc@nongnu.org, Paolo Bonzini , Aurelien Jarno Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" We are relying on cpu_env being defined as a global, yet most targets (i.e. all but arm/a64) have it defined as a local variable. Luckily all of them use the same "cpu_env" name, but really compilation shouldn't break if the name of that local variable changed. Fix it by using tcg_ctx.tcg_env, which all targets set in their translate_init function. This change also helps paving the way for the upcoming "translation loop common to all targets" work. Signed-off-by: Emilio G. Cota --- include/exec/gen-icount.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/include/exec/gen-icount.h b/include/exec/gen-icount.h index 547c979..9b3cb14 100644 --- a/include/exec/gen-icount.h +++ b/include/exec/gen-icount.h @@ -19,7 +19,7 @@ static inline void gen_tb_start(TranslationBlock *tb) count =3D tcg_temp_new_i32(); } =20 - tcg_gen_ld_i32(count, cpu_env, + tcg_gen_ld_i32(count, tcg_ctx.tcg_env, -ENV_OFFSET + offsetof(CPUState, icount_decr.u32)); =20 if (tb->cflags & CF_USE_ICOUNT) { @@ -37,7 +37,7 @@ static inline void gen_tb_start(TranslationBlock *tb) tcg_gen_brcondi_i32(TCG_COND_LT, count, 0, exitreq_label); =20 if (tb->cflags & CF_USE_ICOUNT) { - tcg_gen_st16_i32(count, cpu_env, + tcg_gen_st16_i32(count, tcg_ctx.tcg_env, -ENV_OFFSET + offsetof(CPUState, icount_decr.u16.= low)); } =20 @@ -62,14 +62,16 @@ static inline void gen_tb_end(TranslationBlock *tb, int= num_insns) static inline void gen_io_start(void) { TCGv_i32 tmp =3D tcg_const_i32(1); - tcg_gen_st_i32(tmp, cpu_env, -ENV_OFFSET + offsetof(CPUState, can_do_i= o)); + tcg_gen_st_i32(tmp, tcg_ctx.tcg_env, + -ENV_OFFSET + offsetof(CPUState, can_do_io)); tcg_temp_free_i32(tmp); } =20 static inline void gen_io_end(void) { TCGv_i32 tmp =3D tcg_const_i32(0); - tcg_gen_st_i32(tmp, cpu_env, -ENV_OFFSET + offsetof(CPUState, can_do_i= o)); + tcg_gen_st_i32(tmp, tcg_ctx.tcg_env, + -ENV_OFFSET + offsetof(CPUState, can_do_io)); tcg_temp_free_i32(tmp); } =20 --=20 2.7.4