From b2bb2cd0030cf4b394986b1b1b039dc65655a320 Mon Sep 17 00:00:00 2001
From: Julian Hammer <julian.hammer@fau.de>
Date: Fri, 17 Jan 2020 15:04:08 +0100
Subject: [PATCH] small changes

---
 osaca/parser/parser_x86att.py | 8 +++-----
 osaca/semantics/hw_model.py   | 6 +++++-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/osaca/parser/parser_x86att.py b/osaca/parser/parser_x86att.py
index a59cafc..bb1a654 100755
--- a/osaca/parser/parser_x86att.py
+++ b/osaca/parser/parser_x86att.py
@@ -1,6 +1,7 @@
 #!/usr/bin/env python3
 
 import pyparsing as pp
+import string
 
 from osaca.parser import AttrDict, BaseParser
 
@@ -376,10 +377,7 @@ class ParserX86ATT(BaseParser):
     def is_vector_register(self, register):
         if register is None:
             return False
-        if (
-            len(register['name']) > 2
-            and ''.join([_ for _ in register['name'] if not _.isdigit()])[-2:].lower() == 'mm'
-        ):
+        if register['name'].rstrip(string.digits).lower() in ['mm', 'xmm', 'ymm', 'zmm']:
             return True
         return False
 
@@ -389,5 +387,5 @@ class ParserX86ATT(BaseParser):
         if self.is_gpr(register):
             return 'gpr'
         elif self.is_vector_register(register):
-            return ''.join([_ for _ in register['name'] if not _.isdigit()]).lower()
+            return register['name'].rstrip(string.digits).lower()
         raise ValueError
diff --git a/osaca/semantics/hw_model.py b/osaca/semantics/hw_model.py
index f0b7e75..fd69ca7 100755
--- a/osaca/semantics/hw_model.py
+++ b/osaca/semantics/hw_model.py
@@ -215,6 +215,10 @@ class MachineModel(object):
         arch_dict = {
             'tx2': 'aarch64',
             'zen1': 'x86',
+            'zen+': 'x86',
+            'zen2': 'x86',
+            'con': 'x86',  # Intel Conroe
+            'wol': 'x86',  # Intel Wolfdale
             'snb': 'x86',
             'ivb': 'x86',
             'hsw': 'x86',
@@ -227,7 +231,7 @@ class MachineModel(object):
             'kbl': 'x86',
             'cnl': 'x86',
             'cfl': 'x86',
-            'zen+': 'x86',
+
         }
         arch = arch.lower()
         if arch in arch_dict: