From patchwork Wed Sep 4 19:29:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 172963 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:ce:0:0:0:0 with SMTP id r14csp351180ilq; Wed, 4 Sep 2019 12:32:14 -0700 (PDT) X-Google-Smtp-Source: APXvYqzpG4alZsUyyXrVwG0uu+h6J95sCzfhiMv+I2XWHjb6G1XXuCil2IINdnaNJ979gHqmhFL2 X-Received: by 2002:ac8:549:: with SMTP id c9mr40780004qth.223.1567625534437; Wed, 04 Sep 2019 12:32:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1567625534; cv=none; d=google.com; s=arc-20160816; b=l5nVwgOQAbNzLprj6bDZSeW/vtzrQiCo1rd2zqgTcJj74mZDFXdcLrmDgIGTMcz40I ZO0VC8hsalmhtgGHd++1eHEPN0dvwbB9nxZIrAWaYEoYGZgfMs8N+BHV+/lUqjTbIGJu 0+BZJG1Ob/WR6rHiQOW0OBZ/Iuoy/kTncGWAP1OF66FNcVB9scfYhUKHQZqsJlbIK+a5 mPOtmzxli+NoiLM3wEy8C03nYan/8c2nbWRAzfQFnFAHNNKfr30YUGHISzI3zupoNMX4 zHCPEz26ypjaUTPD16z51ohAw1Ei7+rMexCHFBrbxG/UHkJQV+UHOTS8vSL8YlxDG9Pl sJ0g== 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 :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=NBzAHUlZzheDevf0bsXniXn3jInVmGNWWYOMzwYImOs=; b=FKh6IH8eEt0BZpeDijsgxvXCfwYNGtAXvIcQLDixvF8Lo06IJ8w9Xl8eJSHX9kqv6Y WY6HwR8POuqJz/hP7x2VG8HPp6ZnhExxsI7f1qDHa4MGSmZibbUZ/EN9TI1pOKCKl8fP 2Xeqx5Kc5pTVAkqb1kRsx+OWnzCjheojafS9UCLfr5KrX9LJEXjuJnnrpvaunDrnfjsy CLfXnSmOeVmrzx+ebqHq3AEMqKqXtQGO4WWklUAJKNU3B4Jnwxogb+28Fn6bDRCAbOhg 5ijR+6B+35UFozWZncg3SQTXC1qn1hO5v5gBoCTxAYd3cHqWU1CqIXypJ2ld4T86VvBj xN9g== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=PKPWhUOf; 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 k52si1538286qvk.147.2019.09.04.12.32.14 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 04 Sep 2019 12:32:14 -0700 (PDT) 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=PKPWhUOf; 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 ([::1]:36942 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i5b0n-0004hO-8T for patch@linaro.org; Wed, 04 Sep 2019 15:32:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39694) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i5azj-000443-OW for qemu-devel@nongnu.org; Wed, 04 Sep 2019 15:31:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i5azh-000233-LJ for qemu-devel@nongnu.org; Wed, 04 Sep 2019 15:31:07 -0400 Received: from mail-pl1-x62f.google.com ([2607:f8b0:4864:20::62f]:34493) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i5azh-000223-DT for qemu-devel@nongnu.org; Wed, 04 Sep 2019 15:31:05 -0400 Received: by mail-pl1-x62f.google.com with SMTP id d3so14306plr.1 for ; Wed, 04 Sep 2019 12:31:05 -0700 (PDT) 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 :mime-version:content-transfer-encoding; bh=NBzAHUlZzheDevf0bsXniXn3jInVmGNWWYOMzwYImOs=; b=PKPWhUOfdKlfW1ND0j1hjvfaxn6oOmd+JQ5mkfiVBiWjXduZm8Yr8dNyFV3yPVjHYf A0FWvxcjlh+k3CzZdoFJDqeaCW2RD6xyTFzsimxjmx2ekolc5yxgC3BNu9ZXny+ZmyaF 4Sbx8AySsfE0aS+oxsWivlEOSLB4UFiWdkbP1gHYc4iZeRTSVNx76vmEfMzk6zEcFJCJ dOLal0p6Ic/udlEq+Oz/Qz101gDe6EUqhrMIqGVYkDwv4xA7C7VY6LNqUhS5zNFTb+1P gwUcJo2vZROoJ1BVteOzzGQoo7rVRPUMUAQQs2RfxfnFFCf/7xydmCJ7laCz6qPtw+GZ y7Mg== 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:mime-version:content-transfer-encoding; bh=NBzAHUlZzheDevf0bsXniXn3jInVmGNWWYOMzwYImOs=; b=nGtjEoi7Ccj9i22RRpPvmyIN6tSMrJONkceKAWvWho/UThmhZ+BgYVU44AS7eYdZs5 GcnCwu84B83OMjCP3ZoE7o4tujOXpvC6xAO8TMuF7CXCbKOqk31ZpdLIjNzM7C7sL2YP Tg1g+8lzpEBX+SSVr/i0XvPSx+Cw1c+GU0OtPsk3ouxVcPQxEMBdHlNOySCpsk+YRjSY rnqOBOl3T5mydjUBkKDshXopdC8KT0IF27V0Fug29Fk12WdVa3jANB2QwLnpSM4lCb4S avR3W6EML2reibyL7FBd4fp6CnmmTDMMH2LAubdArycBGJKgSiNhEh/9jI/DHijFsaEe 6vSw== X-Gm-Message-State: APjAAAW5ab1hqhjDFZVKHESoEamYq1EogKpiHOyZc7m66MNgBCDNNglV vbU9rJdBjL9MSG6s8jcHEas3LfiuE2w= X-Received: by 2002:a17:902:850a:: with SMTP id bj10mr2755063plb.254.1567625463978; Wed, 04 Sep 2019 12:31:03 -0700 (PDT) Received: from localhost.localdomain (97-113-7-119.tukw.qwest.net. [97.113.7.119]) by smtp.gmail.com with ESMTPSA id f6sm18999174pga.50.2019.09.04.12.31.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Sep 2019 12:31:03 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Wed, 4 Sep 2019 12:29:52 -0700 Message-Id: <20190904193059.26202-3-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190904193059.26202-1-richard.henderson@linaro.org> References: <20190904193059.26202-1-richard.henderson@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::62f Subject: [Qemu-devel] [PATCH v4 02/69] target/arm: Add stubs for aa32 decodetree X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, qemu-arm@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Add the infrastructure that will become the new decoder. No instructions adjusted so far. Reviewed-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Richard Henderson --- target/arm/translate.c | 31 ++++++++++++++++++++++++++++++- target/arm/Makefile.objs | 18 ++++++++++++++++++ target/arm/a32-uncond.decode | 23 +++++++++++++++++++++++ target/arm/a32.decode | 23 +++++++++++++++++++++++ target/arm/t32.decode | 20 ++++++++++++++++++++ 5 files changed, 114 insertions(+), 1 deletion(-) create mode 100644 target/arm/a32-uncond.decode create mode 100644 target/arm/a32.decode create mode 100644 target/arm/t32.decode -- 2.17.1 diff --git a/target/arm/translate.c b/target/arm/translate.c index a39f792463..07674d223c 100644 --- a/target/arm/translate.c +++ b/target/arm/translate.c @@ -7683,6 +7683,18 @@ static void arm_skip_unless(DisasContext *s, uint32_t cond) arm_gen_test_cc(cond ^ 1, s->condlabel); } +/* + * Include the generated decoders. + */ + +#include "decode-a32.inc.c" +#include "decode-a32-uncond.inc.c" +#include "decode-t32.inc.c" + +/* + * Legacy decoder. + */ + static void disas_arm_insn(DisasContext *s, unsigned int insn) { unsigned int cond, val, op1, i, shift, rm, rs, rn, rd, sh; @@ -7701,7 +7713,8 @@ static void disas_arm_insn(DisasContext *s, unsigned int insn) return; } cond = insn >> 28; - if (cond == 0xf){ + + if (cond == 0xf) { /* In ARMv3 and v4 the NV condition is UNPREDICTABLE; we * choose to UNDEF. In ARMv5 and above the space is used * for miscellaneous unconditional instructions. @@ -7709,6 +7722,11 @@ static void disas_arm_insn(DisasContext *s, unsigned int insn) ARCH(5); /* Unconditional instructions. */ + if (disas_a32_uncond(s, insn)) { + return; + } + /* fall back to legacy decoder */ + if (((insn >> 25) & 7) == 1) { /* NEON Data processing. */ if (!arm_dc_feature(s, ARM_FEATURE_NEON)) { @@ -7923,6 +7941,12 @@ static void disas_arm_insn(DisasContext *s, unsigned int insn) next instruction */ arm_skip_unless(s, cond); } + + if (disas_a32(s, insn)) { + return; + } + /* fall back to legacy decoder */ + if ((insn & 0x0f900000) == 0x03000000) { if ((insn & (1 << 21)) == 0) { ARCH(6T2); @@ -9414,6 +9438,11 @@ static void disas_thumb2_insn(DisasContext *s, uint32_t insn) ARCH(6T2); } + if (disas_t32(s, insn)) { + return; + } + /* fall back to legacy decoder */ + rn = (insn >> 16) & 0xf; rs = (insn >> 12) & 0xf; rd = (insn >> 8) & 0xf; diff --git a/target/arm/Makefile.objs b/target/arm/Makefile.objs index 5cafc1eb6c..7806b4dac0 100644 --- a/target/arm/Makefile.objs +++ b/target/arm/Makefile.objs @@ -28,9 +28,27 @@ target/arm/decode-vfp-uncond.inc.c: $(SRC_PATH)/target/arm/vfp-uncond.decode $(D $(PYTHON) $(DECODETREE) --static-decode disas_vfp_uncond -o $@ $<,\ "GEN", $(TARGET_DIR)$@) +target/arm/decode-a32.inc.c: $(SRC_PATH)/target/arm/a32.decode $(DECODETREE) + $(call quiet-command,\ + $(PYTHON) $(DECODETREE) --static-decode disas_a32 -o $@ $<,\ + "GEN", $(TARGET_DIR)$@) + +target/arm/decode-a32-uncond.inc.c: $(SRC_PATH)/target/arm/a32-uncond.decode $(DECODETREE) + $(call quiet-command,\ + $(PYTHON) $(DECODETREE) --static-decode disas_a32_uncond -o $@ $<,\ + "GEN", $(TARGET_DIR)$@) + +target/arm/decode-t32.inc.c: $(SRC_PATH)/target/arm/t32.decode $(DECODETREE) + $(call quiet-command,\ + $(PYTHON) $(DECODETREE) --static-decode disas_t32 -o $@ $<,\ + "GEN", $(TARGET_DIR)$@) + target/arm/translate-sve.o: target/arm/decode-sve.inc.c target/arm/translate.o: target/arm/decode-vfp.inc.c target/arm/translate.o: target/arm/decode-vfp-uncond.inc.c +target/arm/translate.o: target/arm/decode-a32.inc.c +target/arm/translate.o: target/arm/decode-a32-uncond.inc.c +target/arm/translate.o: target/arm/decode-t32.inc.c obj-y += tlb_helper.o debug_helper.o obj-y += translate.o op_helper.o diff --git a/target/arm/a32-uncond.decode b/target/arm/a32-uncond.decode new file mode 100644 index 0000000000..8dee26d3b6 --- /dev/null +++ b/target/arm/a32-uncond.decode @@ -0,0 +1,23 @@ +# A32 unconditional instructions +# +# Copyright (c) 2019 Linaro, Ltd +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, see . + +# +# This file is processed by scripts/decodetree.py +# +# All insns that have 0xf in insn[31:28] are decoded here. +# All of those that have a COND field in insn[31:28] are in a32.decode +# diff --git a/target/arm/a32.decode b/target/arm/a32.decode new file mode 100644 index 0000000000..a3e6e8c1c2 --- /dev/null +++ b/target/arm/a32.decode @@ -0,0 +1,23 @@ +# A32 conditional instructions +# +# Copyright (c) 2019 Linaro, Ltd +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, see . + +# +# This file is processed by scripts/decodetree.py +# +# All of the insn that have a COND field in insn[31:28] are here. +# All insns that have 0xf in insn[31:28] are in a32-uncond.decode. +# diff --git a/target/arm/t32.decode b/target/arm/t32.decode new file mode 100644 index 0000000000..ac01fb6958 --- /dev/null +++ b/target/arm/t32.decode @@ -0,0 +1,20 @@ +# Thumb2 instructions +# +# Copyright (c) 2019 Linaro, Ltd +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, see . + +# +# This file is processed by scripts/decodetree.py +#