From patchwork Mon Feb 20 18:40:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 655119 Delivered-To: patch@linaro.org Received: by 2002:adf:9bcd:0:0:0:0:0 with SMTP id e13csp1552503wrc; Mon, 20 Feb 2023 10:45:49 -0800 (PST) X-Google-Smtp-Source: AK7set8UQSAXSpnHyNcWCv5FQv1dePjIdSQiAJT/z9vxOW1dfbCMDdorS+qDEg70JEvVynl1BDga X-Received: by 2002:a05:622a:87:b0:3b9:d1c1:6da6 with SMTP id o7-20020a05622a008700b003b9d1c16da6mr15624848qtw.7.1676918749149; Mon, 20 Feb 2023 10:45:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676918749; cv=none; d=google.com; s=arc-20160816; b=tpGBH2JI+cRAj8uAMGHiHrsE7WvaSAT2Dsdrj2HCN/SOw4aIeMW8dn3LAgVV1NzLYh fkvhUnQeBd2T8gyYeMxHWLsxDKFbFTTxEgqy9FS5o4nrOH0E/BuyWb/x5Q2pbRp7koIo 3Cyk5Mb3kKMZzsPCcrVkQmxOA9JfK9PhUdbbrCgHLJ3/w3dyHrfsKXXpEKTfTivb6AQ1 VCbpQNP/aTz7vwYWuvhEFTq1FqZkon/r0RDhkW2G2BW/9zb6XScJeZx/hmWnt6My4P3P pdnvbVZto2DSKcOPeb7TGpv6X4is2OmbEoSgJ5RxpEf7VbKLVhKKMxcIR7AotCbuQ/ab hl0g== 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=xeg/0EdSZC28AvGMk7qqsjE82NOjaTkrGHHmkOUC36U=; b=sCs6jXZXRbIBN2fgfnIcvkRFHsxIvjdJH5S/Oow4VtgzNRJplPIf310JpUquhtmThT vZH2eZBaN9KKIvM0vrtN0QYZ148QmNfCPzf33JO+Q99flZ+IE+beW5jXrE3st4NL6y/p /cnUNJU75Bn0fW12yRuLf6AWRxt8lAoub8KZSN3QaFkc98VEtGr0L4dwUfkSwulFXxq0 2PMyFmvlD1soTWmdZJlyrtXcPa1qvtQemcIZ2w6JSAN/Y06ml1QfjG4GMdqY3p+e5MeL xbuAjgugoqQjxr/3VHTMPZvvIud3xmN1o2y1DwkFJMJ6XxEOeiMeZ2XI3789eo0Pa6dt 9ejg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=mqXC4Pcm; 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 s38-20020a05622a1aa600b003b9b98b50d1si10008435qtc.243.2023.02.20.10.45.34 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 20 Feb 2023 10:45:49 -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=mqXC4Pcm; 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 1pUB7Z-00057z-K2; Mon, 20 Feb 2023 13:42:42 -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 1pUB6Y-0004YP-A3 for qemu-devel@nongnu.org; Mon, 20 Feb 2023 13:41:41 -0500 Received: from mail-pl1-x630.google.com ([2607:f8b0:4864:20::630]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pUB6M-000475-Vt for qemu-devel@nongnu.org; Mon, 20 Feb 2023 13:41:33 -0500 Received: by mail-pl1-x630.google.com with SMTP id e5so3551600plg.8 for ; Mon, 20 Feb 2023 10:41:15 -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=xeg/0EdSZC28AvGMk7qqsjE82NOjaTkrGHHmkOUC36U=; b=mqXC4PcmX7t3gCsr8WGoGFmpbnxBnHgJ+Q3zi9WwJf3yi+b52e7MivXpzNBtNlVI7E Jnj5NkKiiSX3CKLDBJ9s/hEy7PQ/yne7BcOICV1yYCQ1FQy9pyEVHBS/hw7wHQw+J6z/ u1xUZfSzdQIXvS4b1ClLbrdzvahpPb68hi2ZoIeiynte/e2kuwMbXgL+ZjLwvWBJTsHE eXOjgtrYfTU5+cINSQSmdhJmAihzJzA7BP2p7fdr05Qviu+FGp9JEt9vmnlp8yHJwaGS 9lVxJ91tn5NlfZpFLRTn/ZXXYSRPJJZp2DeNrn7rNxevepHrFzgsbB4eRbn7Y06swFr/ IrKA== 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=xeg/0EdSZC28AvGMk7qqsjE82NOjaTkrGHHmkOUC36U=; b=XKAKR6N27uxYdtgfZEUx9I8Ipjy9hsd4DJPXr7RDGYduw4o6OOEl0FpjHzVjSwlpuM 6cPOXC5i+IeJ++CvBXxF53TLA3mm6i2LN31y00PvrAcMjaNGrxe/dk6O3anmK1/CZexD I9VnsRf3W7VIdKtK2gRRPPQg/2K5/EZBIeRtXl10HoVrQKZ4jo0Up/y6n0rv5LgZQnNq 5SM3KMqzuPnUtibAk6rOjlu8hEW1JZIQprSetBtFN29ycbK/kuwd/Z9ONhOLh2EQZv5b TTRjWejNvLgbprIFg7CsMwFVgcXzRAKj3UKs11LKgOgfJc7eKdI+5GZ7zACQGjnaW2W5 LKpg== X-Gm-Message-State: AO0yUKX7HtIbba3B9+MM65mTCpVkefVTh+pMPTLsFnOOGe0kxKvPOU67 HtjLjgZD3uUdCdJf/Yxr3OxYUk6iF9bwlHYpcJE= X-Received: by 2002:a17:902:d48b:b0:19a:a810:51b with SMTP id c11-20020a170902d48b00b0019aa810051bmr2234645plg.63.1676918474961; Mon, 20 Feb 2023 10:41:14 -0800 (PST) Received: from stoup.. (rrcs-173-198-77-218.west.biz.rr.com. [173.198.77.218]) by smtp.gmail.com with ESMTPSA id jk20-20020a170903331400b0019258bcf3ffsm1911676plb.56.2023.02.20.10.41.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Feb 2023 10:41:14 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Cc: thuth@redhat.com, qemu-s390x@nongnu.org, Ilya Leoshkevich Subject: [PATCH v4 10/27] target/s390x: Use gen_psw_addr_disp in pc_to_link_info Date: Mon, 20 Feb 2023 08:40:35 -1000 Message-Id: <20230220184052.163465-11-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230220184052.163465-1-richard.henderson@linaro.org> References: <20230220184052.163465-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::630; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x630.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 This is slightly more complicated than a straight displacement for 31 and 24-bit modes. Dont bother with a cant-happen assert. Reviewed-by: Ilya Leoshkevich Signed-off-by: Richard Henderson --- target/s390x/tcg/translate.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/target/s390x/tcg/translate.c b/target/s390x/tcg/translate.c index 3dbbcfd2d3..027a5b0673 100644 --- a/target/s390x/tcg/translate.c +++ b/target/s390x/tcg/translate.c @@ -176,17 +176,20 @@ static void gen_psw_addr_disp(DisasContext *s, TCGv_i64 dest, int64_t disp) static void pc_to_link_info(TCGv_i64 out, DisasContext *s) { - uint64_t pc = s->pc_tmp; + TCGv_i64 tmp; - if (s->base.tb->flags & FLAG_MASK_32) { - if (s->base.tb->flags & FLAG_MASK_64) { - tcg_gen_movi_i64(out, pc); - return; - } - pc |= 0x80000000; + if (s->base.tb->flags & FLAG_MASK_64) { + gen_psw_addr_disp(s, out, s->ilen); + return; } - assert(!(s->base.tb->flags & FLAG_MASK_64)); - tcg_gen_deposit_i64(out, out, tcg_constant_i64(pc), 0, 32); + + tmp = tcg_temp_new_i64(); + gen_psw_addr_disp(s, tmp, s->ilen); + if (s->base.tb->flags & FLAG_MASK_32) { + tcg_gen_ori_i64(tmp, tmp, 0x80000000); + } + tcg_gen_deposit_i64(out, out, tmp, 0, 32); + tcg_temp_free_i64(tmp); } static TCGv_i64 psw_addr;