From nobody Thu Nov 6 06:39:18 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1537177344322639.7003560610938; Mon, 17 Sep 2018 02:42:24 -0700 (PDT) Received: from localhost ([::1]:34677 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g1q2x-0005vr-4J for importer@patchew.org; Mon, 17 Sep 2018 05:42:23 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38662) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g1pwS-0000bT-Vt for qemu-devel@nongnu.org; Mon, 17 Sep 2018 05:35:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1g1pwP-000898-TK for qemu-devel@nongnu.org; Mon, 17 Sep 2018 05:35:40 -0400 Received: from mx1.redhat.com ([209.132.183.28]:43482) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1g1pwO-0007zj-JA; Mon, 17 Sep 2018 05:35:36 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id A92588666C; Mon, 17 Sep 2018 09:35:33 +0000 (UTC) Received: from t460s.redhat.com (ovpn-117-44.ams2.redhat.com [10.36.117.44]) by smtp.corp.redhat.com (Postfix) with ESMTP id B8EA753; Mon, 17 Sep 2018 09:35:30 +0000 (UTC) From: David Hildenbrand To: qemu-devel@nongnu.org Date: Mon, 17 Sep 2018 11:34:59 +0200 Message-Id: <20180917093459.28099-10-david@redhat.com> In-Reply-To: <20180917093459.28099-1-david@redhat.com> References: <20180917093459.28099-1-david@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Mon, 17 Sep 2018 09:35:33 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v3 9/9] s390x/tcg: refactor specification checking 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: Thomas Huth , David Hildenbrand , Cornelia Huck , Alexander Graf , Christian Borntraeger , qemu-s390x@nongnu.org, Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RDMRC_1 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" We can fit this nicely into less LOC, without harming readability. Reviewed-by: Richard Henderson Signed-off-by: David Hildenbrand Reviewed-by: Thomas Huth --- target/s390x/translate.c | 34 ++++++---------------------------- 1 file changed, 6 insertions(+), 28 deletions(-) diff --git a/target/s390x/translate.c b/target/s390x/translate.c index 5cc65b0840..6c6db47a82 100644 --- a/target/s390x/translate.c +++ b/target/s390x/translate.c @@ -6053,34 +6053,12 @@ static DisasJumpType translate_one(CPUS390XState *e= nv, DisasContext *s) =20 /* Check for insn specification exceptions. */ if (insn->spec) { - int spec =3D insn->spec, excp =3D 0, r; - - if (spec & SPEC_r1_even) { - r =3D get_field(&f, r1); - if (r & 1) { - excp =3D PGM_SPECIFICATION; - } - } - if (spec & SPEC_r2_even) { - r =3D get_field(&f, r2); - if (r & 1) { - excp =3D PGM_SPECIFICATION; - } - } - if (spec & SPEC_r3_even) { - r =3D get_field(&f, r3); - if (r & 1) { - excp =3D PGM_SPECIFICATION; - } - } - if (spec & SPEC_r1_f128 && !is_fp_pair(get_field(&f, r1))) { - excp =3D PGM_SPECIFICATION; - } - if (spec & SPEC_r2_f128 && !is_fp_pair(get_field(&f, r2))) { - excp =3D PGM_SPECIFICATION; - } - if (excp) { - gen_program_exception(s, excp); + if ((insn->spec & SPEC_r1_even && get_field(&f, r1) & 1) || + (insn->spec & SPEC_r2_even && get_field(&f, r2) & 1) || + (insn->spec & SPEC_r3_even && get_field(&f, r3) & 1) || + (insn->spec & SPEC_r1_f128 && !is_fp_pair(get_field(&f, r1))) = || + (insn->spec & SPEC_r2_f128 && !is_fp_pair(get_field(&f, r2))))= { + gen_program_exception(s, PGM_SPECIFICATION); return DISAS_NORETURN; } } --=20 2.17.1