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: 159140 Delivered-To: patch@linaro.org Received: by 2002:a02:5cc1:0:0:0:0:0 with SMTP id w62csp477757jad; Sat, 23 Feb 2019 15:36:43 -0800 (PST) X-Google-Smtp-Source: AHgI3IZwCQg93muel/GqzLnceAUv6zNJ567tMFCHFASSDN5n64pIgpwBcH6tsg7nfO5oNLTlq/Pf X-Received: by 2002:a0d:ecd2:: with SMTP id v201mr8366899ywe.96.1550965003309; Sat, 23 Feb 2019 15:36:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1550965003; cv=none; d=google.com; s=arc-20160816; b=jxYOSCCbFdy/hhUHuXg72y2E3wFjVWYz3q3a/K8+kzoLHxEC8Z/YtHJjKvcudjVe0N A5E0q4YnDQot2QmduOWcl+i0SvvDDAZW+UAYfqig18e+ltcooEuNd5RDK04AYDak9S4r DRmewabEewLRs+2at6ub8fDT/xcN48bHFPfE5lalN88+Aft0HPHAeU5HIBhOIUp3ba1E xTLNTCHyfgUZQ58d5DspGu3pFIfi0uRVnrsz1nCYw+4adIImyRLK1fs3f3pioenUYlQ7 jjPM3kkh7I5XnBgQzjS4ntNh9dJ515pyVCUmcFMhye7ZLGj9n6FPV6B1CU2d3YCeDCVl TrsA== 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=vDT4qdGCChfvYo8MTh4ScxaHuIyJTWKaydd3SYXdkkI=; b=DyeQEYZoggtU/U7I7SEs8+N6663uKBuz4Kh3XbdsqtLWZK13ZkOJKJ8LgUePctm7l3 JCzEo+dEA8ualCykwmYZ2loykH3cwtaJcwCvYN/KrnkEOqSQmL1E7gCy/lxIxi8r3z+D e1pkylixrjFIHVmBB2u8JtpFFh4DoGBp2bBBrp4pRKaxXf+PuLJuAU5uQzA+gnewK++X sDNKbRTwjFjURNt6cvzb9XP2/vIbEYjdZZTu8kmcnhi/lmH6AZp5Hfi+R/sdmdvTRowe RhVn9NzCEFU/ZApPyyA5whER67hcwgQhxNOiO8AK2DQ+/4l+ZNS+uKp2V/pSswEERnPV 85Jg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=sUZUBbSJ; 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" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id z133si561274ywb.276.2019.02.23.15.36.43 for (version=TLS1 cipher=AES128-SHA bits=128/128); Sat, 23 Feb 2019 15:36:43 -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=sUZUBbSJ; 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" Received: from localhost ([127.0.0.1]:43927 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gxgqY-0004s0-Rg for patch@linaro.org; Sat, 23 Feb 2019 18:36:42 -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-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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Richard Henderson --- docs/decodetree.rst | 58 +++++++++++++++++ scripts/decodetree.py | 144 ++++++++++++++++++++++++++++++++++++++---- 2 files changed, 191 insertions(+), 11 deletions(-) -- 2.17.2 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: