From nobody Sat Apr 27 07:04:54 2024 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; dkim=fail; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1510066733333497.8968100099888; Tue, 7 Nov 2017 06:58:53 -0800 (PST) Received: from localhost ([::1]:53801 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eC5Km-0003P8-F6 for importer@patchew.org; Tue, 07 Nov 2017 09:58:36 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59805) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eC5IA-0001We-As for qemu-devel@nongnu.org; Tue, 07 Nov 2017 09:55:59 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eC5I6-0002VL-9p for qemu-devel@nongnu.org; Tue, 07 Nov 2017 09:55:54 -0500 Received: from mail-wm0-x243.google.com ([2a00:1450:400c:c09::243]:45406) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eC5I6-0002UV-4I for qemu-devel@nongnu.org; Tue, 07 Nov 2017 09:55:50 -0500 Received: by mail-wm0-x243.google.com with SMTP id y80so4311185wmd.0 for ; Tue, 07 Nov 2017 06:55:49 -0800 (PST) Received: from cloudburst.twiddle.net (93-45-2-58.ip99.fastwebnet.it. [93.45.2.58]) by smtp.gmail.com with ESMTPSA id 80sm3018936wmk.14.2017.11.07.06.55.47 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 07 Nov 2017 06:55: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; bh=mfgsPB6+l7WnDXJaLuWQoaHbQXvHFVta7BQ3O5GjMiM=; b=fSYtaa38ltcKytLyDB+F+ajlrt3VuKpB2y05QuCSdHWMa+pkUyRVdPicaW1PhptVeM VCYfuAco9RsFQVzLlcjFJY+DnCxyWycLWeqt7uLApnrVDUb4AZqQ7Hr5pI+1DyGIWUoD oI7OGguAcj5fBpYxckjZnpq3B+KeRJhzvtcDw= 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; bh=mfgsPB6+l7WnDXJaLuWQoaHbQXvHFVta7BQ3O5GjMiM=; b=OwrmMZcgJ8pyEX9AXd7DWDrkch4ECfwoJz4jsIlQGm/kUfitcEQN0Vj0+rXUUe4vjf oBU3pfTH17gyfPPM5nFQCI/IzDcQmvLnSoOg0OTJmWM+ORMZFasnXD8XCYYp0xUklGY6 wKrcJW4+7+iaOwr9QZ8XI42Tva5OFFATk1UVy7bKVfFQ7WiN8gRZQlVJ8CQaIjo8URY+ bUvNP3+tcmi90WpX0YcfsgKRZ/FFGbkS8PormCFSXG+H1mNdizk53zgW1r89A0Ifo91O nCbfU3xBh7fbfRxBj/JvuVwNqR+0vW768SgUUCJBiAhLlvtzbbUZKEGom3BCt3NXSuD0 OWHg== X-Gm-Message-State: AJaThX5t+iDcEM1AlU+wzVSlUMMfvAWk5c79cM6ol1ggXM4TW2v96QPu piYoNSY6y5utJY0v60Y/1LfjlE3jtQ7D4A== X-Google-Smtp-Source: ABhQp+SbN23Y0gPnvWy+V0mPsgUaWodgAwctBYXwg4p542LstglIVOrKD0zBqcH9972H1lR7+XA1Xw== X-Received: by 10.28.146.20 with SMTP id u20mr1822884wmd.49.1510066548711; Tue, 07 Nov 2017 06:55:48 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Tue, 7 Nov 2017 15:55:46 +0100 Message-Id: <20171107145546.767-1-richard.henderson@linaro.org> X-Mailer: git-send-email 2.13.6 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::243 Subject: [Qemu-devel] [PATCH] target/s390x: Finish implementing RISBGN 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, qemu-s390x@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" We added the entry to insn-data.def, but failed to update op_risbg to match. No need to special-case the imask inversion, since that is already ~0 for RISBG (and now RISBGN). Fixes: 375ee58bedcda359011fe7fa99e0647f66f9ffa0 Fixes: https://bugs.launchpad.net/qemu/+bug/1701798 (s390x part) Signed-off-by: Richard Henderson Reviewed-by: Thomas Huth Tested-by: Peter Maydell --- target/s390x/translate.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/target/s390x/translate.c b/target/s390x/translate.c index dee72a787d..85d0a6c3af 100644 --- a/target/s390x/translate.c +++ b/target/s390x/translate.c @@ -3432,6 +3432,7 @@ static ExitStatus op_risbg(DisasContext *s, DisasOps = *o) /* Adjust the arguments for the specific insn. */ switch (s->fields->op2) { case 0x55: /* risbg */ + case 0x59: /* risbgn */ i3 &=3D 63; i4 &=3D 63; pmask =3D ~0; @@ -3447,7 +3448,7 @@ static ExitStatus op_risbg(DisasContext *s, DisasOps = *o) pmask =3D 0x00000000ffffffffull; break; default: - abort(); + g_assert_not_reached(); } =20 /* MASK is the set of bits to be inserted from R2. @@ -3464,11 +3465,7 @@ static ExitStatus op_risbg(DisasContext *s, DisasOps= *o) insns, we need to keep the other half of the register. */ imask =3D ~mask | ~pmask; if (do_zero) { - if (s->fields->op2 =3D=3D 0x55) { - imask =3D 0; - } else { - imask =3D ~pmask; - } + imask =3D ~pmask; } =20 len =3D i4 - i3 + 1; --=20 2.13.6