From patchwork Thu Oct 25 14:45:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Emilio Cota X-Patchwork-Id: 10656083 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 BF3211751 for ; Thu, 25 Oct 2018 15:40:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AD0802BDB0 for ; Thu, 25 Oct 2018 15:40:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AB0412BDCB; Thu, 25 Oct 2018 15:40:08 +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 5168D2BDB7 for ; Thu, 25 Oct 2018 15:40:08 +0000 (UTC) Received: from localhost ([::1]:55237 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gFhjz-0003nZ-Fc for patchwork-qemu-devel@patchwork.kernel.org; Thu, 25 Oct 2018 11:40:07 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60776) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gFh5S-0004Uf-Co for qemu-devel@nongnu.org; Thu, 25 Oct 2018 10:58:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gFguv-0007vm-Qc for qemu-devel@nongnu.org; Thu, 25 Oct 2018 10:47:27 -0400 Received: from out3-smtp.messagingengine.com ([66.111.4.27]:57657) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gFguv-0007fQ-F0 for qemu-devel@nongnu.org; Thu, 25 Oct 2018 10:47:21 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id C69B621F46; Thu, 25 Oct 2018 10:46:47 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Thu, 25 Oct 2018 10:46:47 -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=Q1mq1C/yQovvpVtkW30jxjDezXuZqI677x0kEaQ6X/Y=; b=i18yQ AdasahqAw8QLW0CZmat9UlqaNDl7ztiB5/JL4yAzgGicVv+XRcnEt6oJ5L1VYz7u Kh/mOsoy/lyOvWv17wDz0j5JjK8ll7UeK9qEqJdRR6OmeCBuu6xWXFtipVeIvuAP 97QZovkAil9R81nV7m9YbjPeBY8AFYx9FpPbFQ= 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=Q1mq1C/yQovvpVtkW30jxjDezXuZq I677x0kEaQ6X/Y=; b=EeQa547cks/7yCgxp89QImOEDkOfJJtf4uTyseUo19m2u eak7Wmfv7Y+4zijr/YCIObl1Ip0zQffUsFgIjnCZoWvh3XWhF3k9ey3sgbNu60Y7 pDEvRerGK4OUKRGBd7Z6JQXXrSq1wfA3FdQvegISqJ3iFr5AzE7Kkzjsv8KxSAwZ cqwos/Gx26lcrtjxkWc8D5pNyPWf6rYLhSwHAqaGlZVKNUOpUf4qk/9ofYQequqO ceOY3zXRFIZexqBcI21C4ExbKRxFNd5eDsEg0Y6fulvwtTEQ0NIaYL8jkdqVlxGZ 1XgTaOwBgYB/iGU8TPbJp/grVPoYhO3uw71Bv5vTQ== 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 52843E49F7; 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:42 -0400 Message-Id: <20181025144644.15464-9-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 09/71] cris: 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: Paolo Bonzini , Richard Henderson , "Edgar E. Iglesias" Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP And fix the temp leak along the way. Cc: "Edgar E. Iglesias" Signed-off-by: Emilio G. Cota Reviewed-by: Richard Henderson Reviewed-by: Alex Bennée --- target/cris/translate.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/target/cris/translate.c b/target/cris/translate.c index 4ae1c04daf..0ccb65fbed 100644 --- a/target/cris/translate.c +++ b/target/cris/translate.c @@ -2833,8 +2833,9 @@ static int dec_rfe_etc(CPUCRISState *env, DisasContext *dc) cris_cc_mask(dc, 0); if (dc->op2 == 15) { - tcg_gen_st_i32(tcg_const_i32(1), cpu_env, - -offsetof(CRISCPU, env) + offsetof(CPUState, halted)); + TCGv_i32 tmp = tcg_const_i32(1); + gen_helper_cpu_halted_set(cpu_env, tmp); + tcg_temp_free_i32(tmp); tcg_gen_movi_tl(env_pc, dc->pc + 2); t_gen_raise_exception(EXCP_HLT); return 2;