From patchwork Tue Mar 5 16:50:36 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 159688 Delivered-To: patch@linaro.org Received: by 2002:a02:5cc1:0:0:0:0:0 with SMTP id w62csp5194815jad; Tue, 5 Mar 2019 09:02:38 -0800 (PST) X-Google-Smtp-Source: APXvYqw9wIheWMtG83iAQNPykySE13aey/YyoQQ7weFyat64I0PlSKm0d+R60MIuaXkaXgE8Q7Of X-Received: by 2002:a25:418d:: with SMTP id o135mr2999476yba.365.1551805358177; Tue, 05 Mar 2019 09:02:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1551805358; cv=none; d=google.com; s=arc-20160816; b=WBN+9ZZ1n1L9OhDpSIr9IPcO/2hEUeLnrkDmWkFOBjAGM8Utex2JWUSpfXpS/VtduH ++1UTUVe4Ym6aMsBs68Ch1P4pH4CgsuW3oteVxBCBAiL26waQf9w+xqq+gx/nh8b0zvu B94NS7TkSNMLFz8OxeNGaOUFR8JeOTzs42Rjz+AeDubGxODiI4I8OU5UROH3lOxQdXPz DPS8kONjKfj+9crqLYJv6pFg5Yj43HSucmjgCKodWJaBpOR/Wsoo0zSUlsk/hpLt0Nrl OCqMYoXVIFxOdeYdelWiW4iI6TqC0p97Is4WlZvxFxwD43uHn8dwIJua9VcXADcb/W9k avrQ== 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=6okvE7uC7mBDYDrWvZ0cqfGHbi6R3ezFCBMDjGZAc2A=; b=DtPJC7XWbIc/pF5U0bmoP5t5jKd/WLgO0+RxKI0b+S6Q49Mtq0TidcRSZdcz5MyzaD c2m8Htck2c8fYrtJBhdTEapLu/zSWmsb1yJajyPSMNmbY3b4WL+DipijkevaqZi0K5dq KKaDF6YT10hEXwyf8dIANPbxfV6cvORQoJZxHftfUzG/emlc1bt5O26ZjT7GAAAmoAZ9 HSfSQDxL2pfaBliC8zrU/2ILiz/dj8cvjn8rhlGV+whqHHMj0gke0bA+JPP1vVun8/0o 24YJK23M+D2B11eAbFKQD54mWC5NVMyrpvn4imuySS0+grnTYALfueIWuPeqWzQfZrL0 0w+A== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=WBU4qNCg; 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 8si5367683ybf.253.2019.03.05.09.02.38 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 05 Mar 2019 09:02:38 -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=WBU4qNCg; 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]:45894 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1DSf-0001v5-KV for patch@linaro.org; Tue, 05 Mar 2019 12:02:37 -0500 Received: from eggs.gnu.org ([209.51.188.92]:54602) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1DHZ-0001dC-VN for qemu-devel@nongnu.org; Tue, 05 Mar 2019 11:51:12 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h1DHT-0000op-Vd for qemu-devel@nongnu.org; Tue, 05 Mar 2019 11:51:09 -0500 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]:41450) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h1DHT-0000nW-O2 for qemu-devel@nongnu.org; Tue, 05 Mar 2019 11:51:03 -0500 Received: by mail-wr1-x436.google.com with SMTP id n2so10244447wrw.8 for ; Tue, 05 Mar 2019 08:51:03 -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=6okvE7uC7mBDYDrWvZ0cqfGHbi6R3ezFCBMDjGZAc2A=; b=WBU4qNCgjrwmgFTvMSMCESN/6rDZc7V3eivFs+o7uCGeCLJ8mCnek3hOfxhpS245Ks y3oQDaqBitgdVrdTqyYZe+JGI1D6sNDQUSSTf/t4zfh+ryJOfFZpP2O30t7vqnFNoCZo Mrb+kBfjkB0NmAATCL56O/ktHg8MplhTps+VNi/JBRp+XOJ07IlLm9nAuGjeRpXlJ6nG vFAl7rfgwy5gDbI+2cufWxbhz48bBcMPprW5jdIOFp3ck6xToyiVTUur6weYPMzd2aNA Ti9NMXMF2dEcadhGWzcw+v3XF/wmrr22LUlZlMgZpi97+lZb/e0h0NNjMGvZ3RfngpK5 XOJQ== 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=6okvE7uC7mBDYDrWvZ0cqfGHbi6R3ezFCBMDjGZAc2A=; b=hZtz+YxWQZ5oc79e/XRyophH1HdVmJiHaAAWUlUx94S2DjgP1OPRD2iMqmO9CzoZto HN4yPvScQs8UN88141fHE/hFY0hP+bn+A7XMABbMy7zjLyXTw8awEMFK73oG32FtsOAR u+3Linyf17AML3wOhLzTQwA1P8dl0fxwWqjTZgOhNkAT1Hvy/+78gjVHdxbAwLxIbC3d 3mBXqAQfAOdvcFXcngW0UouMrkENB9GhQfC55kNwm9qv7kKXaZmpBXuOzgwKJ9moQ7uV QpG5DnR0L6mnT3DgVZS3NRcwuNdDWicuD1TisWUACH/YefR34wuoN1HAnYx5pbTHOrkm KwlA== X-Gm-Message-State: APjAAAV6j+Fwel02934MApk+8eLjR6vaL/wg9qH/0uNWEpEA1nqsGrIr TcHRcjSXrLHCw+urETSc60in7e2f1lo= X-Received: by 2002:adf:d0c9:: with SMTP id z9mr16805099wrh.132.1551804662472; Tue, 05 Mar 2019 08:51:02 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id 2sm10071495wrg.89.2019.03.05.08.51.01 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 05 Mar 2019 08:51:01 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Date: Tue, 5 Mar 2019 16:50:36 +0000 Message-Id: <20190305165051.26860-8-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190305165051.26860-1-peter.maydell@linaro.org> References: <20190305165051.26860-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::436 Subject: [Qemu-devel] [PULL 07/22] 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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Richard Henderson 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 Message-id: 20190301200501.16533-7-richard.henderson@linaro.org Reviewed-by: Peter Maydell Signed-off-by: Peter Maydell --- target/arm/translate-a64.c | 98 ++++++++++++++++++++++---------------- 1 file changed, 57 insertions(+), 41 deletions(-) -- 2.20.1 diff --git a/target/arm/translate-a64.c b/target/arm/translate-a64.c index eaeb43577df..12d2649c204 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; }