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

fixed first character match for symbolic identifiers

Browse Source
This commit is contained in:
JanLJL
2020-08-03 18:30:29 +02:00
parent 40755b2080
commit 0db8b6bcbf
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
osaca/parser/parser_x86att.py
View File

@@ -25,7 +25,7 @@ class ParserX86ATT(BaseParser):
# Define x86 assembly identifier
relocation = pp.Combine(pp.Literal('@') + pp.Word(pp.alphas))
id_offset = pp.Word(pp.nums) + pp.Suppress(pp.Literal('+'))
first = pp.Word(pp.alphanums + '_.', exact=1)
first = pp.Word(pp.alphas + '_.', exact=1)
rest = pp.Word(pp.alphanums + '$_.+-')
identifier = pp.Group(
pp.Optional(id_offset).setResultsName('offset')
@@ -34,7 +34,8 @@ class ParserX86ATT(BaseParser):
).setResultsName('identifier')
# Label
numeric_identifier = pp.Group(
pp.Word(pp.nums).setResultsName('name') + pp.Optional(pp.oneOf('b f', caseless=True).setResultsName('suffix'))
pp.Word(pp.nums).setResultsName('name')
+ pp.Optional(pp.oneOf('b f', caseless=True).setResultsName('suffix'))
).setResultsName('identifier')
self.label = pp.Group(
(identifier | numeric_identifier).setResultsName('name')
@@ -136,7 +137,9 @@ class ParserX86ATT(BaseParser):
pp.alphanums
).setResultsName('mnemonic')
# Combine to instruction form
operand_first = pp.Group(self.register ^ immediate ^ memory ^ identifier ^ numeric_identifier)
operand_first = pp.Group(
self.register ^ immediate ^ memory ^ identifier ^ numeric_identifier
)
operand_rest = pp.Group(self.register ^ immediate ^ memory)
self.instruction_parser = (
mnemonic