From patchwork Tue Sep 6 10:17:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 603016 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:4388:0:0:0:0 with SMTP id w8csp4431998mae; Tue, 6 Sep 2022 04:19:57 -0700 (PDT) X-Google-Smtp-Source: AA6agR7/Vo8iYFvJHN1PIyjbsRCD4rElyLVzS1MTtbQWxK6Rw3BpOG0G/oXXjFZRy8NEb3xVp/Ba X-Received: by 2002:a05:620a:4042:b0:6bb:cef:5c9 with SMTP id i2-20020a05620a404200b006bb0cef05c9mr35068859qko.678.1662463197404; Tue, 06 Sep 2022 04:19:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1662463197; cv=none; d=google.com; s=arc-20160816; b=zxST/UsXT3bNOJWl+UARR4Z51G/jQLq6EetI2HlRijlbY7jBa/MwX1pQHXAZCYCj6A HTnrcW0w4elxxrLAhsEEEJ2gllOR/0BDTh0+DbwEP7y9RCt28ytyn0kiG+o3yA0HUdIZ UbwsChZZz2YBzdwFtUsxoEokU2GVr5ciqXuF1SKMGsvDrvZ+C0CN04nymm3ipf+V8AE4 qpRi53YeLiBjqdOnv/4kY3mvjo5kLaEo+/9REjPa+oKZoodsKWpBHH5WNHYT/UhNkB6L ryFuJ8hGCuP2JLhH7RK7gIk40eJBpK7k2He2scK4IvQy0wmDY4/spw34aL/v8vgyXwsR WuDw== 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=69Hf+uFfKAyJd3wd8wnV5QVuX0BdMNOKT/F+cpQhvA0=; b=MLBEJEcgFRawq1qqXGdyaisxxTWhAOOm00zIx235p7ElwRJpc5Dn8Rgdif8UWYnPF8 nyh7DF2rtOfQqsHfjZ9VrveXI+NP6aQuqd73mdGWL7U3UK2vYsCjqbO++V4mwm0E6QeQ HYtBbVbPfyzc0csXcNM+OkDlxuer1oIQJMZzdZnHQqFXt7iisSFZFuSwowMLHsWNOo+x dvupGQ9RVVNu+ndRlU7uV7ldXZ1wtQHjVvCthbvm/BbRqA5PZ3mP0NRj2mFnCJOX+SVP JVHhTJAXv44R0W4N501GTOYe3v7mm2nQr5vSd/3zCs5sCYGlSxyOmmuI+Qkq6WR45+to 4peg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=SRgMaFpa; 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 j8-20020a05620a410800b006bbac099c4dsi7447444qko.650.2022.09.06.04.19.57 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 06 Sep 2022 04:19:57 -0700 (PDT) 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=SRgMaFpa; 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]:50402 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oVWcX-0008Dp-0S for patch@linaro.org; Tue, 06 Sep 2022 07:19:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37550) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oVVea-0003Lh-9Y for qemu-devel@nongnu.org; Tue, 06 Sep 2022 06:18:04 -0400 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]:38490) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oVVeY-0005BO-Ly for qemu-devel@nongnu.org; Tue, 06 Sep 2022 06:17:59 -0400 Received: by mail-wr1-x430.google.com with SMTP id b5so14699506wrr.5 for ; Tue, 06 Sep 2022 03:17:58 -0700 (PDT) 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; bh=69Hf+uFfKAyJd3wd8wnV5QVuX0BdMNOKT/F+cpQhvA0=; b=SRgMaFpaZP3fkof1DL6krj0yZtQDgdJsCyodtxXMWLBBTH7vQse4814bm2ujecGBrk Y+4EOKFAHto32VHlLzz5I7xgskXJ0eCUp4ep9Zxet5T5ZRqBcFqjTgh6tQwMVS70q7wa jQkPx3Scm7ryYslWV4UtM+nH1OGCraebzb2W9caR7L8kFLLSEGW3x9ZQFS1EOQfbWMiU oP3BFWFlwDH/JQSJmRflKU7WMOzyZaIsbmbe2R/F5R1mcCrFIIdYRrtjHIxi9xAUrUJR wnp1iyTYxCF0nql4fdJ27myV0GU7C0JfxuZBLTcv6H2sHckqzfP5sTVFT4GWVdd9cL5w ggXA== 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; bh=69Hf+uFfKAyJd3wd8wnV5QVuX0BdMNOKT/F+cpQhvA0=; b=0ooeJjdcAC9IkrhRyp42L3RzOjRAsSDiYR7qpycIPZupfzl4MjGEWY0Uv1ml+cZxLV khCFNDX1lR8IQ5YKhgcXzFjGRPUZPY/E2xeBJGptSpO16IIIVpeOHZnsY/rRKVhLcn6w PRQJoNNJV0tTlUkw33eI8ZmnL3nsDD1yO6TmiSjMPuolIPUoIZVkTzhhpn8hgs3iVKSy 3LbZ3L/W8rugiQUSwVo7QghcvzFFj434D+kjOaPvWF2RlB0/4WKu64qO9vPxT4ky74h1 W+QX0Z00XNtbmWYyQ6Z+dyLRYl4KQYY2NoTLodbi2NTyZ5buHqyhJpbYxEZv96Yd3k34 yG9w== X-Gm-Message-State: ACgBeo22m+qSIiIy1mKR9co4OQ62lm3v1UwT52Z6GiWBvUQK0hteWzpw toaByZW6VyK6ajqIN2I5Ybv3WuknU73y5vS6 X-Received: by 2002:a05:6000:15c5:b0:220:727a:24bf with SMTP id y5-20020a05600015c500b00220727a24bfmr28263940wry.621.1662459477840; Tue, 06 Sep 2022 03:17:57 -0700 (PDT) Received: from localhost.localdomain ([2a02:8084:a5c0:5a80:ba98:3a71:8524:e0b1]) by smtp.gmail.com with ESMTPSA id y16-20020a05600c365000b003a62bc1735asm14094361wmq.9.2022.09.06.03.17.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Sep 2022 03:17:57 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: qemu-s390x@nongnu.org Subject: [PATCH v1 09/26] target/s390x: Use gen_psw_addr_disp in save_link_info Date: Tue, 6 Sep 2022 11:17:30 +0100 Message-Id: <20220906101747.344559-10-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220906101747.344559-1-richard.henderson@linaro.org> References: <20220906101747.344559-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::430; envelope-from=richard.henderson@linaro.org; helo=mail-wr1-x430.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, T_SCC_BODY_TEXT_LINE=-0.01 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" Trivial but non-mechanical conversion away from pc_tmp. Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé --- 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 4c3ea958d7..ad73a64b05 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);