Removes old data server and cleans up python code

3 files changed, 21 insertions, 30 deletions

diff --git a/arch/dummy/arch.c b/arch/dummy/arch.c
index 5f7b912..20fc49d 100644
--- a/arch/dummy/arch.c
+++ b/arch/dummy/arch.c
@@ -1,4 +1,4 @@
-#if (defined(COMMAND_BENCH) || defined(COMMAND_NEW)) && defined(ANC_BYTES)
+#if defined(COMMAND_NEW)
 void arch_core_init(struct Core *core) {
     assert(core);
 
@@ -27,7 +27,7 @@ void arch_core_free(struct Core *core) {
     (void)core;
 }
 
-#if defined(COMMAND_LOAD) || defined(COMMAND_NEW)
+#if defined(COMMAND_NEW) || defined(COMMAND_LOAD)
 void arch_core_save(FILE *f, const struct Core *core) {
     assert(f);
     assert(core);
@@ -144,7 +144,7 @@ const char *arch_mnemonic(uint8_t inst) {
     return NULL;
 }
 
-#if defined(DATA_PUSH_PATH)
+#if defined(DATA_PUSH)
 #if defined(COMMAND_NEW)
 void arch_push_data_header(void) {
     assert(g_sim_data);
diff --git a/arch/dummy/arch_vars.py b/arch/dummy/arch_vars.py
deleted file mode 100644
index 0516167..0000000
--- a/arch/dummy/arch_vars.py
+++ /dev/null
@@ -1,27 +0,0 @@
-class ArchVars:
-    def __init__(self, _):
-        self.inst_set = [
-            (["dummy", f"{i:02x}"], symbol)
-            for i, symbol in enumerate(
-                "⠀⠁⠂⠃⠄⠅⠆⠇⡀⡁⡂⡃⡄⡅⡆⡇⠈⠉⠊⠋⠌⠍⠎⠏⡈⡉⡊⡋⡌⡍⡎⡏⠐⠑⠒⠓⠔⠕⠖⠗⡐⡑⡒⡓⡔⡕⡖⡗⠘⠙⠚⠛⠜⠝⠞⠟⡘⡙⡚⡛⡜⡝⡞⡟"
-                "⠠⠡⠢⠣⠤⠥⠦⠧⡠⡡⡢⡣⡤⡥⡦⡧⠨⠩⠪⠫⠬⠭⠮⠯⡨⡩⡪⡫⡬⡭⡮⡯⠰⠱⠲⠳⠴⠵⠶⠷⡰⡱⡲⡳⡴⡵⡶⡷⠸⠹⠺⠻⠼⠽⠾⠿⡸⡹⡺⡻⡼⡽⡾⡿"
-                "⢀⢁⢂⢃⢄⢅⢆⢇⣀⣁⣂⣃⣄⣅⣆⣇⢈⢉⢊⢋⢌⢍⢎⢏⣈⣉⣊⣋⣌⣍⣎⣏⢐⢑⢒⢓⢔⢕⢖⢗⣐⣑⣒⣓⣔⣕⣖⣗⢘⢙⢚⢛⢜⢝⢞⢟⣘⣙⣚⣛⣜⣝⣞⣟"
-                "⢠⢡⢢⢣⢤⢥⢦⢧⣠⣡⣢⣣⣤⣥⣦⣧⢨⢩⢪⢫⢬⢭⢮⢯⣨⣩⣪⣫⣬⣭⣮⣯⢰⢱⢲⢳⢴⢵⢶⢷⣰⣱⣲⣳⣴⣵⣶⣷⢸⢹⢺⢻⢼⢽⢾⢿⣸⣹⣺⣻⣼⣽⣾⣿"
-            )
-        ]
-
-        self.core_fields = []
-        self.core_data_fields = []
-        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"),
-        ]
-
-        self.plots = {}
-        self.heatmaps = {}
diff --git a/arch/dummy/vars.py b/arch/dummy/vars.py
new file mode 100644
index 0000000..7150767
--- /dev/null
+++ b/arch/dummy/vars.py
@@ -0,0 +1,18 @@
+inst_set = [(["dummy", f"{i:02x}"], symbol) for i, symbol in enumerate(
+    "⠀⠁⠂⠃⠄⠅⠆⠇⡀⡁⡂⡃⡄⡅⡆⡇⠈⠉⠊⠋⠌⠍⠎⠏⡈⡉⡊⡋⡌⡍⡎⡏⠐⠑⠒⠓⠔⠕⠖⠗⡐⡑⡒⡓⡔⡕⡖⡗⠘⠙⠚⠛⠜⠝⠞⠟⡘⡙⡚⡛⡜⡝⡞⡟"
+    "⠠⠡⠢⠣⠤⠥⠦⠧⡠⡡⡢⡣⡤⡥⡦⡧⠨⠩⠪⠫⠬⠭⠮⠯⡨⡩⡪⡫⡬⡭⡮⡯⠰⠱⠲⠳⠴⠵⠶⠷⡰⡱⡲⡳⡴⡵⡶⡷⠸⠹⠺⠻⠼⠽⠾⠿⡸⡹⡺⡻⡼⡽⡾⡿"
+    "⢀⢁⢂⢃⢄⢅⢆⢇⣀⣁⣂⣃⣄⣅⣆⣇⢈⢉⢊⢋⢌⢍⢎⢏⣈⣉⣊⣋⣌⣍⣎⣏⢐⢑⢒⢓⢔⢕⢖⢗⣐⣑⣒⣓⣔⣕⣖⣗⢘⢙⢚⢛⢜⢝⢞⢟⣘⣙⣚⣛⣜⣝⣞⣟"
+    "⢠⢡⢢⢣⢤⢥⢦⢧⣠⣡⣢⣣⣤⣥⣦⣧⢨⢩⢪⢫⢬⢭⢮⢯⣨⣩⣪⣫⣬⣭⣮⣯⢰⢱⢲⢳⢴⢵⢶⢷⣰⣱⣲⣳⣴⣵⣶⣷⢸⢹⢺⢻⢼⢽⢾⢿⣸⣹⣺⣻⣼⣽⣾⣿"
+)]
+
+core_data_fields = []
+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"),
+]