From nobody Tue Feb 10 07:57:35 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1549947607354652.2568249121537; Mon, 11 Feb 2019 21:00:07 -0800 (PST) Received: from localhost ([127.0.0.1]:33100 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gtQAo-0003rK-7J for importer@patchew.org; Mon, 11 Feb 2019 23:59:58 -0500 Received: from eggs.gnu.org ([209.51.188.92]:49428) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gtQ8p-0002Yn-1Q for qemu-devel@nongnu.org; Mon, 11 Feb 2019 23:57:59 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gtQ8m-0001qB-Ew for qemu-devel@nongnu.org; Mon, 11 Feb 2019 23:57:54 -0500 Received: from mail-pl1-x62d.google.com ([2607:f8b0:4864:20::62d]:35482) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gtQ8l-0001l9-UR for qemu-devel@nongnu.org; Mon, 11 Feb 2019 23:57:52 -0500 Received: by mail-pl1-x62d.google.com with SMTP id p8so699870plo.2 for ; Mon, 11 Feb 2019 20:57:50 -0800 (PST) Received: from cloudburst.twiddle.net (97-113-188-82.tukw.qwest.net. [97.113.188.82]) by smtp.gmail.com with ESMTPSA id a90sm22088923pfj.109.2019.02.11.20.57.48 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 11 Feb 2019 20:57:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Gab4q+souKMwfqcQz6lLJipGKidhO3tjj7AL05WIP4o=; b=tNlgsIRXWlIUQce0u3NHkYpATFcIwayyL9OYWhiuaWEkFL+WyDUVPeWk83fWLt3OwX tttbopRZB+1V9mPh7AUeepycByOx6NwtxR17tFOmyGUMIq6KNEQVmdLJ05EtOU61wbbD dArKKXy3Dinx8uJMyaeTNcGFp1gMxApoOE19REHi2ELKaPE/2M9OsBta/rgjgHu6ek0D s8NPvvKzDv0xXUst/NTPd3VypL6YQJ16ogz0cSkCTjPIL4RXKJWdm2wtIHjF1W04pPQg 84FP0LilTtduVEhjh53hRveyOxdQ//vmwoCLA3cUgB9+7Y8Dps8/qPIYXzymUDndqvcn 9kbA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Gab4q+souKMwfqcQz6lLJipGKidhO3tjj7AL05WIP4o=; b=c+hs7/QKXA/rx4Oc23s9leD+WwiVDdkWIPKZ2EbccB9K4pnUDahmU9sPpTYp6rr+Ds TLvCNDHugsQ6W2KAGGJ5pOFoObqCc5QC9RQRjyLlgJyyDXWOTHmMw7n8/CuIe3aJ9k1N BKlQJ5nxWTNmItQd6ZbNjTCi19m/Axdy1aAm/mE/l2cm/muXIVZ/ldYkvcM9QNSW/pm+ dz2itDAeEcXxkerHK2C3RPOrD0mICJm30Vdlo67c8LJD3+Wn0AK/RJLjtcgd3ggrsuKt SUJJOWA4E8H0xnFu4L8nybTKeWQLpC5DjYZMcKkW3kocFMxB1AVEP/aU7lP35sT1iCVM hoyA== X-Gm-Message-State: AHQUAuahWo/DU323TlPppW4MW4cC7CqS0C29FjxFtBoVZDz6j5U0XqBR KHf+c8hHKmL72ZHA5ZOcHeMf8b0xNxs= X-Google-Smtp-Source: AHgI3IZHAy14d/xGqIPeb/CXm1EMmOw2CuvW4vJwalEsrov9GiQ7D1/UrxCPq6TlhXZ8CJ9h8KW1Jw== X-Received: by 2002:a17:902:128c:: with SMTP id g12mr2049588pla.146.1549947469420; Mon, 11 Feb 2019 20:57:49 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Mon, 11 Feb 2019 20:57:18 -0800 Message-Id: <20190212045721.28041-22-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20190212045721.28041-1-richard.henderson@linaro.org> References: <20190212045721.28041-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::62d Subject: [Qemu-devel] [PULL 21/24] target/hppa: Rearrange log conditions X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" We will be fixing do_cond vs signed overflow, which requires that do_log_cond not rely on do_cond. Signed-off-by: Richard Henderson --- target/hppa/translate.c | 56 +++++++++++++++++++++++++++++++++++------ 1 file changed, 49 insertions(+), 7 deletions(-) diff --git a/target/hppa/translate.c b/target/hppa/translate.c index 6836fb6245..aae5714235 100644 --- a/target/hppa/translate.c +++ b/target/hppa/translate.c @@ -432,6 +432,15 @@ static DisasCond cond_make_f(void) }; } =20 +static DisasCond cond_make_t(void) +{ + return (DisasCond){ + .c =3D TCG_COND_ALWAYS, + .a0 =3D NULL, + .a1 =3D NULL, + }; +} + static DisasCond cond_make_n(void) { return (DisasCond){ @@ -930,17 +939,50 @@ static DisasCond do_sub_cond(unsigned cf, TCGv_reg re= s, return cond; } =20 -/* Similar, but for logicals, where the carry and overflow bits are not - computed, and use of them is undefined. */ +/* + * Similar, but for logicals, where the carry and overflow bits are not + * computed, and use of them is undefined. + * + * Undefined or not, hardware does not trap. It seems reasonable to + * assume hardware treats cases c=3D{4,5,6} as if C=3D0 & V=3D0, since tha= t's + * how cases c=3D{2,3} are treated. + */ =20 static DisasCond do_log_cond(unsigned cf, TCGv_reg res) { - switch (cf >> 1) { - case 4: case 5: case 6: - cf &=3D 1; - break; + switch (cf) { + case 0: /* never */ + case 9: /* undef, C */ + case 11: /* undef, C & !Z */ + case 12: /* undef, V */ + return cond_make_f(); + + case 1: /* true */ + case 8: /* undef, !C */ + case 10: /* undef, !C | Z */ + case 13: /* undef, !V */ + return cond_make_t(); + + case 2: /* =3D=3D */ + return cond_make_0(TCG_COND_EQ, res); + case 3: /* <> */ + return cond_make_0(TCG_COND_NE, res); + case 4: /* < */ + return cond_make_0(TCG_COND_LT, res); + case 5: /* >=3D */ + return cond_make_0(TCG_COND_GE, res); + case 6: /* <=3D */ + return cond_make_0(TCG_COND_LE, res); + case 7: /* > */ + return cond_make_0(TCG_COND_GT, res); + + case 14: /* OD */ + case 15: /* EV */ + return do_cond(cf, res, NULL, NULL); + + default: + g_assert_not_reached(); } - return do_cond(cf, res, res, res); } =20 /* Similar, but for shift/extract/deposit conditions. */ --=20 2.17.2