1 files changed, 16 insertions, 18 deletions
diff --git a/arch/dummy/arch_vars.py b/arch/dummy/arch_vars.py
index bc97ea9..0266e53 100644
--- a/arch/dummy/arch_vars.py
+++ b/arch/dummy/arch_vars.py
@@ -1,18 +1,6 @@
-def gen_arch_vars(_):
-    return {
-        "core_fields": [],
-        "mvec_loop": True,
-
-        "proc_fields": [
-            ("uint64_t", "ip"),
-            ("uint64_t", "sp"),
-            ("uint64_t", "mb0a"),
-            ("uint64_t", "mb0s"),
-            ("uint64_t", "mb1a"),
-            ("uint64_t", "mb1s"),
-        ],
-
-        "inst_set": [
+class ArchVars:
+    def __init__(self, _):
+        self.inst_set = [
             (["dummy", f"{i:02x}"], symbol)
             for i, symbol in enumerate(
                 "⠀⠁⠂⠃⠄⠅⠆⠇⡀⡁⡂⡃⡄⡅⡆⡇⠈⠉⠊⠋⠌⠍⠎⠏⡈⡉⡊⡋⡌⡍⡎⡏⠐⠑⠒⠓⠔⠕⠖⠗⡐⡑⡒⡓⡔⡕⡖⡗⠘⠙⠚⠛⠜⠝⠞⠟⡘⡙⡚⡛⡜⡝⡞⡟"
@@ -20,7 +8,17 @@ def gen_arch_vars(_):
                 "⢀⢁⢂⢃⢄⢅⢆⢇⣀⣁⣂⣃⣄⣅⣆⣇⢈⢉⢊⢋⢌⢍⢎⢏⣈⣉⣊⣋⣌⣍⣎⣏⢐⢑⢒⢓⢔⢕⢖⢗⣐⣑⣒⣓⣔⣕⣖⣗⢘⢙⢚⢛⢜⢝⢞⢟⣘⣙⣚⣛⣜⣝⣞⣟"
                 "⢠⢡⢢⢣⢤⢥⢦⢧⣠⣡⣢⣣⣤⣥⣦⣧⢨⢩⢪⢫⢬⢭⢮⢯⣨⣩⣪⣫⣬⣭⣮⣯⢰⢱⢲⢳⢴⢵⢶⢷⣰⣱⣲⣳⣴⣵⣶⣷⢸⢹⢺⢻⢼⢽⢾⢿⣸⣹⣺⣻⣼⣽⣾⣿"
             )
-        ],
+        ]
 
-        "inst_count": 2 ** 7,
-    }
+        self.core_fields = []
+        self.data_is_compressed = False
+        self.mvec_loop = True
+
+        self.proc_fields = [
+            ("uint64_t", "ip"),
+            ("uint64_t", "sp"),
+            ("uint64_t", "mb0a"),
+            ("uint64_t", "mb0s"),
+            ("uint64_t", "mb1a"),
+            ("uint64_t", "mb1s"),
+        ]