derek/gem5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ISA parser: Don't look for operands in strings.

Browse Source
This commit is contained in:
Gabe Black
2011-09-08 03:21:14 -07:00
parent f4dc64655f
commit f370ac5c18
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/arch/isa_parser.py
View File

@@ -687,8 +687,9 @@ class OperandList(object):
def __init__(self, parser, code):
self.items = []
self.bases = {}
# delete comments so we don't match on reg specifiers inside
code = commentRE.sub('', code)
# delete strings and comments so we don't match on operands inside
for regEx in (stringRE, commentRE):
code = regEx.sub('', code)
# search for operands
next_pos = 0
while 1:
@@ -802,8 +803,9 @@ class SubOperandList(OperandList):
def __init__(self, parser, code, master_list):
self.items = []
self.bases = {}
# delete comments so we don't match on reg specifiers inside
code = commentRE.sub('', code)
# delete strings and comments so we don't match on operands inside
for regEx in (stringRE, commentRE):
code = regEx.sub('', code)
# search for operands
next_pos = 0
while 1:
@@ -854,6 +856,9 @@ class SubOperandList(OperandList):
error("Code block has more than one memory operand.")
self.memOperand = op_desc
# Regular expression object to match C++ strings
stringRE = re.compile(r'"([^"\\]|\\.)*"')
# Regular expression object to match C++ comments
# (used in findOperands())
commentRE = re.compile(r'(^)?[^\S\n]*/(?:\*(.*?)\*/[^\S\n]*|/[^\n]*)($)?',