From patchwork Thu Feb 14 19:05:41 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 158430 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp1753987jaa; Thu, 14 Feb 2019 11:14:34 -0800 (PST) X-Google-Smtp-Source: AHgI3IbtLF8eZQATFFUf4K1+jSOLEV/qRtGHcuFB6jlrYogrLW1Io5ZEuove0dws5zaL2U8iP1/5 X-Received: by 2002:a25:6041:: with SMTP id u62mr4827438ybb.149.1550171674026; Thu, 14 Feb 2019 11:14:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1550171674; cv=none; d=google.com; s=arc-20160816; b=c++Heevb3D37s0gSKJsaryQPRAJBLZusqba5e/C67NSFam/+5qXoRTLmPeMmPQBLgs 7OjBWGSFMU7rSWpFSFxOJJOoyQMzSM9sbQPa/iSH/Wx65YJWihYZqWEosyjv4HwmqJ5O ZaKeIhx7N4tud7PbV+ChHiNX+tcYQdraqZSP6CkBxipWG9G+CvJ4SaJOJDKQ84q9YpUa v0LaVETdG8F7gmrPkTKNZbS1WYfE5lH3DCVu+SlPRxP0295kapbRtWSozevIJNK53488 d9fltwbkQjCSLeJX0xvHlL03KpSJ7amSE5DIgprTzbjR+fnqigukwHjedoBoETINA64y KmWw== 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:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=6CWp2jMZ1lWV4cwZJWfDicUmqPN8SFFnI7dYAgqZ+iU=; b=uoa9i5r7CSjByeGiIv5reTlqCoxZafeGwmVjWz1Z2gd+/fldv/kQfrA+1UiabFSSWn 3gvZYP5cFTFZ21lz19EAVGsaHUeK4j4pMxenGeG31gI9G7TAqjhwnk2XNu7yHHOm3FWE SpN3U7ZJcWzugIgiEa9w0TvJ1P/9OMMqN3jOk79oZnmAFrjYOk3Ko6ZNLM/HfRZ48Ry9 iyn3yBYsLsWEZydDcL8CgTZmM/wAUAthwdzomhdJazAdXcITiuOL9wAsqd9obS/1ItJ+ x9dXxLbVW7awxbbz512aRbWZgFb4UtvzDEiJfk+xf2xEQkExgMgAau7cICd18QFpRR4L C9KQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=O5SwHNqG; 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=fail (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 x6si1985286ybx.476.2019.02.14.11.14.33 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 14 Feb 2019 11:14:34 -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=fail header.i=@linaro.org header.s=google header.b=O5SwHNqG; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([127.0.0.1]:53602 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1guMSv-0004xN-34 for patch@linaro.org; Thu, 14 Feb 2019 14:14:33 -0500 Received: from eggs.gnu.org ([209.51.188.92]:53801) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1guMKr-0007i8-Oy for qemu-devel@nongnu.org; Thu, 14 Feb 2019 14:06:14 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1guMKq-0004eq-VZ for qemu-devel@nongnu.org; Thu, 14 Feb 2019 14:06:13 -0500 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]:36381) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1guMKq-0004eN-P0 for qemu-devel@nongnu.org; Thu, 14 Feb 2019 14:06:12 -0500 Received: by mail-wr1-x42d.google.com with SMTP id o17so7731228wrw.3 for ; Thu, 14 Feb 2019 11:06:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=6CWp2jMZ1lWV4cwZJWfDicUmqPN8SFFnI7dYAgqZ+iU=; b=O5SwHNqGxc7lVQJozHoUF3ga1tnbU61Lw9qDPyQDTC+rGuCr4hIUqKCOOa9UQdP3hP BvGOG8lfbqgq1d+SCeAJ2Tyj1Ar0yQBERjDlZerbBssaQcjcl88Eqs7y1IbBFZJAme7Y F+3CtRa0nz59Y/mGq8WldATATX2UHy3eFGWOssl3t8bUjneI5e8rpuLTcfi0/kAYpzmO mYOYkeU1j9A0Dq4A8CM823jhYgxRVwSAjIkq/QfCTLNbir7I5gSH+YwY2TvD+9jDnTLa 0GQKVSi98KOR225nQFBCv+zXbTrnwLM5jNKu+UBpokXicTH9mHkRuDlc+v42g4ptbU89 xBVQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=6CWp2jMZ1lWV4cwZJWfDicUmqPN8SFFnI7dYAgqZ+iU=; b=XzbVSoIWIhZegDN2f0/t6tNoXVFY6ygYt33U8O42HKPwrk/b8EbHWGzki8pEoEpVNg P1vVyyQohn0Nny7mQPzQjfo7OlAPw3rMmNzoZ9i96DmocB7bCOs8/j26nnovOBYpKW51 xNSI2u7ZhjqzWWf/bfzTQ5/uVTlcE2HT4VUinDyyWZ0jAqj+QC1+k7nu08uGLdY5Zm2A yLxNkNIfOAx3RBj40jpxZ+f+MwlfMkd+RpKvghIcrXav6tORZS/AkdfbU799s8qVPpWy +8VNx/Psc8xAdljL1n+YxfwPNHyFOfhB2lOgiQE+Rnvg6Qvxe74+js1UqEfSJceu34ml INtA== X-Gm-Message-State: AHQUAubbFCu4gCeJrdDJ473hNWoFZcacJ1Mqw8u36AR9SaUS66+5MTQy r3pYLhJfaqAuhc96RYnDXM/D21B3oEG45g== X-Received: by 2002:adf:ecc6:: with SMTP id s6mr4059117wro.144.1550171171465; Thu, 14 Feb 2019 11:06:11 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id n184sm7798471wmf.5.2019.02.14.11.06.10 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 14 Feb 2019 11:06:10 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Date: Thu, 14 Feb 2019 19:05:41 +0000 Message-Id: <20190214190603.25030-6-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190214190603.25030-1-peter.maydell@linaro.org> References: <20190214190603.25030-1-peter.maydell@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42d Subject: [Qemu-devel] [PULL 05/27] target/arm: Restructure disas_fp_int_conv 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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Richard Henderson For opcodes 0-5, move some if conditions into the structure of a switch statement. For opcodes 6 & 7, decode everything at once with a second switch. Signed-off-by: Richard Henderson Message-id: 20190206052857.5077-3-richard.henderson@linaro.org Reviewed-by: Peter Maydell Signed-off-by: Peter Maydell --- target/arm/translate-a64.c | 94 ++++++++++++++++++++------------------ 1 file changed, 49 insertions(+), 45 deletions(-) -- 2.20.1 diff --git a/target/arm/translate-a64.c b/target/arm/translate-a64.c index e002251ac6f..2f849a6951d 100644 --- a/target/arm/translate-a64.c +++ b/target/arm/translate-a64.c @@ -6541,68 +6541,72 @@ static void disas_fp_int_conv(DisasContext *s, uint32_t insn) int type = extract32(insn, 22, 2); bool sbit = extract32(insn, 29, 1); bool sf = extract32(insn, 31, 1); + bool itof = false; if (sbit) { - unallocated_encoding(s); - return; + goto do_unallocated; } - if (opcode > 5) { - /* FMOV */ - bool itof = opcode & 1; - - if (rmode >= 2) { - unallocated_encoding(s); - return; - } - - switch (sf << 3 | type << 1 | rmode) { - case 0x0: /* 32 bit */ - case 0xa: /* 64 bit */ - case 0xd: /* 64 bit to top half of quad */ - break; - case 0x6: /* 16-bit float, 32-bit int */ - case 0xe: /* 16-bit float, 64-bit int */ - if (dc_isar_feature(aa64_fp16, s)) { - break; - } - /* fallthru */ - default: - /* all other sf/type/rmode combinations are invalid */ - unallocated_encoding(s); - return; - } - - if (!fp_access_check(s)) { - return; - } - handle_fmov(s, rd, rn, type, itof); - } else { - /* actual FP conversions */ - bool itof = extract32(opcode, 1, 1); - - if (rmode != 0 && opcode > 1) { - unallocated_encoding(s); - return; + switch (opcode) { + case 2: /* SCVTF */ + case 3: /* UCVTF */ + itof = true; + /* fallthru */ + case 4: /* FCVTAS */ + case 5: /* FCVTAU */ + if (rmode != 0) { + goto do_unallocated; } + /* fallthru */ + case 0: /* FCVT[NPMZ]S */ + case 1: /* FCVT[NPMZ]U */ switch (type) { case 0: /* float32 */ case 1: /* float64 */ break; case 3: /* float16 */ - if (dc_isar_feature(aa64_fp16, s)) { - break; + if (!dc_isar_feature(aa64_fp16, s)) { + goto do_unallocated; } - /* fallthru */ + break; default: - unallocated_encoding(s); - return; + goto do_unallocated; } - if (!fp_access_check(s)) { return; } handle_fpfpcvt(s, rd, rn, opcode, itof, rmode, 64, sf, type); + break; + + default: + switch (sf << 7 | type << 5 | rmode << 3 | opcode) { + case 0b01100110: /* FMOV half <-> 32-bit int */ + case 0b01100111: + case 0b11100110: /* FMOV half <-> 64-bit int */ + case 0b11100111: + if (!dc_isar_feature(aa64_fp16, s)) { + goto do_unallocated; + } + /* fallthru */ + case 0b00000110: /* FMOV 32-bit */ + case 0b00000111: + case 0b10100110: /* FMOV 64-bit */ + case 0b10100111: + case 0b11001110: /* FMOV top half of 128-bit */ + case 0b11001111: + if (!fp_access_check(s)) { + return; + } + itof = opcode & 1; + handle_fmov(s, rd, rn, type, itof); + break; + + default: + do_unallocated: + unallocated_encoding(s); + return; + } + break; } }