From patchwork Thu Jan 31 21:08:50 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 157159 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp7689361jaa; Thu, 31 Jan 2019 13:09:15 -0800 (PST) X-Google-Smtp-Source: ALg8bN6jk29XlkJGOuXIOeL6xhy6jivrfQP+T8zBaqY39n/JRketXh8jPnRvEAUmvumAtfCVG+wp X-Received: by 2002:a81:6e43:: with SMTP id j64mr35394539ywc.171.1548968955114; Thu, 31 Jan 2019 13:09:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1548968955; cv=none; d=google.com; s=arc-20160816; b=vIR40ZmFOVQeD0lY4nOzRG+kW2eLGVeQBY31zIc0uuWV3Tl22kp4jkWB9xQ0mR414A +8YPwvjtPWdsCMA26bMGUq2falpef7tN96R31ubbwNNdgIhynW6jiWncnQDWcvRh0PU4 F1BWRNHuf3aVAO6a7CgsFPuWgcE2YQWAsdNXJCt4+02BsD1yLUhziSyB0M4t9EA/TQR7 x6d0BVjO+lWvRzpntD9+olYz0QmuOMpyGmkZWbf7Vc4qxFx2Hwb+WLLmv5DB+sLwpG32 tEVFuo8L3TGEZJXj9ASSlqmlro2ZQD9VORqpLWnM3N5VOhPgqQoGZgKL3HotUBjdO09/ sUZg== 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=S31DKu0mZOkrs3M7J/A2evOJI3LY5m9uL/909EEUJnk=; b=WW7uFBcCZbL/HRAgn2o6IXc6eODYDB9h0gkpSHM1jZiOyHSRKF2KKgNLWL+cL4jjUO lCcO9KZhYIG0KjoxP9Vfzmnp6qyA18tJN/T4ncBxXrN/KN6R3R7cus+4ewVrxT7rO0+m +RWXb+xyhFnSszbgN/isNgwkByQ3FeCWPFP47F6A7GLhZHeSZML0axCuhu5qg5qmvRJe 5qrwTmIitRBLpSu9P/Axa9KBAxOdBEutqn7tVbdMZkWw1D4DY6fjVqAKauIqh/Ua4cd0 GOEYJoKEHLrdOoN4llWZNllb6JLIoYc5zhzX4lDCzaOQoyT1IZGx6mdsbKMe/bMKqvyp 07Hg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=PT8Y2a19; 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 o8si3401294ywb.348.2019.01.31.13.09.14 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 31 Jan 2019 13:09:15 -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=PT8Y2a19; 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]:60858 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gpJaE-0000ka-KH for patch@linaro.org; Thu, 31 Jan 2019 16:09:14 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39225) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gpJZy-0000j3-NQ for qemu-devel@nongnu.org; Thu, 31 Jan 2019 16:08:59 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gpJZx-0008C1-Mj for qemu-devel@nongnu.org; Thu, 31 Jan 2019 16:08:58 -0500 Received: from mail-pg1-x531.google.com ([2607:f8b0:4864:20::531]:47002) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gpJZx-00088K-6m for qemu-devel@nongnu.org; Thu, 31 Jan 2019 16:08:57 -0500 Received: by mail-pg1-x531.google.com with SMTP id w7so1869994pgp.13 for ; Thu, 31 Jan 2019 13:08:56 -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=S31DKu0mZOkrs3M7J/A2evOJI3LY5m9uL/909EEUJnk=; b=PT8Y2a19lT5AK0P11rkVrHIFFBrWOw96FAjGPhD5yBhHG9SHX0DvKXXgYnzsXzW45x VaMqthq9wRoAY0JQsxUTA4hHkl/fDeimDz+ez1PYjEWfLlxEncLgzqwP2kjFtht64tzj o0x5DSYE/wB+IJ4hM2h+/OjmDtzFHYVfMihR8= 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=S31DKu0mZOkrs3M7J/A2evOJI3LY5m9uL/909EEUJnk=; b=XP9pP6Dcxx4J6IDITNWeY13KlLVWCkggFfbtw7Oz8B56zgUDDJ8h/VlUuAfdifCVZL c6NfRT4Q/XG8sOkDheMwDtJz4vBxf5b0v24mieA/it4GKTS62VDwz1/igyWRe/PwjFZc CgB/zCk0Fc4Ed06df4V++dGLcX/wG8oTT78yInIls42qod8HIEcCXRHxPv5IBOPhI724 RJ+M3CNaESP0yIDXHprwlyXibaqiNKxeTUXAc/jogr9Q6MIV5apX9xp3XdCE3op0JYcL PpYbLr5Kj3AB270e17MkHJx/H06/WsSAIX7FNqM1BIUMdBjn3JOCpA60t4jaGUGxDSG+ ICDg== X-Gm-Message-State: AJcUukc9EcJqvaxiX8iZR6NcPi40nhAxmSj7bs792C5YA0Wlw3oi2zNK gxWDbrc1DQ3wiFa1wyH5DYhbZPgWe8U= X-Received: by 2002:aa7:8758:: with SMTP id g24mr35653343pfo.250.1548968934896; Thu, 31 Jan 2019 13:08:54 -0800 (PST) Received: from cloudburst.twiddle.net (97-126-115-157.tukw.qwest.net. [97.126.115.157]) by smtp.gmail.com with ESMTPSA id z62sm11924391pfl.33.2019.01.31.13.08.53 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 31 Jan 2019 13:08:54 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Thu, 31 Jan 2019 13:08:50 -0800 Message-Id: <20190131210851.9842-2-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20190131210851.9842-1-richard.henderson@linaro.org> References: <20190131210851.9842-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::531 Subject: [Qemu-devel] [PATCH 1/2] decodetree: Initial support for variable-length ISAs 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: ysato@users.sourceforge.jp Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Assuming that the ISA clearly describes how to determine the length of the instruction, and the ISA has a reasonable maximum instruction length, the input to the decoder can be right-justified in an appropriate insn word. This is not 100% convenient, as out-of-line %fields are numbered relative to the maximum instruction length, but this appears to still be usable. Signed-off-by: Richard Henderson --- scripts/decodetree.py | 38 ++++++++++++++++++++++++++++---------- 1 file changed, 28 insertions(+), 10 deletions(-) -- 2.17.2 diff --git a/scripts/decodetree.py b/scripts/decodetree.py index 2f8b5a1c92..5fb0acaa15 100755 --- a/scripts/decodetree.py +++ b/scripts/decodetree.py @@ -159,6 +159,7 @@ import getopt insnwidth = 32 insnmask = 0xffffffff +variablewidth = False fields = {} arguments = {} formats = {} @@ -420,7 +421,7 @@ class Arguments: class General: """Common code between instruction formats and instruction patterns""" - def __init__(self, name, lineno, base, fixb, fixm, udfm, fldm, flds): + def __init__(self, name, lineno, base, fixb, fixm, udfm, fldm, flds, w): self.name = name self.file = input_file self.lineno = lineno @@ -430,6 +431,7 @@ class General: self.undefmask = udfm self.fieldmask = fldm self.fields = flds + self.width = w def __str__(self): r = self.name @@ -597,7 +599,7 @@ def infer_argument_set(flds): return arg -def infer_format(arg, fieldmask, flds): +def infer_format(arg, fieldmask, flds, width): global arguments global formats global decode_function @@ -616,6 +618,8 @@ def infer_format(arg, fieldmask, flds): continue if fieldmask != fmt.fieldmask: continue + if width != fmt.width: + continue if not eq_fields_for_fmts(flds, fmt.fields): continue return (fmt, const_flds) @@ -624,7 +628,7 @@ def infer_format(arg, fieldmask, flds): if not arg: arg = infer_argument_set(flds) - fmt = Format(name, 0, arg, 0, 0, 0, fieldmask, var_flds) + fmt = Format(name, 0, arg, 0, 0, 0, fieldmask, var_flds, width) formats[name] = fmt return (fmt, const_flds) @@ -640,6 +644,7 @@ def parse_generic(lineno, is_format, name, toks): global re_ident global insnwidth global insnmask + global variablewidth fixedmask = 0 fixedbits = 0 @@ -725,8 +730,15 @@ def parse_generic(lineno, is_format, name, toks): error(lineno, 'invalid token "{0}"'.format(t)) width += shift + if variablewidth and width < insnwidth and width % 8 == 0: + shift = insnwidth - width + fixedbits <<= shift + fixedmask <<= shift + undefmask <<= shift + undefmask |= (1 << shift) - 1 + # We should have filled in all of the bits of the instruction. - if not (is_format and width == 0) and width != insnwidth: + elif not (is_format and width == 0) and width != insnwidth: error(lineno, 'definition has {0} bits'.format(width)) # Do not check for fields overlaping fields; one valid usage @@ -752,7 +764,7 @@ def parse_generic(lineno, is_format, name, toks): if name in formats: error(lineno, 'duplicate format name', name) fmt = Format(name, lineno, arg, fixedbits, fixedmask, - undefmask, fieldmask, flds) + undefmask, fieldmask, flds, width) formats[name] = fmt else: # Patterns can reference a format ... @@ -762,12 +774,14 @@ def parse_generic(lineno, is_format, name, toks): error(lineno, 'pattern specifies both format and argument set') if fixedmask & fmt.fixedmask: error(lineno, 'pattern fixed bits overlap format fixed bits') + if width != fmt.width: + error(lineno, 'pattern uses format of different width') fieldmask |= fmt.fieldmask fixedbits |= fmt.fixedbits fixedmask |= fmt.fixedmask undefmask |= fmt.undefmask else: - (fmt, flds) = infer_format(arg, fieldmask, flds) + (fmt, flds) = infer_format(arg, fieldmask, flds, width) arg = fmt.base for f in flds.keys(): if f not in arg.fields: @@ -779,7 +793,7 @@ def parse_generic(lineno, is_format, name, toks): if f not in flds.keys() and f not in fmt.fields.keys(): error(lineno, 'field {0} not initialized'.format(f)) pat = Pattern(name, lineno, fmt, fixedbits, fixedmask, - undefmask, fieldmask, flds) + undefmask, fieldmask, flds, width) patterns.append(pat) # Validate the masks that we have assembled. @@ -987,12 +1001,14 @@ def main(): global insntype global insnmask global decode_function + global variablewidth decode_scope = 'static ' - long_opts = ['decode=', 'translate=', 'output=', 'insnwidth='] + long_opts = ['decode=', 'translate=', + 'output=', 'insnwidth=', 'varinsnwidth='] try: - (opts, args) = getopt.getopt(sys.argv[1:], 'o:w:', long_opts) + (opts, args) = getopt.getopt(sys.argv[1:], 'o:vw:', long_opts) except getopt.GetoptError as err: error(0, err) for o, a in opts: @@ -1004,7 +1020,9 @@ def main(): elif o == '--translate': translate_prefix = a translate_scope = '' - elif o in ('-w', '--insnwidth'): + elif o in ('-w', '--insnwidth', '--varinsnwidth'): + if o == '--varinsnwidth': + variablewidth = True insnwidth = int(a) if insnwidth == 16: insntype = 'uint16_t' From patchwork Thu Jan 31 21:08:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 157160 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp7691188jaa; Thu, 31 Jan 2019 13:11:04 -0800 (PST) X-Google-Smtp-Source: AHgI3IYyuYwWtaVewwpTQGXflQYEmSKXQZQz9qMtorALSjqk9LkXmZNVSHK6j2uz05l7frfmlJY7 X-Received: by 2002:a25:543:: with SMTP id 64mr21037433ybf.275.1548969064413; Thu, 31 Jan 2019 13:11:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1548969064; cv=none; d=google.com; s=arc-20160816; b=dWhTDWEMW8QhuxvfnDRLNTdZgwX1hF5uxL5zSNeMye1+mMAPTsbep4HChwjhSA54eQ ODuk9Uiga+3PymZwKNiEFPktsF+tpMRPrETHK6fLxEOXeeLWqVbl3xRH8iM7vBp/xU9W cLR5MoK9c2SNtd2v1BlIK9+aGmhAkbX8iL/6fDhxsreEv1ZYZ/0kUebhTrbcePmqAjdJ UPb1UetT7Xt8iSv8Nbz7ea0u92e6/uNH/mPG/fUrOTylAkvKiLDfmGxjXmH9euMac3li gpfvFSP3Ykb/mxPsYDtr8GSZLTm8RMxSHQlB9oKWlUgbteXBz5bZlwpGmShQTd1t+kmt 9lEg== 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=HrvOtBgvHPXvbREalrTaMMnuhyKoR1EFaApo8LZ33YI=; b=Ucfnal/R50b7n1TLp748//0pg78hTZkrr1uVju2+vBHWGjJEU5QIivY7y2xGCsx5uv /SzTMhfUYjOAYgi+6HLAVCFoGhl0nJmId88Y6KlDXR9WjRVuF0AYlb+qjSIUS8aLabz+ M2ubtE2YXNz6DE7jS4bPlLv/wVT64hnL/oBmX3i0m2j7exD8GMZjX0yo6G0xDYZtQ1U/ HOy8ZzGXYAoZaWfcEjVoad5nSrZYVxuG67iia3yruffSRd/GJmZG9IcL/q1FqQ5nN49g 6y+j6Kj8J6eyhGmt17CC0+on97J+n9ZvA/8SzYdIULL4D5VgFVxW1jgi48PLq12vn6MU j9EQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=UrpyCW0Q; 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 r123si3494538ybr.323.2019.01.31.13.11.04 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 31 Jan 2019 13:11:04 -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=UrpyCW0Q; 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]:60867 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gpJbz-0001VX-Sh for patch@linaro.org; Thu, 31 Jan 2019 16:11:03 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39231) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gpJZz-0000j8-0l for qemu-devel@nongnu.org; Thu, 31 Jan 2019 16:09:00 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gpJZx-0008CE-RY for qemu-devel@nongnu.org; Thu, 31 Jan 2019 16:08:59 -0500 Received: from mail-pg1-x541.google.com ([2607:f8b0:4864:20::541]:46599) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gpJZx-0008BI-Jp for qemu-devel@nongnu.org; Thu, 31 Jan 2019 16:08:57 -0500 Received: by mail-pg1-x541.google.com with SMTP id w7so1870018pgp.13 for ; Thu, 31 Jan 2019 13:08:57 -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=HrvOtBgvHPXvbREalrTaMMnuhyKoR1EFaApo8LZ33YI=; b=UrpyCW0QsuxTZPPLBKC7O6LdMnTXlt3kW3Gnx3YGdzhvDCRtFTfuTosSgeBYAV1UWb 7O3TY9/V/HR119kkOO0NYQGyc2YeiBZsVXGyPukX1pWWc9G4WCaI7ThH1xNwz/jOQWaf XLJgGseaRCbR9uEovkznZ+LzUkySYroFiQYgc= 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=HrvOtBgvHPXvbREalrTaMMnuhyKoR1EFaApo8LZ33YI=; b=tlFJKxYpR1rTosS8SQ0cl3sQw8lqXuo1s+oqV5MumCxJnWeNMqkSqU4yJMbS9sUGDa XRVd1QxVEkOBDUWu7zdlBAvdL+IKU6azPg/NcqzHc+ubKIv7ezrJUtkxraK31PuoxQO5 ziJQ01vw2vgR+ariLfPNrMwM78ioHJ0JgA5vdBxpvXWkCthh/RFcfjE089DxQe3v1qU0 02UfaK/i6wn4uv691CsY5EPETAgRkS6sLwPxnzbOftkI/EKR3tLk618beqIwvCcU9v0x lhm9Ax9m5VpaiB6Hn8D1erRIHOsQQkDZpJlbbQE7zVX+//yeCZZ7rLZYZ46pPRKPpl3e ZxsA== X-Gm-Message-State: AJcUukdr8gQnrBrW4/LDr+0gkocaifh9Yhd2pphu8lTFm4c5itJWkEhI ojHMKh5Zur4qMpXc9ztUWO8kv1+BOrg= X-Received: by 2002:a63:c10f:: with SMTP id w15mr32687729pgf.199.1548968936107; Thu, 31 Jan 2019 13:08:56 -0800 (PST) Received: from cloudburst.twiddle.net (97-126-115-157.tukw.qwest.net. [97.126.115.157]) by smtp.gmail.com with ESMTPSA id z62sm11924391pfl.33.2019.01.31.13.08.55 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 31 Jan 2019 13:08:55 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Thu, 31 Jan 2019 13:08:51 -0800 Message-Id: <20190131210851.9842-3-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20190131210851.9842-1-richard.henderson@linaro.org> References: <20190131210851.9842-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::541 Subject: [Qemu-devel] [PATCH 2/2] decodetree: Expand a decode_load function 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: ysato@users.sourceforge.jp Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Read the instruction, loading no more bytes than necessary. Signed-off-by: Richard Henderson --- scripts/decodetree.py | 175 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 172 insertions(+), 3 deletions(-) -- 2.17.2 diff --git a/scripts/decodetree.py b/scripts/decodetree.py index 5fb0acaa15..05b6b3d18b 100755 --- a/scripts/decodetree.py +++ b/scripts/decodetree.py @@ -966,6 +966,147 @@ def build_tree(pats, outerbits, outermask): # end build_tree +class SizeTree: + """Class representing a node in a size decode tree""" + + def __init__(self, m, w): + self.mask = m + self.subs = [] + self.base = None + self.width = w + + def str1(self, i): + ind = str_indent(i) + r = '{0}{1:08x}'.format(ind, self.mask) + r += ' [\n' + for (b, s) in self.subs: + r += '{0} {1:08x}:\n'.format(ind, b) + r += s.str1(i + 4) + '\n' + r += ind + ']' + return r + + def __str__(self): + return self.str1(0) + + def output_code(self, i, extracted, outerbits, outermask): + ind = str_indent(i) + + # If we need to load more bytes to test, do so now. + if extracted < self.width: + output(ind, 'insn = ', decode_function, + '_load_bytes(s, insn, {0}, {1});\n' + .format(extracted / 8, self.width / 8)); + extracted = self.width + + # Attempt to aid the compiler in producing compact switch statements. + # If the bits in the mask are contiguous, extract them. + sh = is_contiguous(self.mask) + if sh > 0: + # Propagate SH down into the local functions. + def str_switch(b, sh=sh): + return '(insn >> {0}) & 0x{1:x}'.format(sh, b >> sh) + + def str_case(b, sh=sh): + return '0x{0:x}'.format(b >> sh) + else: + def str_switch(b): + return 'insn & 0x{0:08x}'.format(b) + + def str_case(b): + return '0x{0:08x}'.format(b) + + output(ind, 'switch (', str_switch(self.mask), ') {\n') + for b, s in sorted(self.subs): + innermask = outermask | self.mask + innerbits = outerbits | b + output(ind, 'case ', str_case(b), ':\n') + output(ind, ' /* ', + str_match_bits(innerbits, innermask), ' */\n') + s.output_code(i + 4, extracted, innerbits, innermask) + output(ind, '}\n') + output(ind, 'return insn;\n') +# end SizeTree + +class SizeLeaf: + """Class representing a leaf node in a size decode tree""" + + def __init__(self, m, w): + self.mask = m + self.width = w + + def str1(self, i): + ind = str_indent(i) + return '{0}{1:08x}'.format(ind, self.mask) + + def __str__(self): + return self.str1(0) + + def output_code(self, i, extracted, outerbits, outermask): + global decode_function + ind = str_indent(i) + + # If we need to load more bytes, do so now. + if extracted < self.width: + output(ind, 'insn = ', decode_function, + '_load_bytes(s, insn, {0}, {1});\n' + .format(extracted / 8, self.width / 8)); + extracted = self.width + output(ind, 'return insn;\n') +# end SizeLeaf + + +def build_size_tree(pats, width, outerbits, outermask): + global insnwidth + + # Collect the mask of bits that are fixed in this width + innermask = 0xff << (insnwidth - width) + innermask &= ~outermask + minwidth = None + onewidth = True + for i in pats: + innermask &= i.fixedmask + if minwidth is None: + minwidth = i.width + elif minwidth != i.width: + onewidth = False; + if minwidth < i.width: + minwidth = i.width + + if onewidth: + return SizeLeaf(innermask, minwidth) + + if innermask == 0: + if width < minwidth: + return build_size_tree(pats, width + 8, outerbits, outermask) + + pnames = [] + for p in pats: + pnames.append(p.name + ':' + p.file + ':' + str(p.lineno)) + error_with_file(pats[0].file, pats[0].lineno, + 'overlapping patterns size {0}:'.format(width), pnames) + + bins = {} + for i in pats: + fb = i.fixedbits & innermask + if fb in bins: + bins[fb].append(i) + else: + bins[fb] = [i] + + fullmask = outermask | innermask + lens = sorted(bins.keys()) + if len(lens) == 1: + b = lens[0] + return build_size_tree(bins[b], width + 8, b | outerbits, fullmask) + + r = SizeTree(innermask, width) + for b, l in bins.items(): + s = build_size_tree(l, width, b | outerbits, fullmask) + r.subs.append((b, s)) + return r +# end build_size_tree + + def prop_format(tree): """Propagate Format objects into the decode tree""" @@ -988,6 +1129,23 @@ def prop_format(tree): # end prop_format +def prop_size(tree): + """Propagate minimum widths up the decode size tree""" + + if isinstance(tree, SizeTree): + min = None + for (b, s) in tree.subs: + width = prop_size(s) + if min is None or min > width: + min = width + assert min >= tree.width + tree.width = min + else: + min = tree.width + return min +# end prop_size + + def main(): global arguments global formats @@ -1040,8 +1198,12 @@ def main(): parse_file(f) f.close() - t = build_tree(patterns, 0, 0) - prop_format(t) + if variablewidth: + stree = build_size_tree(patterns, 8, 0, 0) + prop_size(stree) + + dtree = build_tree(patterns, 0, 0) + prop_format(dtree) if output_file: output_fd = open(output_file, 'w') @@ -1081,10 +1243,17 @@ def main(): output(i4, i4, f.struct_name(), ' f_', f.name, ';\n') output(i4, '} u;\n\n') - t.output_code(4, False, 0, 0) + dtree.output_code(4, False, 0, 0) output('}\n') + if variablewidth: + output('\n', decode_scope, insntype, ' ', decode_function, + '_load(DisasContext *ctx)\n{\n', + ' ', insntype, ' insn = 0;\n\n') + stree.output_code(4, 0, 0, 0) + output('}\n') + if output_file: output_fd.close() # end main