From patchwork Tue Jun 28 00:38:51 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 641264 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3rdn6q4GgHz9snm for ; Tue, 28 Jun 2016 10:41:23 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=pkf92Pfp; dkim-atps=neutral Received: from localhost ([::1]:33457 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bHh5d-0005Gm-9I for incoming@patchwork.ozlabs.org; Mon, 27 Jun 2016 20:41:21 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43644) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bHh49-0002ge-Us for qemu-devel@nongnu.org; Mon, 27 Jun 2016 20:39:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bHh47-0004Nt-He for qemu-devel@nongnu.org; Mon, 27 Jun 2016 20:39:48 -0400 Received: from mail-qk0-x241.google.com ([2607:f8b0:400d:c09::241]:33559) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bHh47-0004Np-Cv for qemu-devel@nongnu.org; Mon, 27 Jun 2016 20:39:47 -0400 Received: by mail-qk0-x241.google.com with SMTP id n132so338489qka.0 for ; Mon, 27 Jun 2016 17:39:47 -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:in-reply-to:references; bh=DsNo9BT6HMZitIFyUWzoCcjF7WpYJJQc7Pcucsq1b2A=; b=pkf92PfpSe2XuD/Lus++g/mekBXbHmtf7Xb1iVgkjfHYXOTjdkXbbLYtj1A8rtuBwd YdQcP6KLfOU79Kh1sbzC07ND8ORYIx9zgNOwsm0tToI/Xr4f80bheqVP8JIwZiGheTGv Bp+fpL7ZLHGfwVYr61ZI9fJ8soXa1ElqmyMWM1rP4sBuUkEFVbKytzc88AVRvguJ9ari BafGZ4hGfVo5yOLbha//VWweVbwHiriKRMg+77lhiFuDQ/jjxmwXZV2qG82HG/IqiccX YWgGckC8Xph8RgrjWNOD3wUMS2jNSmh2pZdcoF6FZb984Ld1I1LeGQ9TbF5JwLafBrZ4 HT0A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=DsNo9BT6HMZitIFyUWzoCcjF7WpYJJQc7Pcucsq1b2A=; b=ZK5MKtomxe8DqxogX75oyU8iYnP2/9nnuPy5A+9ihs4PDt8p9iUkdo9+GDLkceZQBT j2Xiy7e/pUajgIDSH4XlnZZEb3gMC0ORMA/+2cVpvQZKeyn+QKDJx8KRxhHNAHzpfBEk Zuh/mCV2HKE+FRDpZ6a5NSEo4DkKAHOmLyjupYgdoPjgDn0yzTDWCN1FNf3AAbu0zqwN e/weCIycnm42k/hYLzkmQ5I02ycYzpb4+w419kwW/vh3FSy63XdUyZP3hPvROxKURm9j wTmfO+9rSf9qAvSKLSaZn3MPrJ5rVRnSlY2ErO5sJEvxODaqFvNh1y0ETYBlGYZC8MlQ m70Q== X-Gm-Message-State: ALyK8tJQpSZxqNEd4ZF9M2yb3fTt3fJFXnt9fSR6Lz7KUcjJjvdffxhg94e46P48SJ6E5Q== X-Received: by 10.55.145.67 with SMTP id t64mr263185qkd.96.1467074387033; Mon, 27 Jun 2016 17:39:47 -0700 (PDT) Received: from bigtime.com (71-37-54-227.tukw.qwest.net. [71.37.54.227]) by smtp.gmail.com with ESMTPSA id 128sm190406qke.10.2016.06.27.17.39.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 27 Jun 2016 17:39:46 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Mon, 27 Jun 2016 17:38:51 -0700 Message-Id: <1467074353-26130-3-git-send-email-rth@twiddle.net> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1467074353-26130-1-git-send-email-rth@twiddle.net> References: <1467074353-26130-1-git-send-email-rth@twiddle.net> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2607:f8b0:400d:c09::241 Subject: [Qemu-devel] [PATCH v4 02/24] target-sparc: Remove softint as a TCG global 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: mark.cave-ayland@ilande.co.uk Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" The global is only ever read for one insn; we can just as well use a load from env instead and generate the same code. This also allows us to indicate the the associated helpers do not touch TCG globals. Reviewed-By: Artyom Tarasenko Signed-off-by: Richard Henderson --- target-sparc/helper.h | 6 +++--- target-sparc/translate.c | 5 ++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/target-sparc/helper.h b/target-sparc/helper.h index 366d4d1..14712cc 100644 --- a/target-sparc/helper.h +++ b/target-sparc/helper.h @@ -21,9 +21,9 @@ DEF_HELPER_4(ldda_asi, void, env, tl, int, int) DEF_HELPER_5(ldf_asi, void, env, tl, int, int, int) DEF_HELPER_FLAGS_5(stf_asi, TCG_CALL_NO_WG, void, env, tl, int, int, int) DEF_HELPER_FLAGS_5(casx_asi, TCG_CALL_NO_WG, tl, env, tl, tl, tl, i32) -DEF_HELPER_2(set_softint, void, env, i64) -DEF_HELPER_2(clear_softint, void, env, i64) -DEF_HELPER_2(write_softint, void, env, i64) +DEF_HELPER_FLAGS_2(set_softint, TCG_CALL_NO_RWG, void, env, i64) +DEF_HELPER_FLAGS_2(clear_softint, TCG_CALL_NO_RWG, void, env, i64) +DEF_HELPER_FLAGS_2(write_softint, TCG_CALL_NO_RWG, void, env, i64) DEF_HELPER_FLAGS_2(tick_set_count, TCG_CALL_NO_RWG, void, ptr, i64) DEF_HELPER_FLAGS_3(tick_get_count, TCG_CALL_NO_WG, i64, env, ptr, int) DEF_HELPER_FLAGS_2(tick_set_limit, TCG_CALL_NO_RWG, void, ptr, i64) diff --git a/target-sparc/translate.c b/target-sparc/translate.c index 0f4faf7..fc220ed 100644 --- a/target-sparc/translate.c +++ b/target-sparc/translate.c @@ -57,7 +57,6 @@ static TCGv_i32 cpu_xcc, cpu_asi, cpu_fprs; static TCGv cpu_gsr; static TCGv cpu_tick_cmpr, cpu_stick_cmpr, cpu_hstick_cmpr; static TCGv cpu_hintp, cpu_htba, cpu_hver, cpu_ssr, cpu_ver; -static TCGv_i32 cpu_softint; #else static TCGv cpu_wim; #endif @@ -2754,7 +2753,8 @@ static void disas_sparc_insn(DisasContext * dc, unsigned int insn) gen_store_gpr(dc, rd, cpu_gsr); break; case 0x16: /* Softint */ - tcg_gen_ext_i32_tl(cpu_dst, cpu_softint); + tcg_gen_ld32s_tl(cpu_dst, cpu_env, + offsetof(CPUSPARCState, softint)); gen_store_gpr(dc, rd, cpu_dst); break; case 0x17: /* Tick compare */ @@ -5364,7 +5364,6 @@ void gen_intermediate_code_init(CPUSPARCState *env) { &cpu_xcc, offsetof(CPUSPARCState, xcc), "xcc" }, { &cpu_asi, offsetof(CPUSPARCState, asi), "asi" }, { &cpu_fprs, offsetof(CPUSPARCState, fprs), "fprs" }, - { &cpu_softint, offsetof(CPUSPARCState, softint), "softint" }, #else { &cpu_wim, offsetof(CPUSPARCState, wim), "wim" }, #endif