This commit is contained in:
JanLJL
2019-04-30 09:44:22 +02:00
parent bd4a5622b2
commit 07cbd63f47

View File

@@ -30,13 +30,14 @@ class MemAddr(Parameter):
self.index = None
self.scale = None
m = re.match(r'(?P<offset>[x0-9a-fA-F]*)\((?P<base>[^,\)]+)(?:,\s*(?P<index>[^,\)]+)'
r'(?:,\s*(?P<scale>[^,\)]+))?)?\)', name)
m = re.match(r'((?P<offset_hex>[x0-9a-fA-F]*)|(?P<offset_dec>\-?[0-9]*))'
r'\((?P<base>[^,\)]+)(?:,\s*(?P<index>[^,\)]+)(?:,\s*'
r'(?P<scale>[^,\)]+))?)?\)', name)
if not m:
raise ValueError('Type not supported: {!r}'.format(name))
self.offset = m.group('offset') or None
self.offset = m.group('offset_dec') or m.group('offset_hex') or None
self.base = m.group('base') or None
self.index = m.group('index') or None
self.scale = m.group('scale') or None