Skip to content

Commit

Permalink
decodetree: Rename MultiPattern to IncMultiPattern
Browse files Browse the repository at this point in the history
Name the current node for "inclusive" multi-pattern, in
preparation for adding a node for "exclusive" multi-pattern.

Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
  • Loading branch information
rth7680 committed Jun 8, 2020
1 parent 2fd51b1 commit 040145c
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions scripts/decodetree.py
Expand Up @@ -371,7 +371,7 @@ def output_code(self, i, extracted, outerbits, outermask):
# end Pattern


class MultiPattern(General):
class IncMultiPattern(General):
"""Class representing an overlapping set of instruction patterns"""

def __init__(self, lineno, pats, fixb, fixm, udfm, w):
Expand Down Expand Up @@ -410,7 +410,7 @@ def output_code(self, i, extracted, outerbits, outermask):
output(ind, '}\n')
else:
p.output_code(i, extracted, p.fixedbits, p.fixedmask)
#end MultiPattern
#end IncMultiPattern


def parse_field(lineno, name, toks):
Expand Down Expand Up @@ -751,8 +751,8 @@ 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."""
def build_incmulti_pattern(lineno, pats):
"""Validate the Patterns going into a IncMultiPattern."""
global patterns
global insnmask

Expand Down Expand Up @@ -792,9 +792,9 @@ def build_multi_pattern(lineno, pats):
else:
repeat = False

mp = MultiPattern(lineno, pats, fixedbits, fixedmask, undefmask, width)
mp = IncMultiPattern(lineno, pats, fixedbits, fixedmask, undefmask, width)
patterns.append(mp)
# end build_multi_pattern
# end build_incmulti_pattern

def parse_file(f):
"""Parse all of the patterns within a file"""
Expand Down Expand Up @@ -860,7 +860,7 @@ def parse_file(f):
error(start_lineno, 'indentation ', indent, ' != ', nesting)
pats = patterns
patterns = saved_pats.pop()
build_multi_pattern(lineno, pats)
build_incmulti_pattern(lineno, pats)
toks = []
continue

Expand Down

0 comments on commit 040145c

Please sign in to comment.