From patchwork Mon Sep 9 23:19:07 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 826652 Delivered-To: patch@linaro.org Received: by 2002:adf:ab1c:0:b0:367:895a:4699 with SMTP id q28csp60669wrc; Mon, 9 Sep 2024 16:19:59 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXjYYVFvOCR1QZBPoWOAtAZQr6RHaVWXdLYHupGaIAwy8HlGabZBdLovoV4YUNDhG8tgpqHRg==@linaro.org X-Google-Smtp-Source: AGHT+IFSZEZSjSqiE+erp8+i12d6xE1OXdVP/XwMU4Cyc9PUWemw6OSpl9VloJFMui9NV7CZSmuW X-Received: by 2002:a05:620a:240b:b0:7a9:c31f:e4cd with SMTP id af79cd13be357-7a9c31fe7f4mr5711985a.29.1725923999070; Mon, 09 Sep 2024 16:19:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1725923999; cv=none; d=google.com; s=arc-20240605; b=OfXZhqtV0q3HYa8GU6tkTXlwdJlBvO1cHz+kVDbce9VaAjIQ26TUh5huOturG+Kt2U 1f1LcGDwK5JV1BlbO2XBOBhxfMnNbhMCWt5K4XmQK7h9Hh6RPiek+5atm6HwrEnJ/HBb cFyKY2C15qF0BG/mh6Jlz6sbI/jE39GXVEBJ82dWMf7UPc227DSFzAcG9IwpU7HE8lFF CphcX64v7cBA6KPXFUt1ui+eOvnH0DIbksF1ZhqiPY8J6mcQhJ2srZRzIUpNXCFmeeU1 PNxw5j3kCKzEVQRBJjESf6TVHjJeubHJUnvWYT5gUgq3BAFAlJt2LQZF3qajwe3KPTNl vXvg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=RljF5ZZjKlfnOTNofIkZDAiguKbpQWfL+qX+BI8AThM=; fh=LMR/z5nc01l//8cK0qbbnKNeXZ+MzD/fNTVa3mh7x6s=; b=ifcZEyX3VLUitzYCDbzgukamoefTZIlHUvStivEYf44f0cFc+XuEWc5IeVpLH0o8MO TPlTBX09VqP7IkFePyAUUl4xa78MXvvKusy7mt0SSUNDimyZJoik5tW5wiqpQuKsxaMz hN9Sg7w/ACp2ekhl8qbwddXm0W13VxLGIxOU/IW86vqXhT993htTWPs3Lerc/wyr5J6X WgH2R/sWhyOOnnmyKArdXi0Rf7Y+T9YTynH+4a6vxF/BoQw/ggmv7ggnrzODonkOkLBH tmSfWqbcRLnnglYVgh4anuPOMThwoTGR+1lBDCOq20H5UqWufdRrWhRm0NwNoI9ZOKGl u7GQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="N4/qBooi"; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7a9a79ef6f2si668086285a.169.2024.09.09.16.19.58 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 09 Sep 2024 16:19:59 -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="N4/qBooi"; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1snnfD-0002TK-Qa; Mon, 09 Sep 2024 19:19:19 -0400 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 1snnfC-0002Sq-P2 for qemu-devel@nongnu.org; Mon, 09 Sep 2024 19:19:18 -0400 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1snnfA-0005ng-Jy for qemu-devel@nongnu.org; Mon, 09 Sep 2024 19:19:18 -0400 Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-42cb57f8b41so22312125e9.0 for ; Mon, 09 Sep 2024 16:19:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1725923954; x=1726528754; darn=nongnu.org; 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=RljF5ZZjKlfnOTNofIkZDAiguKbpQWfL+qX+BI8AThM=; b=N4/qBooiCYq20EqEJCLlF0HsRFFHf3tARTWI6urW1UzoElW6taIj3fa+5kttnapp/t s8MdNYEg3J40UYj1h+/SYetCIcsL/xYeLCXEEme0SuMkOX8h2jNxD/NVGHWvZroRHRW3 ZR3OrzjNRz290HK19WNv/RKeTflg5X6SSVLd7Av5t38X5Fge/8HWsfIxYnQbMHvLam7C LdU4aGD34AvCrGkBY7Gr/5FskbZqf7ponA+N6fT6Je+BVgms5ggY3hYz9lXL9yxXkvgm WhlZhDB9p02vCmIZESWx36LpUji/vylTxMnC5yHGRpFknVIUyerlkdzdtPyJPDczLF3Z ccgQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725923954; x=1726528754; 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=RljF5ZZjKlfnOTNofIkZDAiguKbpQWfL+qX+BI8AThM=; b=v4lg/5k4lUiHkKZnLC3kK3wWXh1A7w2MnSyLjuc+VwI3F2CtOSK+KgBTuiOFA8AtTN KG647C/5dNJ9gJgKfI5M4ZbKGEW+vumdvvgFZitLpBKm5R9caGQb9rTluK/gUuR1qZK7 5wF74fBfgAcYH7cKqAZCpMZjf00i+bkKvkGG7rgA0uG2uKzUh7L5KMzPjvw5Un3yXp/O 9SqzQqoV4WKy1JQWb4049O2odXQ5LYUMajwNvEPUrqQfEYpcEkhn4j/dFfV1kfZpS6Lp F78G6Fmh4t2jDewXffAXJI8pKQ0vDJeDalm9ZKu28zQfIKGTCDcpaEij8ivcHxHHl0Sn rLkg== X-Gm-Message-State: AOJu0Yzo2otk3/zbTO/4pac6sgOSVq/2SadDNhg5I3w3sm65y/s32mNJ ueNPK4a3rdDyXuOhgtlXKOQ6GhGIvj3/vpUOb0aJPvPsWFELdaB7eBK59gy1Anhxrm/lBpF5AJV H X-Received: by 2002:adf:ee8b:0:b0:378:8b84:4de9 with SMTP id ffacd0b85a97d-3789229dae6mr8227202f8f.12.1725923954304; Mon, 09 Sep 2024 16:19:14 -0700 (PDT) Received: from m1x-phil.lan (nsg93-h02-176-184-54-166.dsl.sta.abo.bbox.fr. [176.184.54.166]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a8d25a258a3sm397127466b.89.2024.09.09.16.19.12 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 09 Sep 2024 16:19:13 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: David Hildenbrand , qemu-s390x@nongnu.org, Thomas Huth , Ilya Leoshkevich , Richard Henderson , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= Subject: [PATCH v2 06/10 1/4] target/s390x: Rename local variable in save_link_info Date: Tue, 10 Sep 2024 01:19:07 +0200 Message-ID: <20240909231910.14428-1-philmd@linaro.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240605215739.4758-7-richard.henderson@linaro.org> References: <20240605215739.4758-7-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::335; envelope-from=philmd@linaro.org; helo=mail-wm1-x335.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 From: Richard Henderson To simplify the following commits, rename 't' as 't2'. Signed-off-by: Richard Henderson Message-ID: <20240605215739.4758-7-richard.henderson@linaro.org> [PMD: Split patch, part 1/4] Signed-off-by: Philippe Mathieu-Daudé --- target/s390x/tcg/translate.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/target/s390x/tcg/translate.c b/target/s390x/tcg/translate.c index e1b1dd43e1..faa6d37c8e 100644 --- a/target/s390x/tcg/translate.c +++ b/target/s390x/tcg/translate.c @@ -1417,24 +1417,25 @@ static DisasJumpType op_bas(DisasContext *s, DisasOps *o) static void save_link_info(DisasContext *s, DisasOps *o) { - TCGv_i64 t; + TCGv_i64 t2; if (s->base.tb->flags & (FLAG_MASK_32 | FLAG_MASK_64)) { pc_to_link_info(o->out, s); return; } + gen_op_calc_cc(s); - t = tcg_temp_new_i64(); + t2 = 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); + gen_psw_addr_disp(s, t2, s->ilen); + tcg_gen_or_i64(o->out, o->out, t2); 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); - tcg_gen_extu_i32_i64(t, cc_op); - tcg_gen_shli_i64(t, t, 28); - tcg_gen_or_i64(o->out, o->out, t); + tcg_gen_shri_i64(t2, psw_mask, 16); + tcg_gen_andi_i64(t2, t2, 0x0f000000); + tcg_gen_or_i64(o->out, o->out, t2); + tcg_gen_extu_i32_i64(t2, cc_op); + tcg_gen_shli_i64(t2, t2, 28); + tcg_gen_or_i64(o->out, o->out, t2); } static DisasJumpType op_bal(DisasContext *s, DisasOps *o)