mirror of https://github.com/xemu-project/xemu.git
decodetree: Rename MultiPattern to IncMultiPattern
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>
This commit is contained in:
parent
2fd51b19c9
commit
040145c4f8
|
@ -371,7 +371,7 @@ class Pattern(General):
|
||||||
# end Pattern
|
# end Pattern
|
||||||
|
|
||||||
|
|
||||||
class MultiPattern(General):
|
class IncMultiPattern(General):
|
||||||
"""Class representing an overlapping set of instruction patterns"""
|
"""Class representing an overlapping set of instruction patterns"""
|
||||||
|
|
||||||
def __init__(self, lineno, pats, fixb, fixm, udfm, w):
|
def __init__(self, lineno, pats, fixb, fixm, udfm, w):
|
||||||
|
@ -410,7 +410,7 @@ class MultiPattern(General):
|
||||||
output(ind, '}\n')
|
output(ind, '}\n')
|
||||||
else:
|
else:
|
||||||
p.output_code(i, extracted, p.fixedbits, p.fixedmask)
|
p.output_code(i, extracted, p.fixedbits, p.fixedmask)
|
||||||
#end MultiPattern
|
#end IncMultiPattern
|
||||||
|
|
||||||
|
|
||||||
def parse_field(lineno, name, toks):
|
def parse_field(lineno, name, toks):
|
||||||
|
@ -751,8 +751,8 @@ def parse_generic(lineno, is_format, name, toks):
|
||||||
.format(allbits ^ insnmask))
|
.format(allbits ^ insnmask))
|
||||||
# end parse_general
|
# end parse_general
|
||||||
|
|
||||||
def build_multi_pattern(lineno, pats):
|
def build_incmulti_pattern(lineno, pats):
|
||||||
"""Validate the Patterns going into a MultiPattern."""
|
"""Validate the Patterns going into a IncMultiPattern."""
|
||||||
global patterns
|
global patterns
|
||||||
global insnmask
|
global insnmask
|
||||||
|
|
||||||
|
@ -792,9 +792,9 @@ def build_multi_pattern(lineno, pats):
|
||||||
else:
|
else:
|
||||||
repeat = False
|
repeat = False
|
||||||
|
|
||||||
mp = MultiPattern(lineno, pats, fixedbits, fixedmask, undefmask, width)
|
mp = IncMultiPattern(lineno, pats, fixedbits, fixedmask, undefmask, width)
|
||||||
patterns.append(mp)
|
patterns.append(mp)
|
||||||
# end build_multi_pattern
|
# end build_incmulti_pattern
|
||||||
|
|
||||||
def parse_file(f):
|
def parse_file(f):
|
||||||
"""Parse all of the patterns within a file"""
|
"""Parse all of the patterns within a file"""
|
||||||
|
@ -860,7 +860,7 @@ def parse_file(f):
|
||||||
error(start_lineno, 'indentation ', indent, ' != ', nesting)
|
error(start_lineno, 'indentation ', indent, ' != ', nesting)
|
||||||
pats = patterns
|
pats = patterns
|
||||||
patterns = saved_pats.pop()
|
patterns = saved_pats.pop()
|
||||||
build_multi_pattern(lineno, pats)
|
build_incmulti_pattern(lineno, pats)
|
||||||
toks = []
|
toks = []
|
||||||
continue
|
continue
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue