From patchwork Tue Nov 7 03:03:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 741793 Delivered-To: patch@linaro.org Received: by 2002:adf:fd90:0:b0:32d:baff:b0ca with SMTP id d16csp1419626wrr; Mon, 6 Nov 2023 19:06:56 -0800 (PST) X-Google-Smtp-Source: AGHT+IGs0uiDbYiGzpaGDM3xGwikzd/KoXyNo5mCZo7R4P6KgP3Mcr9mxvdaW4L+Ubcd17WC6xx5 X-Received: by 2002:ac8:120b:0:b0:403:b088:5d3 with SMTP id x11-20020ac8120b000000b00403b08805d3mr1805103qti.17.1699326416335; Mon, 06 Nov 2023 19:06:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699326416; cv=none; d=google.com; s=arc-20160816; b=eayxk1/fFAxfolaKUH3UhXV4OrA3140YM7xSRcKgE50qUIp2o0MIpuKzf6FI77ROuW hgED60JSBnVYhimRWS8KlV9uXIbpKGKEyGOCfW6ExIFRNuH1gmQFN07XvjW/axIJtKCB NNypeZG0EI/gxK6acz1DLhWQrhLzGXuGYyR5JX0fTzCk0FkXKhGdrMP+UemR+V5553// GQay30wD4IvhU06JLt8cd9BGziH5qfcXO7fjGrlM4dqWA7reOOSZeQwjrUxQT8/1/aUS h+AyEOWpdPJEKqHBkarCx+vM+IHqq3h2wcpKK2G2scLpdmoLCoR2pXokmsjMFR30yiVP AcDQ== 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:to:from :dkim-signature; bh=Hr5vuZ68lJAyQU4cT2RqX4i7gNDgWOQDVCjFWr924pI=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=hWCVFSa5/gqmDqYuy4cvcJJtBemqODSt0/BOZ+qZWdD100+qmXkYneykpd9wMLmLu5 RENvYEWXob8wEEFKmHmjBAsi0EwHWp6SCcAPVnJ0/0dNWiwGQhAzF2OaS85WxzPYpVPR pNHO0cfBxPsOFbEf/SwE+JAeYESIvlf1LlbZRYR7XnGQmtY4QCM6Mi4uub0aJRdpMKUy YnNT4sP3En5UIVDioWre/oVCyVAQgoAwteLIvi4aXgrWMTadtqFOvVFdMLKQGcteYumZ kM+L+qVqtkXbtlit+kKqiPGxFMK3vEpt17pFOViFkT+amMkaausf3errA19HebKJZ2kx 1Z5g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=RAq9lB6O; 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 k17-20020ac85fd1000000b0041cc346426asi6680248qta.135.2023.11.06.19.06.56 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 06 Nov 2023 19:06:56 -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=RAq9lB6O; 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 1r0COd-0007V3-HY; Mon, 06 Nov 2023 22:04:55 -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 1r0COU-00071K-5N for qemu-devel@nongnu.org; Mon, 06 Nov 2023 22:04:46 -0500 Received: from mail-pl1-x62b.google.com ([2607:f8b0:4864:20::62b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r0COL-0000h8-5k for qemu-devel@nongnu.org; Mon, 06 Nov 2023 22:04:45 -0500 Received: by mail-pl1-x62b.google.com with SMTP id d9443c01a7336-1cc30bf9e22so41221685ad.1 for ; Mon, 06 Nov 2023 19:04:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1699326272; x=1699931072; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=Hr5vuZ68lJAyQU4cT2RqX4i7gNDgWOQDVCjFWr924pI=; b=RAq9lB6OqCBcfNnuokkPu452jSpwMlmFLWS9HyIv5YgNR/h+hGlRThJeAQX6kqWPy1 NFtjw8L3ujpr0bOoeSWCZHUrdR67fH0oeD7eFqyZWy3K1mvidVOBbS1i9xjYsaKtiPq5 fF18O3Grqdd9hLuVF/FzMSkjj1s1f63FA2XrOPBcjaSDz6FPbkN8qvUz/3lP15G3f+lG 4mTgou8pSFVRqpLDI2+GmjDFNW/GgBFvtUK9JxdybuE/g3NbsNVgccSEtMWXSFBWZiLO 8fqoQRLbzTJljjqgt7t9w+5ccm61vkClmjmN30ogK7gQqCCB+n7a7fV+vCXI1/zClVEg rPxw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699326272; x=1699931072; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Hr5vuZ68lJAyQU4cT2RqX4i7gNDgWOQDVCjFWr924pI=; b=k+dvVXLu/WgGaEl4sTr9kn/lRPLa6dhd3Y42ERVzScz938yfduohNtg1BLBmFWh/et TcmBm+UyF5aFDS6+7WzCtHOUTANW2kh6Q9SKYrWcZWk4ezflTG26OEEMoh0vzvGOqfVY NABBD/Qv1HiO54+pncuNzNymBOBnjZskP/JN+z3WbEHaUY2iGyMj1q/ixZQYs7d2GKJ2 uWIvxUAG2v8Rsst4TaoiRwni7pLobpdsk00VJ/ra2qQMxyxsxr+IIBzwtnKEH/tKj32X 6OcZigA2MgS4KvGyFSDHwnN9JJvXTTYUqSwVI1Vlk7kr7/XWDGPn8lE/+U8mzn7yN+RK hKyQ== X-Gm-Message-State: AOJu0YxPVWN5IBLk4+K5QogYQU6/YPtWD1HcTH1mjbj069ihQHa/Q8WQ cJXPdjHaa1TylKbz018eDOAbjl0kN4Vc6yk75dU= X-Received: by 2002:a17:902:cec7:b0:1cc:5029:e3d4 with SMTP id d7-20020a170902cec700b001cc5029e3d4mr2057307plg.23.1699326271824; Mon, 06 Nov 2023 19:04:31 -0800 (PST) Received: from stoup.. ([71.212.149.95]) by smtp.gmail.com with ESMTPSA id u9-20020a17090282c900b001c72d5e16acsm6518012plz.57.2023.11.06.19.04.31 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Nov 2023 19:04:31 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 31/85] target/hppa: Pass d to do_sub_cond Date: Mon, 6 Nov 2023 19:03:13 -0800 Message-Id: <20231107030407.8979-32-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231107030407.8979-1-richard.henderson@linaro.org> References: <20231107030407.8979-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::62b; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x62b.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-bounces+patch=linaro.org@nongnu.org Hoist the resolution of d up one level above do_sub_cond. Signed-off-by: Richard Henderson --- target/hppa/translate.c | 77 ++++++++++++++++++++++++++--------------- 1 file changed, 49 insertions(+), 28 deletions(-) diff --git a/target/hppa/translate.c b/target/hppa/translate.c index 7b0e48c42b..72971097bb 100644 --- a/target/hppa/translate.c +++ b/target/hppa/translate.c @@ -446,12 +446,15 @@ static DisasCond cond_make_n(void) }; } -static DisasCond cond_make_0_tmp(TCGCond c, TCGv_reg a0) +static DisasCond cond_make_tmp(TCGCond c, TCGv_reg a0, TCGv_reg a1) { assert (c != TCG_COND_NEVER && c != TCG_COND_ALWAYS); - return (DisasCond){ - .c = c, .a0 = a0, .a1 = tcg_constant_reg(0) - }; + return (DisasCond){ .c = c, .a0 = a0, .a1 = a1 }; +} + +static DisasCond cond_make_0_tmp(TCGCond c, TCGv_reg a0) +{ + return cond_make_tmp(c, a0, tcg_constant_reg(0)); } static DisasCond cond_make_0(TCGCond c, TCGv_reg a0) @@ -463,15 +466,12 @@ static DisasCond cond_make_0(TCGCond c, TCGv_reg a0) static DisasCond cond_make(TCGCond c, TCGv_reg a0, TCGv_reg a1) { - DisasCond r = { .c = c }; + TCGv_reg t0 = tcg_temp_new(); + TCGv_reg t1 = tcg_temp_new(); - assert (c != TCG_COND_NEVER && c != TCG_COND_ALWAYS); - r.a0 = tcg_temp_new(); - tcg_gen_mov_reg(r.a0, a0); - r.a1 = tcg_temp_new(); - tcg_gen_mov_reg(r.a1, a1); - - return r; + tcg_gen_mov_reg(t0, a0); + tcg_gen_mov_reg(t1, a1); + return cond_make_tmp(c, t0, t1); } static void cond_free(DisasCond *cond) @@ -923,36 +923,55 @@ static DisasCond do_cond(DisasContext *ctx, unsigned cf, bool d, can use the inputs directly. This can allow other computation to be deleted as unused. */ -static DisasCond do_sub_cond(DisasContext *ctx, unsigned cf, TCGv_reg res, - TCGv_reg in1, TCGv_reg in2, TCGv_reg sv) +static DisasCond do_sub_cond(DisasContext *ctx, unsigned cf, bool d, + TCGv_reg res, TCGv_reg in1, + TCGv_reg in2, TCGv_reg sv) { - DisasCond cond; - bool d = false; + TCGCond tc; + bool ext_uns; switch (cf >> 1) { case 1: /* = / <> */ - cond = cond_make(TCG_COND_EQ, in1, in2); + tc = TCG_COND_EQ; + ext_uns = true; break; case 2: /* < / >= */ - cond = cond_make(TCG_COND_LT, in1, in2); + tc = TCG_COND_LT; + ext_uns = false; break; case 3: /* <= / > */ - cond = cond_make(TCG_COND_LE, in1, in2); + tc = TCG_COND_LE; + ext_uns = false; break; case 4: /* << / >>= */ - cond = cond_make(TCG_COND_LTU, in1, in2); + tc = TCG_COND_LTU; + ext_uns = true; break; case 5: /* <<= / >> */ - cond = cond_make(TCG_COND_LEU, in1, in2); + tc = TCG_COND_LEU; + ext_uns = true; break; default: return do_cond(ctx, cf, d, res, NULL, sv); } - if (cf & 1) { - cond.c = tcg_invert_cond(cond.c); - } - return cond; + if (cf & 1) { + tc = tcg_invert_cond(tc); + } + if (cond_need_ext(ctx, d)) { + TCGv_reg t1 = tcg_temp_new(); + TCGv_reg t2 = tcg_temp_new(); + + if (ext_uns) { + tcg_gen_ext32u_reg(t1, in1); + tcg_gen_ext32u_reg(t2, in2); + } else { + tcg_gen_ext32s_reg(t1, in1); + tcg_gen_ext32s_reg(t2, in2); + } + return cond_make_tmp(tc, t1, t2); + } + return cond_make(tc, in1, in2); } /* @@ -1280,7 +1299,7 @@ static void do_sub(DisasContext *ctx, unsigned rt, TCGv_reg in1, /* Compute the condition. We cannot use the special case for borrow. */ if (!is_b) { - cond = do_sub_cond(ctx, cf, dest, in1, in2, sv); + cond = do_sub_cond(ctx, cf, d, dest, in1, in2, sv); } else { cond = do_cond(ctx, cf, d, dest, get_carry(ctx, d, cb, cb_msb), sv); } @@ -1334,6 +1353,7 @@ static void do_cmpclr(DisasContext *ctx, unsigned rt, TCGv_reg in1, { TCGv_reg dest, sv; DisasCond cond; + bool d = false; dest = tcg_temp_new(); tcg_gen_sub_reg(dest, in1, in2); @@ -1345,7 +1365,7 @@ static void do_cmpclr(DisasContext *ctx, unsigned rt, TCGv_reg in1, } /* Form the condition for the compare. */ - cond = do_sub_cond(ctx, cf, dest, in1, in2, sv); + cond = do_sub_cond(ctx, cf, d, dest, in1, in2, sv); /* Clear. */ tcg_gen_movi_reg(dest, 0); @@ -3049,6 +3069,7 @@ static bool do_cmpb(DisasContext *ctx, unsigned r, TCGv_reg in1, { TCGv_reg dest, in2, sv; DisasCond cond; + bool d = false; in2 = load_gpr(ctx, r); dest = tcg_temp_new(); @@ -3060,7 +3081,7 @@ static bool do_cmpb(DisasContext *ctx, unsigned r, TCGv_reg in1, sv = do_sub_sv(ctx, dest, in1, in2); } - cond = do_sub_cond(ctx, c * 2 + f, dest, in1, in2, sv); + cond = do_sub_cond(ctx, c * 2 + f, d, dest, in1, in2, sv); return do_cbranch(ctx, disp, n, &cond); }