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

Merge branch 'master' of github.com:RRZE-HPC/OSACA

Browse Source
This commit is contained in:
Julian Hammer
2019-12-17 12:21:10 +01:00
parent da00b72545 23d270f005
commit 74629b7c49
1 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
osaca/semantics/hw_model.py
View File

@@ -68,21 +68,21 @@ class MachineModel(object):
def get_instruction(self, name, operands):
"""Find and return instruction data from name and operands."""
return self.get_instruction_from_dict(name, operands)
# if name is None:
# return None
# try:
# return next(
# instruction_form
# for instruction_form in self._data['instruction_forms']
# if instruction_form['name'].upper() == name.upper()
# and self._match_operands(instruction_form['operands'], operands)
# )
# except StopIteration:
# return None
# except TypeError as e:
# print('\nname: {}\noperands: {}'.format(name, operands))
# raise TypeError from e
# return self.get_instruction_from_dict(name, operands)
if name is None:
return None
try:
return next(
instruction_form
for instruction_form in self._data['instruction_forms']
if instruction_form['name'].upper() == name.upper()
and self._match_operands(instruction_form['operands'], operands)
)
except StopIteration:
return None
except TypeError as e:
print('\nname: {}\noperands: {}'.format(name, operands))
raise TypeError from e
def get_instruction_from_dict(self, name, operands):
if name is None: