From patchwork Fri Mar 1 20:04:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 159513 Delivered-To: patch@linaro.org Received: by 2002:a02:5cc1:0:0:0:0:0 with SMTP id w62csp1146095jad; Fri, 1 Mar 2019 12:10:49 -0800 (PST) X-Google-Smtp-Source: APXvYqwW9NTo7QhqBmo/S9WzDKUpwp29E1eQz49K+h4TkGe7YWePLbHndoZhZ3dN8uNOLXMNAeee X-Received: by 2002:a25:10a:: with SMTP id 10mr5709953ybb.131.1551471048954; Fri, 01 Mar 2019 12:10:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1551471048; cv=none; d=google.com; s=arc-20160816; b=GDeJ0cMliCepb2Xp95sxtQRXYm6Iy+szW6RG2Eo8loIUBuK8pNbeR9KZfbRIxDF2WB oVonx7VXzO6V09q4QMJ8YYfyk1XJHIGzJlIppsiWZAZiWmeDNQG3cJ7p18B/qgFS0Tzi Dxz5HOHaa6//xC+1Fr+um8h5weN0QyIgtHJMlojbpBj5NQr6lPcXiOFj5YobwmQ9Ww9q OONmyfLqJyUYnHPLe5R4UEQqP5Oex2kZAfmSHb7pL8dghfq0kEArAQujgmkxMXVyqqEH 9EvJKbHShTiHvzjljQ4L6gKjNm/s1ZQpdTJ9XI4Y+zqP1lm9lOpCB6mEm7GQQAWrviIh f0yw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=7E29T0HDlFgU1q0mOVCwGp4O+vEXm9+HF8E2P+7ECrw=; b=Fk8kmjwdwwVliFLi9KKEy2RfNmn6b3Pi7osWKYPtZ0KpQHqlROVjffSwSDJ+gN59KN Svvx/OoNbqWHhWwCJw5B0h1CZ9ngfcoUOTbpmtbFW2sC0/tpsCTCu5ZTMALVgbIck2P7 it+GsuI6XY2GxN6LY/ClKgthYufkwGUmf0qnChzZJrOw0CtCu+yYQX2c8HCGVv1G+nKn u6molPxkAhf07QwDiWPbZkv37VWXoEQnS0fuwO0jN0kOzZEkiv1KN1HA1/cBcQGXCz01 4IAACS4fFAW43bNgeqnUgZsR36537ca9n7VkeGfWR4254bk+NmZgzz49iYi8LFkWohDS 1NXQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=OZJdylyr; 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 o7si11340201ybg.227.2019.03.01.12.10.48 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 01 Mar 2019 12:10:48 -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=OZJdylyr; 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]:43488 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gzoUa-0002FX-BW for patch@linaro.org; Fri, 01 Mar 2019 15:10:48 -0500 Received: from eggs.gnu.org ([209.51.188.92]:44870) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gzoPq-00058D-3v for qemu-devel@nongnu.org; Fri, 01 Mar 2019 15:05:55 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gzoPm-0002Dp-1h for qemu-devel@nongnu.org; Fri, 01 Mar 2019 15:05:51 -0500 Received: from mail-pf1-x42a.google.com ([2607:f8b0:4864:20::42a]:43172) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gzoPj-0001gz-HH for qemu-devel@nongnu.org; Fri, 01 Mar 2019 15:05:48 -0500 Received: by mail-pf1-x42a.google.com with SMTP id q17so11895252pfh.10 for ; Fri, 01 Mar 2019 12:05:14 -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=7E29T0HDlFgU1q0mOVCwGp4O+vEXm9+HF8E2P+7ECrw=; b=OZJdylyriVQkrsJgxYoBQuZ6G1bXa+MVszDqkFN3hitETosqtYhpvgMhs6Hgun4beP 2dwKUCAV/mjd1rb7A+fjRvlgHeFWkBm1xb0ICJMc2bY60ShJ6n+Rz7fXUJEdxHQaBma/ pqdnoBN9nFyK6NK406CqcAZ5wso24+IyruJNvxM+cT0/+q6oyNqXkpTUXtkGKh+KEme2 QzTxQwbs99PYyrwoJxXVga9rzKs8hLWKMiW885Mqh3FsGE+4XaMdjyUIMwCiD25y7zwI ZbIV/1yD2OD+byhQcQ1YhYq6NE6LSX556kkzSdznqNXsRG3tmjWKBVULgelrPLT6FHN+ tEiQ== 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=7E29T0HDlFgU1q0mOVCwGp4O+vEXm9+HF8E2P+7ECrw=; b=cgERdCxQEQV7S2n2XowChWTUavL8kGw/KqZkHSdmFVyQ5k3uvSP0VguQcNHu4e8uIO ERzFjLqdGXFpIq8vpwCDh+HkpSvJHpuyjb6cYMtJOylAtZpsgUd2YlI4jeSC4pKrKMd0 xWp9Bl429CasbzqnJDGJLEs1QiSPRdMjrmhDoYGsv1lpK3NpOLF7qAY44sR6UHAOK7AL jCc1+fnqZtasMgFymlQAqm+ccnp18LBLFFBT1a7AXmnvI1zrNyvd29y6vXd4iIU2BS0U WEDrxntTYjnA2kBZy90bpOTbQe0gvKATQQmgPKX0ZYDflaBJVzp64NvIqssmj5k3k11A qK+w== X-Gm-Message-State: APjAAAXvgTGevkJdst1vIAZSNr/AvxLJLSNTI6eLjL/loWgdLd7K7cvJ Wqs2LnPtpL0NX5w6GpqDwNj13aMc7gY= X-Received: by 2002:a65:6294:: with SMTP id f20mr6483452pgv.174.1551470713132; Fri, 01 Mar 2019 12:05:13 -0800 (PST) Received: from cloudburst.twiddle.net (cpe-72-132-238-51.dc.res.rr.com. [72.132.238.51]) by smtp.gmail.com with ESMTPSA id x8sm31869206pfn.137.2019.03.01.12.05.11 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 01 Mar 2019 12:05:12 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Fri, 1 Mar 2019 12:04:57 -0800 Message-Id: <20190301200501.16533-7-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20190301200501.16533-1-richard.henderson@linaro.org> References: <20190301200501.16533-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::42a Subject: [Qemu-devel] [PATCH v3 06/10] target/arm: Rearrange disas_data_proc_reg 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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" This decoding more closely matches the ARMv8.4 Table C4-6, Encoding table for Data Processing - Register Group. In particular, op2 == 0 is now more than just Add/sub (with carry). Signed-off-by: Richard Henderson --- target/arm/translate-a64.c | 98 ++++++++++++++++++++++---------------- 1 file changed, 57 insertions(+), 41 deletions(-) -- 2.17.2 diff --git a/target/arm/translate-a64.c b/target/arm/translate-a64.c index eaeb43577d..12d2649c20 100644 --- a/target/arm/translate-a64.c +++ b/target/arm/translate-a64.c @@ -4494,11 +4494,10 @@ static void disas_data_proc_3src(DisasContext *s, uint32_t insn) } /* Add/subtract (with carry) - * 31 30 29 28 27 26 25 24 23 22 21 20 16 15 10 9 5 4 0 - * +--+--+--+------------------------+------+---------+------+-----+ - * |sf|op| S| 1 1 0 1 0 0 0 0 | rm | opcode2 | Rn | Rd | - * +--+--+--+------------------------+------+---------+------+-----+ - * [000000] + * 31 30 29 28 27 26 25 24 23 22 21 20 16 15 10 9 5 4 0 + * +--+--+--+------------------------+------+-------------+------+-----+ + * |sf|op| S| 1 1 0 1 0 0 0 0 | rm | 0 0 0 0 0 0 | Rn | Rd | + * +--+--+--+------------------------+------+-------------+------+-----+ */ static void disas_adc_sbc(DisasContext *s, uint32_t insn) @@ -4506,11 +4505,6 @@ static void disas_adc_sbc(DisasContext *s, uint32_t insn) unsigned int sf, op, setflags, rm, rn, rd; TCGv_i64 tcg_y, tcg_rn, tcg_rd; - if (extract32(insn, 10, 6) != 0) { - unallocated_encoding(s); - return; - } - sf = extract32(insn, 31, 1); op = extract32(insn, 30, 1); setflags = extract32(insn, 29, 1); @@ -5164,47 +5158,69 @@ static void disas_data_proc_2src(DisasContext *s, uint32_t insn) } } -/* Data processing - register */ +/* + * Data processing - register + * 31 30 29 28 25 21 20 16 10 0 + * +--+---+--+---+-------+-----+-------+-------+---------+ + * | |op0| |op1| 1 0 1 | op2 | | op3 | | + * +--+---+--+---+-------+-----+-------+-------+---------+ + */ static void disas_data_proc_reg(DisasContext *s, uint32_t insn) { - switch (extract32(insn, 24, 5)) { - case 0x0a: /* Logical (shifted register) */ - disas_logic_reg(s, insn); - break; - case 0x0b: /* Add/subtract */ - if (insn & (1 << 21)) { /* (extended register) */ - disas_add_sub_ext_reg(s, insn); + int op0 = extract32(insn, 30, 1); + int op1 = extract32(insn, 28, 1); + int op2 = extract32(insn, 21, 4); + int op3 = extract32(insn, 10, 6); + + if (!op1) { + if (op2 & 8) { + if (op2 & 1) { + /* Add/sub (extended register) */ + disas_add_sub_ext_reg(s, insn); + } else { + /* Add/sub (shifted register) */ + disas_add_sub_reg(s, insn); + } } else { - disas_add_sub_reg(s, insn); + /* Logical (shifted register) */ + disas_logic_reg(s, insn); } - break; - case 0x1b: /* Data-processing (3 source) */ - disas_data_proc_3src(s, insn); - break; - case 0x1a: - switch (extract32(insn, 21, 3)) { - case 0x0: /* Add/subtract (with carry) */ + return; + } + + switch (op2) { + case 0x0: + switch (op3) { + case 0x00: /* Add/subtract (with carry) */ disas_adc_sbc(s, insn); break; - case 0x2: /* Conditional compare */ - disas_cc(s, insn); /* both imm and reg forms */ - break; - case 0x4: /* Conditional select */ - disas_cond_select(s, insn); - break; - case 0x6: /* Data-processing */ - if (insn & (1 << 30)) { /* (1 source) */ - disas_data_proc_1src(s, insn); - } else { /* (2 source) */ - disas_data_proc_2src(s, insn); - } - break; + default: - unallocated_encoding(s); - break; + goto do_unallocated; } break; + + case 0x2: /* Conditional compare */ + disas_cc(s, insn); /* both imm and reg forms */ + break; + + case 0x4: /* Conditional select */ + disas_cond_select(s, insn); + break; + + case 0x6: /* Data-processing */ + if (op0) { /* (1 source) */ + disas_data_proc_1src(s, insn); + } else { /* (2 source) */ + disas_data_proc_2src(s, insn); + } + break; + case 0x8 ... 0xf: /* (3 source) */ + disas_data_proc_3src(s, insn); + break; + default: + do_unallocated: unallocated_encoding(s); break; }