From c5359cb832297aa00a361574272cd4fe6d64029f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Berkay=20=C3=9Cr=C3=BCn?=
 <berkay.ueruen@aisec.fraunhofer.de>
Date: Fri, 14 Jul 2023 03:08:11 +0200
Subject: [PATCH] Make id and ins consistent

---
 analysis/analysisfunctions.py | 4 ++--
 controller.py                 | 4 ++--
 hdf5logger.py                 | 8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/analysis/analysisfunctions.py b/analysis/analysisfunctions.py
index 5997e56..7b736d5 100644
--- a/analysis/analysisfunctions.py
+++ b/analysis/analysisfunctions.py
@@ -240,7 +240,7 @@ def get_experiment_tbinfo(faultgroup, faultname):
 
 
 def get_experiment_tbinfo_expanded(filehandle, faultname):
-    return get_experiment_table_expanded(filehandle, faultname, "tbinfo", ["identity"])
+    return get_experiment_table_expanded(filehandle, faultname, "tbinfo", ["id"])
 
 
 def get_experiment_tbexec(faultgroup, faultname):
@@ -257,5 +257,5 @@ def get_experiment_meminfo(faultgroup, faultname):
 
 def get_experiment_meminfo_expanded(filehandle, faultname):
     return get_experiment_table_expanded(
-        filehandle, faultname, "meminfo", ["insaddr", "address"]
+        filehandle, faultname, "meminfo", ["ins", "address"]
     )
diff --git a/controller.py b/controller.py
index d77ebfa..6d0df74 100755
--- a/controller.py
+++ b/controller.py
@@ -376,7 +376,7 @@ def read_backup(hdf5_file):
         backup_goldenrun["tbinfo"] = [
             {
                 "assembler": tb_info["assembler"].decode("utf-8"),
-                "identity": tb_info["identity"],
+                "id": tb_info["id"],
                 "ins_count": tb_info["ins_count"],
                 "num_exec": tb_info["num_exec"],
                 "size": tb_info["size"],
@@ -395,7 +395,7 @@ def read_backup(hdf5_file):
                     "address": mem["address"],
                     "counter": mem["counter"],
                     "direction": mem["direction"],
-                    "insaddr": mem["insaddr"],
+                    "ins": mem["ins"],
                     "size": mem["size"],
                     "tbid": mem["tbid"],
                 }
diff --git a/hdf5logger.py b/hdf5logger.py
index d68708e..9c35680 100644
--- a/hdf5logger.py
+++ b/hdf5logger.py
@@ -27,7 +27,7 @@
 
 # Tables for storing the elements from queue
 class translation_block_table(tables.IsDescription):
-    identity = tables.UInt64Col()
+    id = tables.UInt64Col()
     size = tables.UInt64Col()
     ins_count = tables.UInt64Col()
     num_exec = tables.UInt64Col()
@@ -45,7 +45,7 @@ class translation_block_exec_table(tables.IsDescription):
 
 
 class memory_information_table(tables.IsDescription):
-    insaddr = tables.Int64Col()
+    ins = tables.Int64Col()
     tbid = tables.UInt64Col()
     size = tables.UInt64Col()
     address = tables.Int64Col()
@@ -292,7 +292,7 @@ def process_tbinfo(f, group, tbinfolist, myfilter):
     )
     tbinforow = tbinfotable.row
     for tbinfo in tbinfolist:
-        tbinforow["identity"] = tbinfo["id"]
+        tbinforow["id"] = tbinfo["id"]
         tbinforow["size"] = tbinfo["size"]
         tbinforow["ins_count"] = tbinfo["ins_count"]
         tbinforow["num_exec"] = tbinfo["num_exec"]
@@ -331,7 +331,7 @@ def process_memory_info(f, group, meminfolist, myfilter):
     )
     meminforow = meminfotable.row
     for meminfo in meminfolist:
-        meminforow["insaddr"] = meminfo["ins"]
+        meminforow["ins"] = meminfo["ins"]
         meminforow["tbid"] = meminfo["tbid"]
         meminforow["size"] = meminfo["size"]
         meminforow["address"] = meminfo["address"]