Lerking/OSACA
1
0
Fork 0
mirror of https://github.com/RRZE-HPC/OSACA.git synced 2026-01-07 03:30:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

detects numeric label as label

Browse Source
This commit is contained in:
JanLJL
2020-08-03 16:59:48 +02:00
parent 1d8415c925
commit a75405b77b
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
osaca/parser/parser_x86att.py
View File

@@ -34,8 +34,13 @@ class ParserX86ATT(BaseParser):
+ pp.Optional(relocation).setResultsName('relocation')
).setResultsName('identifier')
# Label
numeric_identifier = pp.Group(
pp.Word(pp.nums).setResultsName('name') + pp.Optional(pp.oneOf('b f', caseless=True))
).setResultsName('identifier')
self.label = pp.Group(
identifier.setResultsName('name') + pp.Literal(':') + pp.Optional(self.comment)
(identifier | numeric_identifier).setResultsName('name')
+ pp.Literal(':')
+ pp.Optional(self.comment)
).setResultsName(self.LABEL_ID)
# Register: pp.Regex('^%[0-9a-zA-Z]+{}{z},?')
self.register = pp.Group(
@@ -132,7 +137,7 @@ class ParserX86ATT(BaseParser):
pp.alphanums
).setResultsName('mnemonic')
# Combine to instruction form
operand_first = pp.Group(self.register ^ immediate ^ memory ^ identifier)
operand_first = pp.Group(self.register ^ immediate ^ memory ^ identifier ^ numeric_identifier)
operand_rest = pp.Group(self.register ^ immediate ^ memory)
self.instruction_parser = (
mnemonic
@@ -305,7 +310,10 @@ class ParserX86ATT(BaseParser):
def process_label(self, label):
"""Post-process label asm line"""
# remove duplicated 'name' level due to identifier
label['name'] = label['name']['name']
if 'name' in label['name'][0]:
label['name'] = label['name'][0]['name']
else:
label['name'] = label['name'][0]
return AttrDict({self.LABEL_ID: label})
def process_immediate(self, immediate):