From 1e7d49c891689c26c611790ac534c8498662184b Mon Sep 17 00:00:00 2001
From: Julian Hammer <julian.hammer@fau.de>
Date: Fri, 25 Oct 2019 16:09:02 +0200
Subject: [PATCH] collapsed x86 and arm functions into generic function

---
 osaca/semantics/semantics_appender.py | 40 +++++++++------------------
 1 file changed, 13 insertions(+), 27 deletions(-)

diff --git a/osaca/semantics/semantics_appender.py b/osaca/semantics/semantics_appender.py
index 2116ad5..4b8daa9 100755
--- a/osaca/semantics/semantics_appender.py
+++ b/osaca/semantics/semantics_appender.py
@@ -306,37 +306,23 @@ class SemanticsAppender(object):
 
     def _get_regular_source_operands(self, instruction_form):
         if self._isa == 'x86':
-            return self._get_regular_source_x86ATT(instruction_form)
-        if self._isa == 'aarch64':
-            return self._get_regular_source_AArch64(instruction_form)
+            # return all but last operand
+            return [op
+                    or op in instruction_form['operands'][0:len(instruction_form['operands']) - 1]]
+        elif self._isa == 'aarch64':
+            return [op for op in instruction_form['operands'][1:len(instruction_form['operands'])]]
+        else:
+            raise ValueError("Unsupported ISA {}.".format(self._isa))
 
     def _get_regular_destination_operands(self, instruction_form):
         if self._isa == 'x86':
-            return self._get_regular_destination_x86ATT(instruction_form)
+            # return last operand
+            return instruction_form['operands'][-1:]
         if self._isa == 'aarch64':
-            return self._get_regular_destination_AArch64(instruction_form)
-
-    def _get_regular_source_x86ATT(self, instruction_form):
-        # return all but last operand
-        sources = [
-            op for op in instruction_form['operands'][0:len(instruction_form['operands']) - 1]
-        ]
-        return sources
-
-    def _get_regular_source_AArch64(self, instruction_form):
-        # return all but first operand
-        sources = [
-            op for op in instruction_form['operands'][1:len(instruction_form['operands'])]
-        ]
-        return sources
-
-    def _get_regular_destination_x86ATT(self, instruction_form):
-        # return last operand
-        return instruction_form['operands'][-1:]
-
-    def _get_regular_destination_AArch64(self, instruction_form):
-        # return first operand
-        return instruction_form['operands'][:1]
+            # return first operand
+            return instruction_form['operands'][:1]
+        else:
+            raise ValueError("Unsupported ISA {}.".format(self._isa))
 
     @staticmethod
     def get_throughput_sum(kernel):