From patchwork Thu Oct 25 14:45:41 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Emilio Cota X-Patchwork-Id: 10656089 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id F265C13A9 for ; Thu, 25 Oct 2018 15:42:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DECE82BDAC for ; Thu, 25 Oct 2018 15:42:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D2B2E2BDD8; Thu, 25 Oct 2018 15:42:37 +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=-7.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 7B49F2BDAC for ; Thu, 25 Oct 2018 15:42:37 +0000 (UTC) Received: from localhost ([::1]:55252 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gFhmO-0005fv-Hw for patchwork-qemu-devel@patchwork.kernel.org; Thu, 25 Oct 2018 11:42:36 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59609) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gFh5S-00034O-PG for qemu-devel@nongnu.org; Thu, 25 Oct 2018 10:58:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gFgur-0007qG-Hy for qemu-devel@nongnu.org; Thu, 25 Oct 2018 10:47:22 -0400 Received: from out3-smtp.messagingengine.com ([66.111.4.27]:36251) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gFgun-0007gI-63; Thu, 25 Oct 2018 10:47:13 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id 33D3C21F6A; Thu, 25 Oct 2018 10:46:48 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Thu, 25 Oct 2018 10:46:48 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=braap.org; h= from:to:cc:subject:date:message-id:in-reply-to:references; s= mesmtp; bh=oV35kcJmG1x2GUk2Ps5s4eeNyJPj4jV9lgMsY0MJjYE=; b=vg4Ya 2X4UmmtNBn9KcUULo74IA3PCn2O1P88iGCUrv0yywbac9NWlV//f5Ms1P7rOfySo HP9u5zlPyufg8h7Dii+UCCR2BXeJnEfO2WAzSSqobdiibuKt3Lh4NkfIaMccQzJ5 JjaeCxltGeOHSP0Y4wRab3NBu9NsT4pwMwD/30= 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-proxy:x-me-proxy:x-me-sender :x-me-sender:x-sasl-enc; s=fm1; bh=oV35kcJmG1x2GUk2Ps5s4eeNyJPj4 jV9lgMsY0MJjYE=; b=gv3OEm2cJ84TxC/3LlgJHjDUAZC+UnUzm+7kN6A6ibv64 ncaP4FXjgQKGmFy6llY64jt7WEYDLJ3l7dUxYVoEoyhPPkUgLItPLef9Xe2E7hXG g9Rdvjzq71wiOHzIdrV3Bg0tocTahZKPOfa2v4wlNxJeuBT2gHIAcr/B1RMsRA1U aJEO5hwN6ruo0MM9PnyG+PPKEBA/4rYuyUNWVlOHVtoHj3BDvZbULpE/c4lpcN5o BTA5Vo1eNfbIQyI/SHcavjg/OA2cp47gnddPw2ualh6mgYkcsD4Gu6HEuaHkfoW6 ecQrJF9iLrakN9E4i04XB/ePGVaKbZ/LHgkSMhukg== X-ME-Sender: X-ME-Proxy: Received: from localhost (flamenco.cs.columbia.edu [128.59.20.216]) by mail.messagingengine.com (Postfix) with ESMTPA id 130E3E455F; Thu, 25 Oct 2018 10:46:47 -0400 (EDT) From: "Emilio G. Cota" To: qemu-devel@nongnu.org Date: Thu, 25 Oct 2018 10:45:41 -0400 Message-Id: <20181025144644.15464-8-cota@braap.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181025144644.15464-1-cota@braap.org> References: <20181025144644.15464-1-cota@braap.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 66.111.4.27 Subject: [Qemu-devel] [RFC v4 08/71] ppc: convert to helper_cpu_halted_set 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: qemu-ppc@nongnu.org, Paolo Bonzini , Richard Henderson , Alexander Graf , David Gibson Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Cc: David Gibson Cc: Alexander Graf Cc: qemu-ppc@nongnu.org Signed-off-by: Emilio G. Cota Reviewed-by: Richard Henderson Reviewed-by: Alex Bennée --- target/ppc/translate.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/target/ppc/translate.c b/target/ppc/translate.c index 4e59dd5f42..2d31b5f7a1 100644 --- a/target/ppc/translate.c +++ b/target/ppc/translate.c @@ -1609,8 +1609,7 @@ GEN_LOGICAL2(nor, tcg_gen_nor_tl, 0x03, PPC_INTEGER); static void gen_pause(DisasContext *ctx) { TCGv_i32 t0 = tcg_const_i32(0); - tcg_gen_st_i32(t0, cpu_env, - -offsetof(PowerPCCPU, env) + offsetof(CPUState, halted)); + gen_helper_cpu_halted_set(cpu_env, t0); tcg_temp_free_i32(t0); /* Stop translation, this gives other CPUs a chance to run */ @@ -3543,8 +3542,7 @@ static void gen_sync(DisasContext *ctx) static void gen_wait(DisasContext *ctx) { TCGv_i32 t0 = tcg_const_i32(1); - tcg_gen_st_i32(t0, cpu_env, - -offsetof(PowerPCCPU, env) + offsetof(CPUState, halted)); + gen_helper_cpu_halted_set(cpu_env, t0); tcg_temp_free_i32(t0); /* Stop translation, as the CPU is supposed to sleep from now */ gen_exception_nip(ctx, EXCP_HLT, ctx->base.pc_next);