From patchwork Sat Feb 23 23:29:48 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 10827639 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 1B38A1399 for ; Sat, 23 Feb 2019 23:31:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 09AC32C095 for ; Sat, 23 Feb 2019 23:31:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id F0FCE2C09D; Sat, 23 Feb 2019 23:31:56 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id E515A2C095 for ; Sat, 23 Feb 2019 23:31:55 +0000 (UTC) Received: from localhost ([127.0.0.1]:43847 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gxglv-0001eG-5q for patchwork-qemu-devel@patchwork.kernel.org; Sat, 23 Feb 2019 18:31:55 -0500 Received: from eggs.gnu.org ([209.51.188.92]:45401) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gxgkA-0000P9-SQ for qemu-devel@nongnu.org; Sat, 23 Feb 2019 18:30:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gxgk9-0007N4-Ja for qemu-devel@nongnu.org; Sat, 23 Feb 2019 18:30:06 -0500 Received: from mail-pl1-x62f.google.com ([2607:f8b0:4864:20::62f]:37463) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gxgk9-0007D0-4P for qemu-devel@nongnu.org; Sat, 23 Feb 2019 18:30:05 -0500 Received: by mail-pl1-x62f.google.com with SMTP id q3so2767397pll.4 for ; Sat, 23 Feb 2019 15:29:59 -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 :mime-version:content-transfer-encoding; bh=fhoI/x8s+ztOp9CjjXctFe5atezVcR7mpjbx/GoY33A=; b=L0nvKaQVvvfIVro2GwtFQ4q0Jo8bUPV00AwDABPdeenDkJ/eXeNUE9aTsdfXUMBb8d ibGSiot+/R4p7W0tnBbeoAp6+BmnrjD3TqUR2w80BUFIeZW7+++SjYUuBPQnlt28VPTQ gcUouHy2oNei6HMVuPb3h5E6z21cB1gm3i54Qcw/BOm7Wjh+1LjZ/dAABWmnXnIXxbSq tlCR3yxVY+Du7nr7XoVRYDTdr65T/vlYlEt3V5/y7FOuCsNcEjv28p2ldRL3pJAAHsAM Fj4IQ0erJA1B3hW8UQ/aFp1xnQakbsinRcq8EdFKVe5TIopvTVXOvKrB9tJCltSHVpJj nhww== 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=fhoI/x8s+ztOp9CjjXctFe5atezVcR7mpjbx/GoY33A=; b=KmXHxA+05tTancwmutVaeSz1pO1tm1Ck1S/r/WPWqqjSh7x/0PKwAf9DXyiwzmJQIl RMZeQDUeSL6PTeUJcYZDJugL4zdSGf9tCLJ2U2OiZVyDIZIS1KAALR9N5lwqBGQ7ovYp NRHctnyEnpoZTb4YpkiGmjd6E52A008qDW72QpYIif1BmKUS1vIKE+scGs9l88bZvnvu 7pgehvDmO7umsmNpX09OZujQzvrGuAOq3uCvoqsEUOWBxlPjElMCn/c3097+PZwr553W rymkBdppq/wYdFXFlX9eNMQ0iVRBvQYcC1fPFsWwj/pqJlRRXqG9VDslUkVJK0x7vSxt OpPw== X-Gm-Message-State: AHQUAuapZWoVzlfart77yO6eHDbBjysvZIMHsOmUZQ/ILigBD64DBg72 chl3HMWraP6CMfi0YTOHU7p3g2dhM6c= X-Google-Smtp-Source: AHgI3Ibk4UcLjCxcK13fzlqSHsIGLb1UYO7IBDxj7iLoSxAIumgcJN5gj0liaKKW7CfBBw8e6OHCrw== X-Received: by 2002:a17:902:f302:: with SMTP id gb2mr11695016plb.51.1550964597905; Sat, 23 Feb 2019 15:29:57 -0800 (PST) Received: from cloudburst.twiddle.net (97-113-188-82.tukw.qwest.net. [97.113.188.82]) by smtp.gmail.com with ESMTPSA id n1sm13214842pfi.123.2019.02.23.15.29.56 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 23 Feb 2019 15:29:57 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Sat, 23 Feb 2019 15:29:48 -0800 Message-Id: <20190223232954.7185-2-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20190223232954.7185-1-richard.henderson@linaro.org> References: <20190223232954.7185-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 1/5] MAINTAINERS: Add scripts/decodetree.py to the TCG section 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: kbastian@mail.uni-paderborn.de, f4bug@amsat.org Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Philippe Mathieu-Daudé Signed-off-by: Philippe Mathieu-Daudé Message-Id: <20181110211313.6922-2-f4bug@amsat.org> Signed-off-by: Richard Henderson --- MAINTAINERS | 1 + 1 file changed, 1 insertion(+) diff --git a/MAINTAINERS b/MAINTAINERS index b1d786cfd8..ad007748b9 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -117,6 +117,7 @@ F: cpus.c F: exec.c F: accel/tcg/ F: accel/stubs/tcg-stub.c +F: scripts/decodetree.py F: include/exec/cpu*.h F: include/exec/exec-all.h F: include/exec/helper*.h From patchwork Sat Feb 23 23:29:49 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 10827649 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 15A8C1823 for ; Sat, 23 Feb 2019 23:35:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 03ED52BB11 for ; Sat, 23 Feb 2019 23:35:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E964E2C0C5; Sat, 23 Feb 2019 23:34:59 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 04A512BB11 for ; Sat, 23 Feb 2019 23:34:59 +0000 (UTC) Received: from localhost ([127.0.0.1]:43871 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gxgos-0003iC-9V for patchwork-qemu-devel@patchwork.kernel.org; Sat, 23 Feb 2019 18:34:58 -0500 Received: from eggs.gnu.org ([209.51.188.92]:45444) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gxgkB-0000PU-VC for qemu-devel@nongnu.org; Sat, 23 Feb 2019 18:30:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gxgk9-0007MK-EF for qemu-devel@nongnu.org; Sat, 23 Feb 2019 18:30:07 -0500 Received: from mail-pf1-x431.google.com ([2607:f8b0:4864:20::431]:42745) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gxgk9-0007Dt-0N for qemu-devel@nongnu.org; Sat, 23 Feb 2019 18:30:05 -0500 Received: by mail-pf1-x431.google.com with SMTP id n74so2756248pfi.9 for ; Sat, 23 Feb 2019 15:30:00 -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=HKSvj4r8o2dTGsEq9SDT2x9u3QDLjjeX50th4Cjox94=; b=KeFy7SE0kgL95z5yzIptAZp/6OYVoY+vpNM2ybBfUhxQ2rhNSnGAPTQ77KqmwKEMu4 65euuZcdnZjY/SLxkuznBaBwy42jqG8RY0COn7/QvNnSZeGji3sXugMXblk/GOZ1P3mZ TcXyXSrAJMLudrZOTvwLefDOz9JKq+O8xMwGLmOUdz/JC7aV8uuNUdAr/DL4T8+jaK08 C4qrMjMpFfDNwaVqPS52pxSB961xM80whwYtZpeIiC51TPGRZisZBIIyxrBuYUGmX59a FlN9mF+fkxMa/4CVt3x3VVXG5dC4O5YphkqysnEFgM4I6KPoSHJ8Rb+lWwqT2gBEV0GY Z/ow== 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=HKSvj4r8o2dTGsEq9SDT2x9u3QDLjjeX50th4Cjox94=; b=DcVWbHiM+3QnW6rt+Rt3UmBqSsmx3AKjwRKaU7JUnGN9CNLbw8LJjEUBaqi4WG99AC H7jxzxcxuTxRCchxyaR9I0yPNaKbe7X5iYOb0DSsl9FswXMCaYriwdKMvlogR6+Iszx+ 8qwdwzm7mALHqfwoRyvFuZfMpSNzmWs+RUwhj+uh3JiXBgAkjrwDDHXDODOlLyO+BZmC EYvIctHILKeHGQZeroZzfNYcPkQzcAuvUB+P4CnrMOS8Fu1QSiYLtUeZk2z0KRdP0DuN M2eqBqxWDLAxDWuUAGBOlpCFyBfgtGCX68qrRPrjd4GBTzX6GGMIHHHSqum19foA6P0l 9DQg== X-Gm-Message-State: AHQUAuZIPXfCJjOg+fIIRWA+RhibO6DRai9CqDoMLfxiOp7T31d9XmIu TffENWCSWATFTzhStp2hNBXLcJAnQEQ= X-Google-Smtp-Source: AHgI3IZsGQ3FmJx33Jen0T54BVwYVlaGAQtpX+0cINu5BVvyJMzSey0sqoSXU4ZHPZVaUTdHEipoEA== X-Received: by 2002:a63:5c66:: with SMTP id n38mr7487216pgm.15.1550964599288; Sat, 23 Feb 2019 15:29:59 -0800 (PST) Received: from cloudburst.twiddle.net (97-113-188-82.tukw.qwest.net. [97.113.188.82]) by smtp.gmail.com with ESMTPSA id n1sm13214842pfi.123.2019.02.23.15.29.58 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 23 Feb 2019 15:29:58 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Sat, 23 Feb 2019 15:29:49 -0800 Message-Id: <20190223232954.7185-3-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20190223232954.7185-1-richard.henderson@linaro.org> References: <20190223232954.7185-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::431 Subject: [Qemu-devel] [PATCH 2/5] decodetree: Move documentation to docs/decodetree.rst 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: kbastian@mail.uni-paderborn.de, f4bug@amsat.org Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP One great big block comment isn't the best way to document the syntax of a language. Signed-off-by: Richard Henderson --- MAINTAINERS | 1 + docs/decodetree.rst | 156 ++++++++++++++++++++++++++++++++++++++++++ scripts/decodetree.py | 134 +----------------------------------- 3 files changed, 158 insertions(+), 133 deletions(-) create mode 100644 docs/decodetree.rst diff --git a/MAINTAINERS b/MAINTAINERS index ad007748b9..fc7cddb873 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -118,6 +118,7 @@ F: exec.c F: accel/tcg/ F: accel/stubs/tcg-stub.c F: scripts/decodetree.py +F: docs/decodetree.rst F: include/exec/cpu*.h F: include/exec/exec-all.h F: include/exec/helper*.h diff --git a/docs/decodetree.rst b/docs/decodetree.rst new file mode 100644 index 0000000000..d9be30b2db --- /dev/null +++ b/docs/decodetree.rst @@ -0,0 +1,156 @@ +======================== +Decodetree Specification +======================== + +A *decodetree* is built from instruction *patterns*. A pattern may +represent a single architectural instruction or a group of same, depending +on what is convenient for further processing. + +Each pattern has both *fixedbits* and *fixedmask*, the combination of which +describes the condition under which the pattern is matched:: + + (insn & fixedmask) == fixedbits + +Each pattern may have *fields*, which are extracted from the insn and +passed along to the translator. Examples of such are registers, +immediates, and sub-opcodes. + +In support of patterns, one may declare *fields*, *argument sets*, and +*formats*, each of which may be re-used to simplify further definitions. + +Fields +====== + +Syntax:: + + field_def := '%' identifier ( unnamed_field )+ ( !function=identifier )? + unnamed_field := number ':' ( 's' ) number + +For *unnamed_field*, the first number is the least-significant bit position +of the field and the second number is the length of the field. If the 's' is +present, the field is considered signed. If multiple ``unnamed_fields`` are +present, they are concatenated. In this way one can define disjoint fields. + +If ``!function`` is specified, the concatenated result is passed through the +named function, taking and returning an integral value. + +FIXME: the fields of the structure into which this result will be stored +is restricted to ``int``. Which means that we cannot expand 64-bit items. + +Field examples: + ++---------------------------+---------------------------------------------+ +| Input | Generated code | ++===========================+=============================================+ +| %disp 0:s16 | sextract(i, 0, 16) | ++---------------------------+---------------------------------------------+ +| %imm9 16:6 10:3 | extract(i, 16, 6) << 3 | extract(i, 10, 3) | ++---------------------------+---------------------------------------------+ +| %disp12 0:s1 1:1 2:10 | sextract(i, 0, 1) << 11 | | +| | extract(i, 1, 1) << 10 | | +| | extract(i, 2, 10) | ++---------------------------+---------------------------------------------+ +| %shimm8 5:s8 13:1 | expand_shimm8(sextract(i, 5, 8) << 1 | | +| !function=expand_shimm8 | extract(i, 13, 1)) | ++---------------------------+---------------------------------------------+ + +Argument Sets +============= + +Syntax:: + + args_def := '&' identifier ( args_elt )+ ( !extern )? + args_elt := identifier + +Each *args_elt* defines an argument within the argument set. +Each argument set will be rendered as a C structure "arg_$name" +with each of the fields being one of the member arguments. + +If ``!extern`` is specified, the backing structure is assumed +to have been already declared, typically via a second decoder. + +Argument set examples:: + + ®3 ra rb rc + &loadstore reg base offset + + +Formats +======= + +Syntax:: + + fmt_def := '@' identifier ( fmt_elt )+ + fmt_elt := fixedbit_elt | field_elt | field_ref | args_ref + fixedbit_elt := [01.-]+ + field_elt := identifier ':' 's'? number + field_ref := '%' identifier | identifier '=' '%' identifier + args_ref := '&' identifier + +Defining a format is a handy way to avoid replicating groups of fields +across many instruction patterns. + +A *fixedbit_elt* describes a contiguous sequence of bits that must +be 1, 0, or don't care. The difference between '.' and '-' +is that '.' means that the bit will be covered with a field or a +final 0 or 1 from the pattern, and '-' means that the bit is really +ignored by the cpu and will not be specified. + +A *field_elt* describes a simple field only given a width; the position of +the field is implied by its position with respect to other *fixedbit_elt* +and *field_elt*. + +If any *fixedbit_elt* or *field_elt* appear, then all bits must be defined. +Padding with a *fixedbit_elt* of all '.' is an easy way to accomplish that. + +A *field_ref* incorporates a field by reference. This is the only way to +add a complex field to a format. A field may be renamed in the process +via assignment to another identifier. This is intended to allow the +same argument set be used with disjoint named fields. + +A single *args_ref* may specify an argument set to use for the format. +The set of fields in the format must be a subset of the arguments in +the argument set. If an argument set is not specified, one will be +inferred from the set of fields. + +It is recommended, but not required, that all *field_ref* and *args_ref* +appear at the end of the line, not interleaving with *fixedbit_elf* or +*field_elt*. + +Format examples:: + + @opr ...... ra:5 rb:5 ... 0 ....... rc:5 + @opi ...... ra:5 lit:8 1 ....... rc:5 + +Patterns +======== + +Syntax:: + + pat_def := identifier ( pat_elt )+ + pat_elt := fixedbit_elt | field_elt | field_ref | args_ref | fmt_ref | const_elt + fmt_ref := '@' identifier + const_elt := identifier '=' number + +The *fixedbit_elt* and *field_elt* specifiers are unchanged from formats. +A pattern that does not specify a named format will have one inferred +from a referenced argument set (if present) and the set of fields. + +A *const_elt* allows a argument to be set to a constant value. This may +come in handy when fields overlap between patterns and one has to +include the values in the *fixedbit_elt* instead. + +The decoder will call a translator function for each pattern matched. + +Pattern examples:: + + addl_r 010000 ..... ..... .... 0000000 ..... @opr + addl_i 010000 ..... ..... .... 0000000 ..... @opi + +which will, in part, invoke:: + + trans_addl_r(ctx, &arg_opr, insn) + +and:: + + trans_addl_i(ctx, &arg_opi, insn) diff --git a/scripts/decodetree.py b/scripts/decodetree.py index e342d278b8..ba203aeccd 100755 --- a/scripts/decodetree.py +++ b/scripts/decodetree.py @@ -17,139 +17,7 @@ # # Generate a decoding tree from a specification file. -# -# The tree is built from instruction "patterns". A pattern may represent -# a single architectural instruction or a group of same, depending on what -# is convenient for further processing. -# -# Each pattern has "fixedbits" & "fixedmask", the combination of which -# describes the condition under which the pattern is matched: -# -# (insn & fixedmask) == fixedbits -# -# Each pattern may have "fields", which are extracted from the insn and -# passed along to the translator. Examples of such are registers, -# immediates, and sub-opcodes. -# -# In support of patterns, one may declare fields, argument sets, and -# formats, each of which may be re-used to simplify further definitions. -# -# *** Field syntax: -# -# field_def := '%' identifier ( unnamed_field )+ ( !function=identifier )? -# unnamed_field := number ':' ( 's' ) number -# -# For unnamed_field, the first number is the least-significant bit position of -# the field and the second number is the length of the field. If the 's' is -# present, the field is considered signed. If multiple unnamed_fields are -# present, they are concatenated. In this way one can define disjoint fields. -# -# If !function is specified, the concatenated result is passed through the -# named function, taking and returning an integral value. -# -# FIXME: the fields of the structure into which this result will be stored -# is restricted to "int". Which means that we cannot expand 64-bit items. -# -# Field examples: -# -# %disp 0:s16 -- sextract(i, 0, 16) -# %imm9 16:6 10:3 -- extract(i, 16, 6) << 3 | extract(i, 10, 3) -# %disp12 0:s1 1:1 2:10 -- sextract(i, 0, 1) << 11 -# | extract(i, 1, 1) << 10 -# | extract(i, 2, 10) -# %shimm8 5:s8 13:1 !function=expand_shimm8 -# -- expand_shimm8(sextract(i, 5, 8) << 1 -# | extract(i, 13, 1)) -# -# *** Argument set syntax: -# -# args_def := '&' identifier ( args_elt )+ ( !extern )? -# args_elt := identifier -# -# Each args_elt defines an argument within the argument set. -# Each argument set will be rendered as a C structure "arg_$name" -# with each of the fields being one of the member arguments. -# -# If !extern is specified, the backing structure is assumed to -# have been already declared, typically via a second decoder. -# -# Argument set examples: -# -# ®3 ra rb rc -# &loadstore reg base offset -# -# *** Format syntax: -# -# fmt_def := '@' identifier ( fmt_elt )+ -# fmt_elt := fixedbit_elt | field_elt | field_ref | args_ref -# fixedbit_elt := [01.-]+ -# field_elt := identifier ':' 's'? number -# field_ref := '%' identifier | identifier '=' '%' identifier -# args_ref := '&' identifier -# -# Defining a format is a handy way to avoid replicating groups of fields -# across many instruction patterns. -# -# A fixedbit_elt describes a contiguous sequence of bits that must -# be 1, 0, [.-] for don't care. The difference between '.' and '-' -# is that '.' means that the bit will be covered with a field or a -# final [01] from the pattern, and '-' means that the bit is really -# ignored by the cpu and will not be specified. -# -# A field_elt describes a simple field only given a width; the position of -# the field is implied by its position with respect to other fixedbit_elt -# and field_elt. -# -# If any fixedbit_elt or field_elt appear then all bits must be defined. -# Padding with a fixedbit_elt of all '.' is an easy way to accomplish that. -# -# A field_ref incorporates a field by reference. This is the only way to -# add a complex field to a format. A field may be renamed in the process -# via assignment to another identifier. This is intended to allow the -# same argument set be used with disjoint named fields. -# -# A single args_ref may specify an argument set to use for the format. -# The set of fields in the format must be a subset of the arguments in -# the argument set. If an argument set is not specified, one will be -# inferred from the set of fields. -# -# It is recommended, but not required, that all field_ref and args_ref -# appear at the end of the line, not interleaving with fixedbit_elf or -# field_elt. -# -# Format examples: -# -# @opr ...... ra:5 rb:5 ... 0 ....... rc:5 -# @opi ...... ra:5 lit:8 1 ....... rc:5 -# -# *** Pattern syntax: -# -# pat_def := identifier ( pat_elt )+ -# pat_elt := fixedbit_elt | field_elt | field_ref -# | args_ref | fmt_ref | const_elt -# fmt_ref := '@' identifier -# const_elt := identifier '=' number -# -# The fixedbit_elt and field_elt specifiers are unchanged from formats. -# A pattern that does not specify a named format will have one inferred -# from a referenced argument set (if present) and the set of fields. -# -# A const_elt allows a argument to be set to a constant value. This may -# come in handy when fields overlap between patterns and one has to -# include the values in the fixedbit_elt instead. -# -# The decoder will call a translator function for each pattern matched. -# -# Pattern examples: -# -# addl_r 010000 ..... ..... .... 0000000 ..... @opr -# addl_i 010000 ..... ..... .... 0000000 ..... @opi -# -# which will, in part, invoke -# -# trans_addl_r(ctx, &arg_opr, insn) -# and -# trans_addl_i(ctx, &arg_opi, insn) +# See the syntax and semantics in docs/decodetree.rst. # import os From patchwork Sat Feb 23 23:29:50 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 10827645 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0615017E9 for ; Sat, 23 Feb 2019 23:34:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DB0612BB11 for ; Sat, 23 Feb 2019 23:34:55 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B63492C0C5; Sat, 23 Feb 2019 23:34:55 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 5EA312BB11 for ; Sat, 23 Feb 2019 23:34:55 +0000 (UTC) Received: from localhost ([127.0.0.1]:43867 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gxgoo-0003f6-F6 for patchwork-qemu-devel@patchwork.kernel.org; Sat, 23 Feb 2019 18:34:54 -0500 Received: from eggs.gnu.org ([209.51.188.92]:45379) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gxgkA-0000P3-Bd for qemu-devel@nongnu.org; Sat, 23 Feb 2019 18:30:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gxgk9-0007M0-DV for qemu-devel@nongnu.org; Sat, 23 Feb 2019 18:30:06 -0500 Received: from mail-pl1-x62c.google.com ([2607:f8b0:4864:20::62c]:41699) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gxgk8-0007Eb-U6 for qemu-devel@nongnu.org; Sat, 23 Feb 2019 18:30:05 -0500 Received: by mail-pl1-x62c.google.com with SMTP id y5so2756119plk.8 for ; Sat, 23 Feb 2019 15:30:01 -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 :mime-version:content-transfer-encoding; bh=v8huWsBakhsX960GFeyqPdvKD/KHeC+sZiyDbO2s4Ps=; b=THgSBQHy10BMP4i0rsOOEaYKpoR+jyWcmvx+IsSFXchKJEDqDa6NSLkjxtkR1sO/Wh wK5PNj9h+pIlMDJhvO2BJpN/t1xOp5sLGXPm4ltf8oWqkihHTMuRTnmDT5EIx+5esoGx Cr+aVR9r85hhuevCY4pK3BNae090aV6/kFqh9IVD6Q8FdBrNQbfHE+YJzvL+FXLuS2qg xoMcBMZWaKlQbxGznROpxw1Yuu0WnxVthLeqIZNZ02/7dVxwYifyNUXnlK9xcF1tatXY KqeQQMJhH4bXRQNwmX1fgWUn833kJa2XWUnjlBOlixYlbaeHjvr8hDWSAQnhapvriBRk VFHA== 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=v8huWsBakhsX960GFeyqPdvKD/KHeC+sZiyDbO2s4Ps=; b=c4QrakLHpby30bNCMbYtPgJTCAsr1uET4Icaq8xeJFCOqSTlTVkM4o1oq3sl5gjvjS 22qvq5eOh3vUcWZT9TOkTnSaah4ccWMCI17NKulpXwKqhHNV5CWSbjcWTIEtxQ4FYXbP YXs8ZGSq6Ti1FA/v5uHPoGlpYkw4JPWxWFNAxVtGFfkXGi3ebVW8lxGT+HU7fvIWpe+l 7xwVvZQXY3FaoSQNJ3OobnFaPeToUnIBrIvAqvFDd1T0efX6xo2DKtrZl+1cz+x9vZRP eePRX/9mof+mopBhbaB7/EgZP3reK2Z6sQ0WXq0rajLFLzgE/hDAz/oq8bLRoNuM3A9+ 4AFw== X-Gm-Message-State: AHQUAuZ4W2g8dLRVHfdV3LXb+nz/dPvTuzJYPVlXLdfNzu0UrSPiozw/ ikOsWvUtiPFtrZeXskhu0ft0XkUQOU0= X-Google-Smtp-Source: AHgI3IYArtEhgqDXFaHMCVV0DZMambFHYPnYUWIkJ3bYdnewWa3HLjd/K7jIcbwSoaZDsauEZqo45g== X-Received: by 2002:a17:902:ab8f:: with SMTP id f15mr11463644plr.218.1550964600613; Sat, 23 Feb 2019 15:30:00 -0800 (PST) Received: from cloudburst.twiddle.net (97-113-188-82.tukw.qwest.net. [97.113.188.82]) by smtp.gmail.com with ESMTPSA id n1sm13214842pfi.123.2019.02.23.15.29.59 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 23 Feb 2019 15:29:59 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Sat, 23 Feb 2019 15:29:50 -0800 Message-Id: <20190223232954.7185-4-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20190223232954.7185-1-richard.henderson@linaro.org> References: <20190223232954.7185-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::62c Subject: [Qemu-devel] [PATCH 3/5] decodetree: Ensure build_tree does not include values outside insnmask 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: kbastian@mail.uni-paderborn.de, f4bug@amsat.org Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Philippe Mathieu-Daudé Reproduced with "scripts/decodetree.py /dev/null". Reviewed-by: Eduardo Habkost Signed-off-by: Philippe Mathieu-Daudé Signed-off-by: Richard Henderson Reviewed-by: Bastian Koppelmann --- scripts/decodetree.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/decodetree.py b/scripts/decodetree.py index ba203aeccd..fb9a0ab3ad 100755 --- a/scripts/decodetree.py +++ b/scripts/decodetree.py @@ -784,7 +784,7 @@ class Tree: def build_tree(pats, outerbits, outermask): # Find the intersection of all remaining fixedmask. - innermask = ~outermask + innermask = ~outermask & insnmask for i in pats: innermask &= i.fixedmask From patchwork Sat Feb 23 23:29:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 10827647 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A956B17E9 for ; Sat, 23 Feb 2019 23:34:59 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 99AE12C0C4 for ; Sat, 23 Feb 2019 23:34:59 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8D4012C0C6; Sat, 23 Feb 2019 23:34:59 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 3BBAD2C0C4 for ; Sat, 23 Feb 2019 23:34:59 +0000 (UTC) Received: from localhost ([127.0.0.1]:43869 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gxgos-0003i6-FX for patchwork-qemu-devel@patchwork.kernel.org; Sat, 23 Feb 2019 18:34:58 -0500 Received: from eggs.gnu.org ([209.51.188.92]:45382) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gxgkA-0000P5-Cu for qemu-devel@nongnu.org; Sat, 23 Feb 2019 18:30:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gxgk9-0007MW-FE for qemu-devel@nongnu.org; Sat, 23 Feb 2019 18:30:06 -0500 Received: from mail-pf1-x433.google.com ([2607:f8b0:4864:20::433]:38342) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gxgk9-0007FA-06 for qemu-devel@nongnu.org; Sat, 23 Feb 2019 18:30:05 -0500 Received: by mail-pf1-x433.google.com with SMTP id n125so2766979pfn.5 for ; Sat, 23 Feb 2019 15:30:03 -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=jjG9f/cUPlGsuspqa1NpIrIE0Dj9kdzyNpmBX1Qf7Vs=; b=psod3pjhzscg7dxvGZJvNUNn+Bbd95nbTklEDTcv0mLmu6JuyIDQgqfnV6s9sypbzK EHo29SDHG+K65N3tzb4Pkw6ih/0JuSOflSB781DS6Y/RM3Egrkt5km0d0pPGOo64bPQl 9hOjSfSM3nZRdcYAgaxOJk6kCbLVfShgUJD2GSj+uALUKth80sI2suFnMZdV1y6glo8D Gz1SbasFjhvwpTfLPZ/TCc2IumV2tGR34QSDDi0AsCvKq3NmPVnzgFw/r7OD9vQ0oifV k85jGBMFxmJ1dzFvJUWleQMOyiNrJmKDFNiNnbVIrpHrKh2g1FdwgcFWN6ZwkCHtx4ZN d/AA== 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=jjG9f/cUPlGsuspqa1NpIrIE0Dj9kdzyNpmBX1Qf7Vs=; b=I2Q5Xyln3xJvSrOPSNC/ieeJexO18oHEdQK/17a6NDjNkKym+ANsOpLR7/hc/x9NpO nuf4tCgCf5Pt+FnCIQqAaPqQ63xXDj62Wk56JKHzqvinVConnbnBFKf2Jx+GS9Gtb1HM Opmuq9wFapBWA5sYPnjinGhMBYRJAWmuCXelHDXAu6+W3AcHkl99YNISN/lgRN9G/UzF yM2RMZYyvd+6GexbTqeQZw+yXOjWNOFxZQSgPCZe3aR/cNVOqBiP7+Rg+P0MtxFVmWun XDhUHcv5DIEREPHI/fyaABS7ZDT9QpK8DVJatzVYI+D7H9T8+j6lnVgVE5NiD2W8cIKa lhRA== X-Gm-Message-State: AHQUAuY+h5rkZQukHl2/iWE+LGR2CmHU2zKfKYTO3Cp28vNAGj7BXGF0 s6y5CmetPJ23QKWC8AcH0TBKYTraKKA= X-Google-Smtp-Source: AHgI3Ibrg0dD8/4CrUKwW+hSGDRYOEHGH5AB01V+o2Ou1jOBpxS3T/+kQG5ylqE13hLI660gLRtpxA== X-Received: by 2002:a63:3446:: with SMTP id b67mr10764726pga.122.1550964601767; Sat, 23 Feb 2019 15:30:01 -0800 (PST) Received: from cloudburst.twiddle.net (97-113-188-82.tukw.qwest.net. [97.113.188.82]) by smtp.gmail.com with ESMTPSA id n1sm13214842pfi.123.2019.02.23.15.30.00 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 23 Feb 2019 15:30:01 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Sat, 23 Feb 2019 15:29:51 -0800 Message-Id: <20190223232954.7185-5-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20190223232954.7185-1-richard.henderson@linaro.org> References: <20190223232954.7185-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::433 Subject: [Qemu-devel] [PATCH 4/5] decodetree: Do not unconditionaly return from Pattern.output_code 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: kbastian@mail.uni-paderborn.de, f4bug@amsat.org Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP As a consequence, the 'return false' gets pushed up one level. This will allow us to perform some other action when the translator returns failure. Signed-off-by: Richard Henderson Tested-by: Philippe Mathieu-Daudé Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Bastian Koppelmann --- scripts/decodetree.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/scripts/decodetree.py b/scripts/decodetree.py index fb9a0ab3ad..dd495096fc 100755 --- a/scripts/decodetree.py +++ b/scripts/decodetree.py @@ -348,8 +348,8 @@ class Pattern(General): output(ind, self.base.extract_name(), '(&u.f_', arg, ', insn);\n') for n, f in self.fields.items(): output(ind, 'u.f_', arg, '.', n, ' = ', f.str_extract(), ';\n') - output(ind, 'return ', translate_prefix, '_', self.name, - '(ctx, &u.f_', arg, ');\n') + output(ind, 'if (', translate_prefix, '_', self.name, + '(ctx, &u.f_', arg, ')) return true;\n') # end Pattern @@ -777,8 +777,8 @@ class Tree: output(ind, ' /* ', str_match_bits(innerbits, innermask), ' */\n') s.output_code(i + 4, extracted, innerbits, innermask) + output(ind, ' return false;\n') output(ind, '}\n') - output(ind, 'return false;\n') # end Tree @@ -932,6 +932,7 @@ def main(): output(i4, '} u;\n\n') t.output_code(4, False, 0, 0) + output(i4, 'return false;\n') output('}\n') From patchwork Sat Feb 23 23:29:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 10827651 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id BCF9117E9 for ; Sat, 23 Feb 2019 23:37:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A4E492C0C4 for ; Sat, 23 Feb 2019 23:37:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 97AB82C0C7; Sat, 23 Feb 2019 23:37:20 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id D43F82C0C4 for ; Sat, 23 Feb 2019 23:37:19 +0000 (UTC) Received: from localhost ([127.0.0.1]:43935 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gxgr8-0005Ow-UT for patchwork-qemu-devel@patchwork.kernel.org; Sat, 23 Feb 2019 18:37:18 -0500 Received: from eggs.gnu.org ([209.51.188.92]:45417) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gxgkB-0000PA-5U for qemu-devel@nongnu.org; Sat, 23 Feb 2019 18:30:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gxgk9-0007MJ-EN for qemu-devel@nongnu.org; Sat, 23 Feb 2019 18:30:07 -0500 Received: from mail-pg1-x542.google.com ([2607:f8b0:4864:20::542]:35092) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gxgk8-0007HR-Vh for qemu-devel@nongnu.org; Sat, 23 Feb 2019 18:30:05 -0500 Received: by mail-pg1-x542.google.com with SMTP id e17so730676pgd.2 for ; Sat, 23 Feb 2019 15:30:04 -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=vDT4qdGCChfvYo8MTh4ScxaHuIyJTWKaydd3SYXdkkI=; b=sUZUBbSJa9+NDr9yKtcngE+XFMUBsxD7S0TzR/kaMs/RM92TU+LGcqZshutHI7DTZE F1GtupOiMWSbiH/CcfZYPgA7HrR6t7xaht3fKjbPrHptnYtLETtibWvoD3GARWk68Jsj IM2ygb9SbNIrpdq1cLFKH6tUNDyngrzptElNo4iT4hoQdi3CL9bx+d+zcdUZQzOjNTi8 AlaqGznPjCPkF0LJaEZPI+xmhloIBRPcHW61lliioMHZzJruYgL3rk3mhZKo7/T89bVP MNvNOAK03mlvy0Q8ldYi0JmXsalWLTwVJSWi02gRBmF5p2yB1ldOrTcT6aE/M+7qXJkr OyiA== 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=vDT4qdGCChfvYo8MTh4ScxaHuIyJTWKaydd3SYXdkkI=; b=fEgYqVLeOG54cXXqtEDmVaZ4uu7Fn2zgSdD4Rr9n6u+kKs8XJGq/Mlq2wtLR9ofjIy QpNWDb4jXpA1z2Y+OCfImVdL2gkKj5NRB4XF5RnFakPqq1EeFtDchx/eje7Zhd1kKD4X bBzxO2mf/pGXdDTcWKd76S1jBsJWdhJoTlMmm0lOCz/uQPH8/XH+jKBfQTQVtohUS1Ns bpZki6ktenUEpyeml4gIMIDp+vF7kJaVD3UyttLSdV/lTGd4wv9f/FuX9WUi+2JE2vdI I/yeZybA/p8FuQEk/cSp9yqBGf63z15/SXN7jrWcDYSL5W6TMTZUfwBkgUErY6TEJlb8 uU3A== X-Gm-Message-State: AHQUAubpUzbHR4VB8BktY/9h+pPnEZEl9HK8cPs60s03rtvq12O/AV1E gyFzSLlyEijuhDTsjIfQuvGutOMrLBI= X-Google-Smtp-Source: AHgI3IbkJLJb4Nt++mgEZtBwAJ1FQ1JTkScDKM+ioISLfMzqG683sLCRYh+u3vQzD3S6p0sHOGuMug== X-Received: by 2002:a63:c34a:: with SMTP id e10mr3316360pgd.194.1550964602799; Sat, 23 Feb 2019 15:30:02 -0800 (PST) Received: from cloudburst.twiddle.net (97-113-188-82.tukw.qwest.net. [97.113.188.82]) by smtp.gmail.com with ESMTPSA id n1sm13214842pfi.123.2019.02.23.15.30.01 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 23 Feb 2019 15:30:02 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Sat, 23 Feb 2019 15:29:52 -0800 Message-Id: <20190223232954.7185-6-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20190223232954.7185-1-richard.henderson@linaro.org> References: <20190223232954.7185-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::542 Subject: [Qemu-devel] [PATCH 5/5] decodetree: Allow grouping of overlapping patterns 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: kbastian@mail.uni-paderborn.de, f4bug@amsat.org Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Richard Henderson --- docs/decodetree.rst | 58 +++++++++++++++++ scripts/decodetree.py | 144 ++++++++++++++++++++++++++++++++++++++---- 2 files changed, 191 insertions(+), 11 deletions(-) diff --git a/docs/decodetree.rst b/docs/decodetree.rst index d9be30b2db..391069c105 100644 --- a/docs/decodetree.rst +++ b/docs/decodetree.rst @@ -154,3 +154,61 @@ which will, in part, invoke:: and:: trans_addl_i(ctx, &arg_opi, insn) + +Pattern Groups +============== + +Syntax:: + + group := '{' ( pat_def | group )+ '}' + +A *group* begins with a lone open-brace, with all subsequent lines +indented two spaces, and ending with a lone close-brace. Groups +may be nested, increasing the required indentation of the lines +within the nested group to two spaces per nesting level. + +Unlike ungrouped patterns, grouped patterns are allowed to overlap. +Conflicts are resolved by selecting the patterns in order. If all +of the fixedbits for a pattern match, its translate function will +be called. If the translate function returns false, then subsequent +patterns within the group will be matched. + +The following example from PA-RISC shows specialization of the *or* +instruction:: + + { + { + nop 000010 ----- ----- 0000 001001 0 00000 + copy 000010 00000 r1:5 0000 001001 0 rt:5 + } + or 000010 r2:5 r1:5 cf:4 001001 0 rt:5 + } + +When the *cf* field is zero, the instruction has no side effects, +and may be specialized. When the *rt* field is zero, the output +is discarded and so the instruction has no effect. When the *rt2* +field is zero, the operation is ``reg[rt] | 0`` and so encodes +the canonical register copy operation. + +The output from the generator might look like:: + + switch (insn & 0xfc000fe0) { + case 0x08000240: + /* 000010.. ........ ....0010 010..... */ + if ((insn & 0x0000f000) == 0x00000000) { + /* 000010.. ........ 00000010 010..... */ + if ((insn & 0x0000001f) == 0x00000000) { + /* 000010.. ........ 00000010 01000000 */ + extract_decode_Fmt_0(&u.f_decode0, insn); + if (trans_nop(ctx, &u.f_decode0)) return true; + } + if ((insn & 0x03e00000) == 0x00000000) { + /* 00001000 000..... 00000010 010..... */ + extract_decode_Fmt_1(&u.f_decode1, insn); + if (trans_copy(ctx, &u.f_decode1)) return true; + } + } + extract_decode_Fmt_2(&u.f_decode2, insn); + if (trans_or(ctx, &u.f_decode2)) return true; + return false; + } diff --git a/scripts/decodetree.py b/scripts/decodetree.py index dd495096fc..abce58ed8f 100755 --- a/scripts/decodetree.py +++ b/scripts/decodetree.py @@ -31,6 +31,7 @@ fields = {} arguments = {} formats = {} patterns = [] +allpatterns = [] translate_prefix = 'trans' translate_scope = 'static ' @@ -353,6 +354,46 @@ class Pattern(General): # end Pattern +class MultiPattern(General): + """Class representing an overlapping set of instruction patterns""" + + def __init__(self, lineno, pats, fixb, fixm, udfm): + self.lineno = lineno + self.pats = pats + self.base = None + self.fixedbits = fixb + self.fixedmask = fixm + self.undefmask = udfm + + def __str__(self): + r = "{" + for p in self.pats: + r = r + ' ' + str(p) + return r + "}" + + def output_decl(self): + for p in self.pats: + p.output_decl() + + def output_code(self, i, extracted, outerbits, outermask): + global translate_prefix + ind = str_indent(i) + for p in self.pats: + if outermask != p.fixedmask: + innermask = p.fixedmask & ~outermask + innerbits = p.fixedbits & ~outermask + output(ind, 'if ((insn & ', + '0x{0:08x}) == 0x{1:08x}'.format(innermask, innerbits), + ') {\n') + output(ind, ' /* ', + str_match_bits(p.fixedbits, p.fixedmask), ' */\n') + p.output_code(i + 4, extracted, p.fixedbits, p.fixedmask) + output(ind, '}\n') + else: + p.output_code(i, extracted, p.fixedbits, p.fixedmask) +#end MultiPattern + + def parse_field(lineno, name, toks): """Parse one instruction field from TOKS at LINENO""" global fields @@ -505,6 +546,7 @@ def parse_generic(lineno, is_format, name, toks): global arguments global formats global patterns + global allpatterns global re_ident global insnwidth global insnmask @@ -649,6 +691,7 @@ def parse_generic(lineno, is_format, name, toks): pat = Pattern(name, lineno, fmt, fixedbits, fixedmask, undefmask, fieldmask, flds) patterns.append(pat) + allpatterns.append(pat) # Validate the masks that we have assembled. if fieldmask & fixedmask: @@ -667,17 +710,61 @@ def parse_generic(lineno, is_format, name, toks): .format(allbits ^ insnmask)) # end parse_general +def build_multi_pattern(lineno, pats): + """Validate the Patterns going into a MultiPattern.""" + global patterns + global insnmask + + if len(pats) < 2: + error(lineno, 'less than two patterns within braces') + + fixedmask = insnmask + undefmask = insnmask + + for p in pats: + fixedmask &= p.fixedmask + undefmask &= p.undefmask + if p.lineno < lineno: + lineno = p.lineno + + if fixedmask == 0: + error(lineno, 'no overlap in patterns within braces') + + fixedbits = None + for p in pats: + thisbits = p.fixedbits & fixedmask + if fixedbits is None: + fixedbits = thisbits + elif fixedbits != thisbits: + error(p.lineno, 'fixedbits mismatch within braces', + '(0x{0:08x} != 0x{1:08x})'.format(thisbits, fixedbits)) + + mp = MultiPattern(lineno, pats, fixedbits, fixedmask, undefmask) + patterns.append(mp) +# end build_multi_pattern def parse_file(f): """Parse all of the patterns within a file""" + global patterns + # Read all of the lines of the file. Concatenate lines # ending in backslash; discard empty lines and comments. toks = [] lineno = 0 + nesting = 0 + saved_pats = [] + for line in f: lineno += 1 + # Expand and strip spaces, to find indent. + line = line.rstrip() + line = line.expandtabs() + len1 = len(line) + line = line.lstrip() + len2 = len(line) + # Discard comments end = line.find('#') if end >= 0: @@ -687,10 +774,18 @@ def parse_file(f): if len(toks) != 0: # Next line after continuation toks.extend(t) - elif len(t) == 0: - # Empty line - continue else: + # Allow completely blank lines. + if len1 == 0: + continue + indent = len1 - len2 + # Empty line due to comment. + if len(t) == 0: + # Indentation must be correct, even for comment lines. + if indent != nesting: + error(lineno, 'indentation ', indent, ' != ', nesting) + continue + start_lineno = lineno toks = t # Continuation? @@ -698,21 +793,47 @@ def parse_file(f): toks.pop() continue - if len(toks) < 2: - error(lineno, 'short line') - name = toks[0] del toks[0] + # End nesting? + if name == '}': + if nesting == 0: + error(start_lineno, 'mismatched close brace') + if len(toks) != 0: + error(start_lineno, 'extra tokens after close brace') + nesting -= 2 + if indent != nesting: + error(start_lineno, 'indentation ', indent, ' != ', nesting) + pats = patterns + patterns = saved_pats.pop() + build_multi_pattern(lineno, pats) + toks = [] + continue + + # Everything else should have current indentation. + if indent != nesting: + error(start_lineno, 'indentation ', indent, ' != ', nesting) + + # Start nesting? + if name == '{': + if len(toks) != 0: + error(start_lineno, 'extra tokens after open brace') + saved_pats.append(patterns) + patterns = [] + nesting += 2 + toks = [] + continue + # Determine the type of object needing to be parsed. if name[0] == '%': - parse_field(lineno, name[1:], toks) + parse_field(start_lineno, name[1:], toks) elif name[0] == '&': - parse_arguments(lineno, name[1:], toks) + parse_arguments(start_lineno, name[1:], toks) elif name[0] == '@': - parse_generic(lineno, True, name[1:], toks) + parse_generic(start_lineno, True, name[1:], toks) else: - parse_generic(lineno, False, name, toks) + parse_generic(start_lineno, False, name, toks) toks = [] # end parse_file @@ -846,6 +967,7 @@ def main(): global arguments global formats global patterns + global allpatterns global translate_scope global translate_prefix global output_fd @@ -907,7 +1029,7 @@ def main(): # Make sure that the argument sets are the same, and declare the # function only once. out_pats = {} - for i in patterns: + for i in allpatterns: if i.name in out_pats: p = out_pats[i.name] if i.base.base != p.base.base: From patchwork Sat Feb 23 23:29:53 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 10827641 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E8783180E for ; Sat, 23 Feb 2019 23:31:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D71B82C095 for ; Sat, 23 Feb 2019 23:31:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CB8882C09D; Sat, 23 Feb 2019 23:31:57 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 4C25E2C095 for ; Sat, 23 Feb 2019 23:31:57 +0000 (UTC) Received: from localhost ([127.0.0.1]:43849 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gxglw-0001gD-JH for patchwork-qemu-devel@patchwork.kernel.org; Sat, 23 Feb 2019 18:31:56 -0500 Received: from eggs.gnu.org ([209.51.188.92]:45440) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gxgkB-0000PN-Nh for qemu-devel@nongnu.org; Sat, 23 Feb 2019 18:30:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gxgk9-0007NQ-OH for qemu-devel@nongnu.org; Sat, 23 Feb 2019 18:30:07 -0500 Received: from mail-pg1-x534.google.com ([2607:f8b0:4864:20::534]:36317) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gxgk9-0007KQ-GA for qemu-devel@nongnu.org; Sat, 23 Feb 2019 18:30:05 -0500 Received: by mail-pg1-x534.google.com with SMTP id r124so2781673pgr.3 for ; Sat, 23 Feb 2019 15:30:05 -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=xHXkXT6lJgVBbNX0LyuxrSI32KVu1StCWGgAmzm2ig0=; b=J9P8VipOKoapixpi+J/A+XVBn5AGtVIvS8OnYfN1XWZdJMOCnhl+gOKtAlZKGuAu6O avYX+YM/ySvvp/D5SLBS5SjxXitGw6PpGA+I3dhyTSv+LrlWu67OqbGabxe5xKh2/C6A WBj68zBvAdlZfzHflSQWWUAR1R0lr8zpWebWIUmOsyFk+A1DmrexoqBBLwq6jLK591TN KINw20v6RvyEIFbjrF2afTV7EMQ7NB6/NufoddEuXEcO1+11m7RmKlNHojc+tGb6s8CC O3Rh6/oCBDOgc4EKxaEtS6eUDNnf4Hrihhoa8PDJ49nFmYgvO91vXeYgg1uixm+ryail hEvQ== 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=xHXkXT6lJgVBbNX0LyuxrSI32KVu1StCWGgAmzm2ig0=; b=Rd5C9nfeyLwNrkBf9JKzbTI0sGJy0sCItovimrnaWye9lAPkLctVRVm9Um5JFAVggD mAAA1b/QfBcu6SV6yEIAUVWRQaUpPE51V0j4ZtPd+yV/pMARkYgDRgoKyjczU4i6K5kW 5SPKNHdwLDG5x811co3rNc8s9JuZupm1x8KKGhvhVqNcTq5eCwqad9+5ovzHLIJIxFKl 2pgE1pcvxfohfr+EnzoFl0BntfkTsRGdNWOmzsSF3pZUfcsVY5OnjefCJ0/mrjIPHBkV DKYPCMNbTCVfNy5yQkQB//V1RlWiIcsfNlBLop1eklYEGCIHN/yQScgzGSaJvyfhFjDm 2d/w== X-Gm-Message-State: AHQUAubw5TlM1u8QckKs3zzAKrx6zQR7hfh9ON9rcVCGWDYlZf0ZpAdY k39x1vRC1XSVgjPNHYEnpSTiceOJtlI= X-Google-Smtp-Source: AHgI3Ib+LP4w9Mgi5WftSw7Fq5nvweevfBwWTJM+uGsQio+jqcIVyYmf+4lCXsFv9zlCOX6kRJKwcg== X-Received: by 2002:a63:2c8a:: with SMTP id s132mr10778860pgs.440.1550964604063; Sat, 23 Feb 2019 15:30:04 -0800 (PST) Received: from cloudburst.twiddle.net (97-113-188-82.tukw.qwest.net. [97.113.188.82]) by smtp.gmail.com with ESMTPSA id n1sm13214842pfi.123.2019.02.23.15.30.02 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 23 Feb 2019 15:30:03 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Sat, 23 Feb 2019 15:29:53 -0800 Message-Id: <20190223232954.7185-7-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20190223232954.7185-1-richard.henderson@linaro.org> References: <20190223232954.7185-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::534 Subject: [Qemu-devel] [RFC 6/7] target/hppa: Use pattern groups to decode OR 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: kbastian@mail.uni-paderborn.de, f4bug@amsat.org Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP It seems clearer to decode specializations of OR within decodetree instead of by hand within the translation function. Signed-off-by: Richard Henderson --- target/hppa/translate.c | 106 ++++++++++++++++++++------------------- target/hppa/insns.decode | 10 +++- 2 files changed, 64 insertions(+), 52 deletions(-) diff --git a/target/hppa/translate.c b/target/hppa/translate.c index b4fd307b77..8f5010b633 100644 --- a/target/hppa/translate.c +++ b/target/hppa/translate.c @@ -2619,59 +2619,63 @@ static bool trans_and(DisasContext *ctx, arg_rrr_cf *a) return do_log_reg(ctx, a, tcg_gen_and_reg); } +static bool trans_copy(DisasContext *ctx, arg_copy *a) +{ + unsigned r = a->r; + unsigned t = a->t; + + if (r == 0) { + TCGv_reg dest = dest_gpr(ctx, t); + tcg_gen_movi_reg(dest, 0); + save_gpr(ctx, t, dest); + } else { + save_gpr(ctx, t, cpu_gr[r]); + } + cond_free(&ctx->null_cond); + return true; +} + +static bool trans_pause(DisasContext *ctx, arg_pause *a) +{ +#ifndef CONFIG_USER_ONLY + /* + * These are QEMU extensions and are nops in the real architecture: + * + * or %r10,%r10,%r10 -- idle loop; wait for interrupt + * or %r31,%r31,%r31 -- death loop; offline cpu + * currently implemented as idle. + */ + TCGv_i32 tmp; + + /* + * No need to check for supervisor, as userland can only pause + * until the next timer interrupt. + */ + nullify_over(ctx); + + /* Advance the instruction queue. */ + copy_iaoq_entry(cpu_iaoq_f, ctx->iaoq_b, cpu_iaoq_b); + copy_iaoq_entry(cpu_iaoq_b, ctx->iaoq_n, ctx->iaoq_n_var); + nullify_set(ctx, 0); + + /* Tell the qemu main loop to halt until this cpu has work. */ + tmp = tcg_const_i32(1); + tcg_gen_st_i32(tmp, cpu_env, -offsetof(HPPACPU, env) + + offsetof(CPUState, halted)); + tcg_temp_free_i32(tmp); + gen_excp_1(EXCP_HALTED); + ctx->base.is_jmp = DISAS_NORETURN; + + return nullify_end(ctx); +#else + /* For user-only, don't pause but treat as nop. */ + cond_free(&ctx->null_cond); + return true; +#endif +} + static bool trans_or(DisasContext *ctx, arg_rrr_cf *a) { - if (a->cf == 0) { - unsigned r2 = a->r2; - unsigned r1 = a->r1; - unsigned rt = a->t; - - if (rt == 0) { /* NOP */ - cond_free(&ctx->null_cond); - return true; - } - if (r2 == 0) { /* COPY */ - if (r1 == 0) { - TCGv_reg dest = dest_gpr(ctx, rt); - tcg_gen_movi_reg(dest, 0); - save_gpr(ctx, rt, dest); - } else { - save_gpr(ctx, rt, cpu_gr[r1]); - } - cond_free(&ctx->null_cond); - return true; - } -#ifndef CONFIG_USER_ONLY - /* These are QEMU extensions and are nops in the real architecture: - * - * or %r10,%r10,%r10 -- idle loop; wait for interrupt - * or %r31,%r31,%r31 -- death loop; offline cpu - * currently implemented as idle. - */ - if ((rt == 10 || rt == 31) && r1 == rt && r2 == rt) { /* PAUSE */ - TCGv_i32 tmp; - - /* No need to check for supervisor, as userland can only pause - until the next timer interrupt. */ - nullify_over(ctx); - - /* Advance the instruction queue. */ - copy_iaoq_entry(cpu_iaoq_f, ctx->iaoq_b, cpu_iaoq_b); - copy_iaoq_entry(cpu_iaoq_b, ctx->iaoq_n, ctx->iaoq_n_var); - nullify_set(ctx, 0); - - /* Tell the qemu main loop to halt until this cpu has work. */ - tmp = tcg_const_i32(1); - tcg_gen_st_i32(tmp, cpu_env, -offsetof(HPPACPU, env) + - offsetof(CPUState, halted)); - tcg_temp_free_i32(tmp); - gen_excp_1(EXCP_HALTED); - ctx->base.is_jmp = DISAS_NORETURN; - - return nullify_end(ctx); - } -#endif - } return do_log_reg(ctx, a, tcg_gen_or_reg); } diff --git a/target/hppa/insns.decode b/target/hppa/insns.decode index 55ff39dd05..46c64334d1 100644 --- a/target/hppa/insns.decode +++ b/target/hppa/insns.decode @@ -148,7 +148,15 @@ lci 000001 ----- ----- -- 01001100 0 t:5 andcm 000010 ..... ..... .... 000000 0 ..... @rrr_cf and 000010 ..... ..... .... 001000 0 ..... @rrr_cf -or 000010 ..... ..... .... 001001 0 ..... @rrr_cf +{ + { + nop 000010 ----- ----- 0000 001001 0 00000 + copy 000010 00000 r:5 0000 001001 0 t:5 + pause 000010 01010 01010 0000 001001 0 01010 + pause 000010 11111 11111 0000 001001 0 11111 + } + or 000010 ..... ..... .... 001001 0 ..... @rrr_cf +} xor 000010 ..... ..... .... 001010 0 ..... @rrr_cf uxor 000010 ..... ..... .... 001110 0 ..... @rrr_cf ds 000010 ..... ..... .... 010001 0 ..... @rrr_cf From patchwork Sat Feb 23 23:29:54 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 10827643 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E210D180E for ; Sat, 23 Feb 2019 23:32:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D07C42C09C for ; Sat, 23 Feb 2019 23:32:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C4EA52C0A1; Sat, 23 Feb 2019 23:32:00 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 2FC6D2C09C for ; Sat, 23 Feb 2019 23:32:00 +0000 (UTC) Received: from localhost ([127.0.0.1]:43851 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gxglz-0001iE-Et for patchwork-qemu-devel@patchwork.kernel.org; Sat, 23 Feb 2019 18:31:59 -0500 Received: from eggs.gnu.org ([209.51.188.92]:45460) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gxgkC-0000PX-NW for qemu-devel@nongnu.org; Sat, 23 Feb 2019 18:30:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gxgkA-0007QA-Vs for qemu-devel@nongnu.org; Sat, 23 Feb 2019 18:30:08 -0500 Received: from mail-pf1-x42d.google.com ([2607:f8b0:4864:20::42d]:46941) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gxgkA-0007Np-KP for qemu-devel@nongnu.org; Sat, 23 Feb 2019 18:30:06 -0500 Received: by mail-pf1-x42d.google.com with SMTP id g6so2742522pfh.13 for ; Sat, 23 Feb 2019 15:30:06 -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=qLrp+/HLzFcuZRP+aVxUj7RFfpVP3ZwoFIDVc9U8wkQ=; b=oy90VbiIfmKU30SL9s5PAzv8uSkDBTYuoz5P7Bt5Hq1BCUrA4msjtyU1OH+s9Vqpkk 9Fcgg/jfThoJeDK93oC1E5ENUheb+245f7DU3xSxtx2YE70a6QN567sVFvq5E+obHqHH JDJYy02XMer1wl+MJ0IwdI2C9HuWrzEIFsRBHcNehqTo+4JeQiRfh1s2bpEtvOgyW3aX jCOTdqJtvJajQ9te/zHYBd7FTaB/OpS8QvJcNEaEZ4o4tjnoSRfdCG73em+kQnkEWANB +j2hVPRHuC9DZmU3V34sM0QBwuH5sWLC7IN0PhRQN9npZbI1+4QFWkpzxXrq2C1HJBJn 1eSA== 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=qLrp+/HLzFcuZRP+aVxUj7RFfpVP3ZwoFIDVc9U8wkQ=; b=JY++TwjN3uk9XmI53xNQCcs3ixVDbKFiu8x61bkLAzr/7D34QHUXPy3MSE68wpLb/U H8cSilsrn01pl4nAFyzHhKb++yIm1pmKZhxroz9R7wcq1eOCxcELtcaWr+4kQ6dbxvmp IzzyzgMvKnrdG812NMQiXkzKS1V1GMI5IkTgWM33S3Bwc3IltfP9CR/3g57f1DaUykwM JqD/bL9JUGALPUbn+U3/6ChgucDpsYczO4KTy4WdCK7WI2qA/QkTYhNuTyKvz2axZS95 b1IdnEh8WYoMSvc4PmJvue6zE3uR5H2K5OxNtsMbcRB5UMtiRzPuJ6W3ag+/LdfWS2xd 4Fpw== X-Gm-Message-State: AHQUAuaL+li+R05g8zsvB9GfYJOTvlhz5NyW1PhhvlsXLb6TapzcQebx FmM5CHAb7shb/O05+lqNoBbs+3OQzWA= X-Google-Smtp-Source: AHgI3IZYH9x5ga2VAZs6AA55FUuRIIouDEhlWDdF2jZHAQRTz9gu51SmHQk/rpj7tP02C3VY9UGzMw== X-Received: by 2002:a63:4a0a:: with SMTP id x10mr10806448pga.325.1550964605260; Sat, 23 Feb 2019 15:30:05 -0800 (PST) Received: from cloudburst.twiddle.net (97-113-188-82.tukw.qwest.net. [97.113.188.82]) by smtp.gmail.com with ESMTPSA id n1sm13214842pfi.123.2019.02.23.15.30.04 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 23 Feb 2019 15:30:04 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Sat, 23 Feb 2019 15:29:54 -0800 Message-Id: <20190223232954.7185-8-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20190223232954.7185-1-richard.henderson@linaro.org> References: <20190223232954.7185-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::42d Subject: [Qemu-devel] [RFC 7/7] target/riscv: Use pattern groups for RVC 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: kbastian@mail.uni-paderborn.de, f4bug@amsat.org Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Richard Henderson --- target/riscv/insn_trans/trans_rvc.inc.c | 60 +++++++++---------------- target/riscv/insn16.decode | 23 +++++++--- target/riscv/insn32.decode | 18 ++++---- 3 files changed, 48 insertions(+), 53 deletions(-) diff --git a/target/riscv/insn_trans/trans_rvc.inc.c b/target/riscv/insn_trans/trans_rvc.inc.c index 631e72c8b5..a81da2f107 100644 --- a/target/riscv/insn_trans/trans_rvc.inc.c +++ b/target/riscv/insn_trans/trans_rvc.inc.c @@ -48,24 +48,6 @@ static bool trans_c_li(DisasContext *ctx, arg_c_li *a) return trans_addi(ctx, &arg); } -static bool trans_c_addi16sp_lui(DisasContext *ctx, arg_c_addi16sp_lui *a) -{ - if (a->rd == 2) { - /* C.ADDI16SP */ - arg_addi arg = { .rd = 2, .rs1 = 2, .imm = a->imm_addi16sp }; - return trans_addi(ctx, &arg); - } else if (a->imm_lui != 0) { - /* C.LUI */ - if (a->rd == 0) { - /* Hint: insn is valid but does not affect state */ - return true; - } - arg_lui arg = { .rd = a->rd, .imm = a->imm_lui }; - return trans_lui(ctx, &arg); - } - return false; -} - static bool trans_c_srli(DisasContext *ctx, arg_c_srli *a) { int shamt = a->shamt; @@ -114,36 +96,38 @@ static bool trans_c_slli(DisasContext *ctx, arg_c_slli *a) return trans_slli(ctx, &arg); } -static bool trans_c_jr_mv(DisasContext *ctx, arg_c_jr_mv *a) +static bool trans_c_jr(DisasContext *ctx, arg_c_jr *a) { - if (a->rd != 0 && a->rs2 == 0) { - /* C.JR */ + if (a->rd != 0) { arg_jalr arg = { .rd = 0, .rs1 = a->rd, .imm = 0 }; return trans_jalr(ctx, &arg); - } else if (a->rd != 0 && a->rs2 != 0) { - /* C.MV */ + } + return false; +} + +static bool trans_c_mv(DisasContext *ctx, arg_c_mv *a) +{ + if (a->rd != 0 && a->rs2 != 0) { arg_add arg = { .rd = a->rd, .rs1 = 0, .rs2 = a->rs2 }; return trans_add(ctx, &arg); } return false; } -static bool trans_c_ebreak_jalr_add(DisasContext *ctx, arg_c_ebreak_jalr_add *a) +static bool trans_c_jalr(DisasContext *ctx, arg_c_jalr *a) { - if (a->rd == 0 && a->rs2 == 0) { - /* C.EBREAK */ - arg_ebreak arg = { }; - return trans_ebreak(ctx, &arg); - } else if (a->rd != 0) { - if (a->rs2 == 0) { - /* C.JALR */ - arg_jalr arg = { .rd = 1, .rs1 = a->rd, .imm = 0 }; - return trans_jalr(ctx, &arg); - } else { - /* C.ADD */ - arg_add arg = { .rd = a->rd, .rs1 = a->rd, .rs2 = a->rs2 }; - return trans_add(ctx, &arg); - } + if (a->rd != 0) { + arg_jalr arg = { .rd = 1, .rs1 = a->rd, .imm = 0 }; + return trans_jalr(ctx, &arg); + } + return false; +} + +static bool trans_c_add(DisasContext *ctx, arg_c_add *a) +{ + if (a->rd != 0 && a->rs2 != 0) { + arg_add arg = { .rd = a->rd, .rs1 = a->rd, .rs2 = a->rs2 }; + return trans_add(ctx, &arg); } return false; } diff --git a/target/riscv/insn16.decode b/target/riscv/insn16.decode index d88a0c78ab..5b93051a19 100644 --- a/target/riscv/insn16.decode +++ b/target/riscv/insn16.decode @@ -42,11 +42,13 @@ # Argument sets imported from insn32.decode: +&empty !extern &r rd rs1 rs2 !extern &i imm rs1 rd !extern &s imm rs1 rs2 !extern &j imm rd !extern &b imm rs2 rs1 !extern +&u imm rd !extern # Argument sets: &ci imm rd @@ -55,8 +57,6 @@ &cr rd rs2 &c_shift shamt rd -&c_addi16sp_lui imm_lui imm_addi16sp rd - # Formats 16: @cr .... ..... ..... .. &cr rs2=%rs2_5 %rd @ci ... . ..... ..... .. &i imm=%imm_ci %rd rs1=%rd @@ -74,8 +74,6 @@ @c_sd ... . ..... ..... .. &s imm=%uimm_6bit_sd rs1=2 rs2=%rs2_5 @c_sw ... . ..... ..... .. &s imm=%uimm_6bit_sw rs1=2 rs2=%rs2_5 -@c_addi16sp_lui ... . ..... ..... .. &c_addi16sp_lui %imm_lui %imm_addi16sp %rd - @c_shift ... . .. ... ..... .. &c_shift rd=%rs1_3 shamt=%nzuimm_6bit @c_shift2 ... . .. ... ..... .. &c_shift rd=%rd shamt=%nzuimm_6bit @@ -92,7 +90,11 @@ sw 110 ... ... .. ... 00 @cs_w # *** RV64C Standard Extension (Quadrant 1) *** c_addi 000 . ..... ..... 01 @ci c_li 010 . ..... ..... 01 @ci -c_addi16sp_lui 011 . ..... ..... 01 @c_addi16sp_lui # shares opc with C.LUI +{ + # addi16sp + addi 011 . 00010 ..... 01 &i rd=2 rs1=2 imm=%imm_addi16sp + lui 011 . ..... ..... 01 &u %rd imm=%imm_lui +} c_srli 100 . 00 ... ..... 01 @c_shift c_srai 100 . 01 ... ..... 01 @c_shift andi 100 . 10 ... ..... 01 @c_andi @@ -108,7 +110,14 @@ bne 111 ... ... ..... 01 @cb # c_bnez c_slli 000 . ..... ..... 10 @c_shift2 fld 001 . ..... ..... 10 @c_ld # fldsp lw 010 . ..... ..... 10 @c_lw # lwsp -c_jr_mv 100 0 ..... ..... 10 @cr -c_ebreak_jalr_add 100 1 ..... ..... 10 @cr +{ + c_jr 100 0 ..... 00000 10 %rd + c_mv 100 0 ..... ..... 10 @cr +} +{ + ebreak 100 1 00000 00000 10 + c_jalr 100 1 ..... 00000 10 %rd + c_add 100 1 ..... ..... 10 @cr +} fsd 101 ...... ..... 10 @c_sd # fsdsp sw 110 . ..... ..... 10 @c_sw # swsp diff --git a/target/riscv/insn32.decode b/target/riscv/insn32.decode index 0e098e05fe..81bcb5dbb4 100644 --- a/target/riscv/insn32.decode +++ b/target/riscv/insn32.decode @@ -34,20 +34,22 @@ %imm_u 12:s20 !function=ex_shift_12 # Argument sets: -&b imm rs2 rs1 -&i imm rs1 rd -&r rd rs1 rs2 -&s imm rs2 rs1 -&j imm rd -&shift shamt rs1 rd -&atomic aq rl rs2 rs1 rd +&empty +&b imm rs2 rs1 +&i imm rs1 rd +&r rd rs1 rs2 +&s imm rs2 rs1 +&j imm rd +&u imm rd +&shift shamt rs1 rd +&atomic aq rl rs2 rs1 rd # Formats 32: @r ....... ..... ..... ... ..... ....... &r %rs2 %rs1 %rd @i ............ ..... ... ..... ....... &i imm=%imm_i %rs1 %rd @b ....... ..... ..... ... ..... ....... &b imm=%imm_b %rs2 %rs1 @s ....... ..... ..... ... ..... ....... &s imm=%imm_s %rs2 %rs1 -@u .................... ..... ....... imm=%imm_u %rd +@u .................... ..... ....... &u imm=%imm_u %rd @j .................... ..... ....... &j imm=%imm_j %rd @sh ...... ...... ..... ... ..... ....... &shift shamt=%sh10 %rs1 %rd