From patchwork Sun Dec 11 15:27:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 633090 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp1994230pvb; Sun, 11 Dec 2022 07:36:07 -0800 (PST) X-Google-Smtp-Source: AA0mqf6glF53aatuqGFmZDVE2WzHhjUC2JPLXfAhN5VuRL4vKBfu68RMW73bfnfu72ZLbKsDP5Ip X-Received: by 2002:a05:622a:408e:b0:3a6:21cb:cca4 with SMTP id cg14-20020a05622a408e00b003a621cbcca4mr20667657qtb.10.1670772966853; Sun, 11 Dec 2022 07:36:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670772966; cv=none; d=google.com; s=arc-20160816; b=HpL9bxR7SxKLbqx6hgDclJ9az4loQRlbxuwpD43AwDIwuxD/Fc54SE0iv2ufONMD97 pu5EC4p2k7N2oeL4jKoHwBfqy8rP9+G4LaW+L0NisAyyzLKy1l/5FaXFjxrH/1m/g5Lr YR1/43nHmGScCG2ihg1df+Rl4Gd4zMuuNnk5MdcHECY2b7k+hwtHIM5ApLJxgtM2nrkG fTiEgALFow8hbIGfJhbCQ7nAORaVUr72/9n+wsxJVoFAq2JBt6W9fkV/v6scjKMRBJqc ZSCmWDoyAMAhyfqHP3rJcVmLLtB9IP7LYL1H3bG3/+Y3RDfTMB/joW5P6uwdPlNa+Ubb HyJw== 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=9PqR+j2AJ2Z/evFIqerFiBY2sN8DE35v/DjfPGQKroc=; b=0JgB8K/3ZWWEVCzy9ylxKD1Y7wYmCCZIINPIzhaJSIkTarSLzZfLhrheXi06k+e9th 48RnXCa9MVCeJNzVckev3LP/my4A8WexG9WxJFq+dDNlJLQ5eijdlj69ESZ0LHIAH3bw IQ27hemR6T9/yl1Kbw1+6xtXXNOQAoIwYyb/zSPp794rUtHSqkTVm1LtIAJuujQeH0ef orD/9fGVdLA8WW4YhYE6HLGD/cPXo4yaVfEamTHFTDn6KfGZeTItbkRSIs3f3a0sY3BC GU4zvS10/XHQYu6SuOknlOckyr4KsAGnZ1P+jvOLZC8KgVtKH9Sm71cbX2Po64s0kXsl UQrQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=qM8zRNJe; 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 ey25-20020a05622a4c1900b003a6955a6213si3994630qtb.427.2022.12.11.07.36.06 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 11 Dec 2022 07:36:06 -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=qM8zRNJe; 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 1p4OFn-0006Qn-Ed; Sun, 11 Dec 2022 10:28:35 -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 1p4OFk-0006Ls-DD for qemu-devel@nongnu.org; Sun, 11 Dec 2022 10:28:32 -0500 Received: from mail-ot1-x32a.google.com ([2607:f8b0:4864:20::32a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p4OFf-0007Xz-R3 for qemu-devel@nongnu.org; Sun, 11 Dec 2022 10:28:31 -0500 Received: by mail-ot1-x32a.google.com with SMTP id m6-20020a9d7e86000000b0066ec505ae93so5830750otp.9 for ; Sun, 11 Dec 2022 07:28:18 -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=9PqR+j2AJ2Z/evFIqerFiBY2sN8DE35v/DjfPGQKroc=; b=qM8zRNJeq1Vzlyd3QV65RyIKwItYmjlAMnZeB8liVV9T7Lzuwze6S05dJqcLXVj5A7 G9a5t6ymrnhPb6n+44NFrJcUku9ySbmjuh4ZuikV07gQGTDWz9XdkhLBNpQtksoJyNjq 6LaPjrgrWDNNGEbQ2fz1Cp4rvAHPfv4AbammEBhYimaa8LtpK4s26RfJM/taFtiALMMC l0x7Y7uuNW5JLWqEkuEowtetgHLCP7sj09QgftBssBWGIdx7frd3w4tnl7tY/APlsKhq ibOA01QIQLb9gONxPVasvlc8bf2dd12AmCv2tRN1l7l0ySnGULVe2LWA5MTjgBdqcLE6 ChXA== 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=9PqR+j2AJ2Z/evFIqerFiBY2sN8DE35v/DjfPGQKroc=; b=rPFEqoI/6zX1JhzlzTCgWHNq9Rmog7tfesz/SqF2PN0hI03pawSsklPyRzkGrS40t1 PNyxboSvI2HQGiz8EVxLll1+7U1e6jC5FtzMyfNNsC+xfGNSARh+btpqElwadLLbkb2J rDPdLRnRgM91Wv5p5pI+RuDNGFfGTC71obF+xQ0mx8u+/0fpI62z+C87bD3NUbAODvQ/ 4wPLY8sio2DbXe6zLk74FGoR7KIqUGKItddDH7cDvron9zaKftExE9CkZcWRwaHuHebc 2ISrRjNU8ew6mcaDgaNBSbq+r2r4FHZAA/rikBq+nLGcaXirBhso7w/W4tdFQtTsPq0Q /nSQ== X-Gm-Message-State: ANoB5pn+3NWeNpICxmYAKj1eaIvuCLY/lDCyAStPs8i7L6dwDK3nspXZ hrT78SQ3eWIT6wF46tj6yukLgzLXvpIOrkuAMY4= X-Received: by 2002:a9d:65d3:0:b0:670:5951:87b3 with SMTP id z19-20020a9d65d3000000b00670595187b3mr6279795oth.31.1670772498015; Sun, 11 Dec 2022 07:28:18 -0800 (PST) Received: from stoup.. ([2806:102e:18:2efc:7b4f:f28b:eca6:b583]) by smtp.gmail.com with ESMTPSA id q24-20020a056830233800b006708d2cd8bcsm938140otg.65.2022.12.11.07.28.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 11 Dec 2022 07:28:17 -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 v2 11/27] target/s390x: Use gen_psw_addr_disp in save_link_info Date: Sun, 11 Dec 2022 09:27:46 -0600 Message-Id: <20221211152802.923900-12-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221211152802.923900-1-richard.henderson@linaro.org> References: <20221211152802.923900-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::32a; envelope-from=richard.henderson@linaro.org; helo=mail-ot1-x32a.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=unavailable 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 Trivial but non-mechanical conversion away from pc_tmp. Reviewed-by: Ilya Leoshkevich Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Richard Henderson --- target/s390x/tcg/translate.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/target/s390x/tcg/translate.c b/target/s390x/tcg/translate.c index f5b97fe1c4..b317767a7d 100644 --- a/target/s390x/tcg/translate.c +++ b/target/s390x/tcg/translate.c @@ -1558,9 +1558,11 @@ static void save_link_info(DisasContext *s, DisasOps *o) return; } gen_op_calc_cc(s); - tcg_gen_andi_i64(o->out, o->out, 0xffffffff00000000ull); - tcg_gen_ori_i64(o->out, o->out, ((s->ilen / 2) << 30) | s->pc_tmp); t = tcg_temp_new_i64(); + tcg_gen_andi_i64(o->out, o->out, 0xffffffff00000000ull); + gen_psw_addr_disp(s, t, s->ilen); + tcg_gen_or_i64(o->out, o->out, t); + tcg_gen_ori_i64(o->out, o->out, (s->ilen / 2) << 30); tcg_gen_shri_i64(t, psw_mask, 16); tcg_gen_andi_i64(t, t, 0x0f000000); tcg_gen_or_i64(o->out, o->out, t);