From patchwork Mon Jan 9 20:08:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 640679 Delivered-To: patch@linaro.org Received: by 2002:a17:522:f3c4:b0:4b4:3859:abed with SMTP id in4csp2336716pvb; Mon, 9 Jan 2023 12:14:53 -0800 (PST) X-Google-Smtp-Source: AMrXdXss5idxwWuBCzQ2EctzXfVTisAof8L492c7pTr6BnRT2ZY80NcEXovVPmQqzKLXtuEDiAjH X-Received: by 2002:ac8:470e:0:b0:3a9:756b:d9d1 with SMTP id f14-20020ac8470e000000b003a9756bd9d1mr79148564qtp.19.1673295293714; Mon, 09 Jan 2023 12:14:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673295293; cv=none; d=google.com; s=arc-20160816; b=kwPJxWjL0bjE17SpCDdDs+6xvzrtERL3p0vRZokz5icpnnPIj7K0Pk0GJnvUGNse6/ M0ExOCgkNsNH/XnU0Qnbc+anoP5IKkLFn9GmlQa83LLT4Pq0OrtTRIkeUqB772GzEIjS l+M7mIPC+FKX2bdAt5ZnSZ/iiTVzM9eR3ji8VVxO5WT/+tNtWh8hmOPdcnsIAdWkBGDi DL+J/nGXKpU8lO3CwkyZE+U+VcR7o4l6SqkE+vV3NzyuR71mmuXW4aqiX878UzBvPpw+ AAD0we20HD9mgOvtCHKPdUiseNZn9mTKq1zspYCcpn0fsm+wHcCZFfAM1+lFR2uUB6O3 nKCg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=fuFmEK8Iwf94SJtJ1ovewqobkADHJCdvU7OnItfY0Yw=; b=DgFgloNxJMQMfF3odW5Umj7EobXFDHpxZWzQHdJtktXvY/tb9OmgpqnJ59fHhVlvXz BLRD6gPsp/BSh5I3T9RT+3smJPF7TwYaIK0aJlunW+lsztdovlD+4oorn3Y/mmiodArS A9scEKUpiQg8sdlKb06m1/430Nj4FN31UX/thVD6UoPwnoG0YQKJ4R85OCQMpIaiRFee 6WTCL52hJD+eCKxUla3zO5WXegvyr0da1fjDmzssvHgv4+YwPuQrR0y5nJYCcfqVrnwy cVzR9ChwdwaN9YjhMk/0pv27qvLLtTfJggor4Q98F2imIvJNt/OKs9XAw7km2pyGcRL+ thhA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=hOHop+L0; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id k20-20020a05620a415400b0070523b9e1acsi5631061qko.63.2023.01.09.12.14.53 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 09 Jan 2023 12:14:53 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=hOHop+L0; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pEyRk-00032Q-A3; Mon, 09 Jan 2023 15:08:40 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pEyRf-0002vk-Q6 for qemu-devel@nongnu.org; Mon, 09 Jan 2023 15:08:36 -0500 Received: from mail-pl1-x62e.google.com ([2607:f8b0:4864:20::62e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pEyRd-0007QA-9L for qemu-devel@nongnu.org; Mon, 09 Jan 2023 15:08:35 -0500 Received: by mail-pl1-x62e.google.com with SMTP id w3so10776423ply.3 for ; Mon, 09 Jan 2023 12:08:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=fuFmEK8Iwf94SJtJ1ovewqobkADHJCdvU7OnItfY0Yw=; b=hOHop+L0xydJi1wUplFj/YjpLaRujrORDC+Ljhs1ZCgFepO35+Cs4PQP7cheDS9zLt miXWhAO4CoZDFh7OWSWfL7j5E4uRxXzzpdLpvZP1W4OqCay3BFnqBZToNEjLMDotb4tS tKeB1vPq5sghW2MMYqWSrs9NMT42RVqS6mHLjucN74WjjkDYK5vnmycsRhydf13BcF6p ZvbuOL7TGzNqWl2Q3DMjWYFQEAJL44AU0bEQ6XTUt0vHUCzcIN1HVGCtTSDcIAZeMv6S 8E6AvivO6zLtEu5CWFBiHkTAxZJ15eZPVt/IxxtZBK0Um85j5qYBqFGD0vu9CByDK1v1 JGzg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=fuFmEK8Iwf94SJtJ1ovewqobkADHJCdvU7OnItfY0Yw=; b=brJrWTE78Y6MtBKS/3riAu5VDK1m3a6soHzTA/+Qq+zXuypmCM7LuqxQSgf3OgUPIK 9ZTcMed1Sw002La/a/PQvGqxb5K4A1N+BkhxmNQWcHgJ0ibBPhYPkiWnhuf3XNLyVJy/ 7/Wa481F4nBYwBzheJXzyU0QqykXzRQSGLnJa3HJ1dYdqMGv2KdAnYQm3CUbUi3fgwJl 6fEYhPsVbksVnD17j/a82Y6wIKt/ovJ3gA4c9Ops5GU7r2kEtEgZSNZqDFiP1TmvdIsO zPj3MgiAzSZ/DFPlZyzlEjrDIGDHuPluS2sVL7BRChGDXGt8kpO/hms6bewOcinhCEUu XhPg== X-Gm-Message-State: AFqh2koGFXl4Plb4tLsk5gqEBIkslnAvndc134XjyJRL85VtJC3o5zvm 3bvUnjXSIY5FxPHNChdbyCS/ALxQHFdjViEc X-Received: by 2002:a17:90b:2291:b0:226:43ba:54af with SMTP id kx17-20020a17090b229100b0022643ba54afmr34011919pjb.2.1673294912268; Mon, 09 Jan 2023 12:08:32 -0800 (PST) Received: from stoup.. ([2602:47:d48c:8101:158e:facf:7a46:ba9f]) by smtp.gmail.com with ESMTPSA id l2-20020a17090a384200b0022727d4af8dsm577574pjf.48.2023.01.09.12.08.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Jan 2023 12:08:31 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Cc: qemu-s390x@nongnu.org, Ilya Leoshkevich , =?utf-8?q?P?= =?utf-8?q?hilippe_Mathieu-Daud=C3=A9?= Subject: [PATCH v3 09/27] target/s390x: Remove pc argument to pc_to_link_into Date: Mon, 9 Jan 2023 12:08:01 -0800 Message-Id: <20230109200819.3916395-10-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230109200819.3916395-1-richard.henderson@linaro.org> References: <20230109200819.3916395-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::62e; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x62e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org All callers pass s->pc_tmp. Reviewed-by: Ilya Leoshkevich Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Richard Henderson --- target/s390x/tcg/translate.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/target/s390x/tcg/translate.c b/target/s390x/tcg/translate.c index b41f5af988..fadb87ad4a 100644 --- a/target/s390x/tcg/translate.c +++ b/target/s390x/tcg/translate.c @@ -174,8 +174,10 @@ static void gen_psw_addr_disp(DisasContext *s, TCGv_i64 dest, int64_t disp) tcg_gen_movi_i64(dest, s->base.pc_next + disp); } -static void pc_to_link_info(TCGv_i64 out, DisasContext *s, uint64_t pc) +static void pc_to_link_info(TCGv_i64 out, DisasContext *s) { + uint64_t pc = s->pc_tmp; + if (s->base.tb->flags & FLAG_MASK_32) { if (s->base.tb->flags & FLAG_MASK_64) { tcg_gen_movi_i64(out, pc); @@ -1534,7 +1536,7 @@ static DisasJumpType op_ni(DisasContext *s, DisasOps *o) static DisasJumpType op_bas(DisasContext *s, DisasOps *o) { - pc_to_link_info(o->out, s, s->pc_tmp); + pc_to_link_info(o->out, s); if (o->in2) { tcg_gen_mov_i64(psw_addr, o->in2); per_branch(s, false); @@ -1549,7 +1551,7 @@ static void save_link_info(DisasContext *s, DisasOps *o) TCGv_i64 t; if (s->base.tb->flags & (FLAG_MASK_32 | FLAG_MASK_64)) { - pc_to_link_info(o->out, s, s->pc_tmp); + pc_to_link_info(o->out, s); return; } gen_op_calc_cc(s); @@ -1579,7 +1581,7 @@ static DisasJumpType op_bal(DisasContext *s, DisasOps *o) static DisasJumpType op_basi(DisasContext *s, DisasOps *o) { - pc_to_link_info(o->out, s, s->pc_tmp); + pc_to_link_info(o->out, s); return help_goto_direct(s, (int64_t)get_field(s, i2) * 2); }