Merge remote-tracking branch 'origin/Feat-Unified-parser' into Feat-Unified-parser

# Conflicts:
#	tests/utils/comparision_elf.py

Author: Yash Agarwal

pyx2cscope/gui/img/COM-Port.jpg doc/images/COM-Port.jpgpyx2cscope/gui/img/COM-Port.jpg renamed to doc/images/COM-Port.jpg

@@ -35,13 +35,6 @@ class Elf16Parser(ElfParser):
         xc16_read_elf_path (str): Path to the XC16 `readelf` executable.
     """
 
-    def _load_symbol_table(self):
-        """Load symbol tables.
-
-        This method exists at this class only for compatibility.
-        This class is deprecated and not maintained on current version.
-        """
-        pass
 
     def __init__(self, elf_path):
         """Initialize the Elf16Parser instance.
@@ -58,7 +51,7 @@ def __init__(self, elf_path):
             os.path.dirname(os.path.abspath(__file__)), "xc16-readelf"
         )
 
-        logging.warn("Do not use this class for new development, it will be discontinued.")
+        logging.warning("Do not use this class for new development, it will be discontinued.")
 
         # Checking if the xc16-readelf executable exists in the same directory as the script or executable
         if os.path.exists(local_readelf):
@@ -77,6 +70,17 @@ def __init__(self, elf_path):
         self.tree_string = None
         self.next_line = None
 
+    def _load_symbol_table(self):
+        """Load symbol tables.
+
+        This method exists at this class only for compatibility.
+        This class is deprecated and not maintained on current version.
+        """
+        pass
+
+    def _close_elf_file(self):
+        pass
+
     def _parse_cu_attributes(self):
         """Parse the attributes of a compilation unit from the ELF file.
 
@@ -377,13 +381,15 @@ def _check_for_pointer_tag(self, die, end_die, address):
         """
         if end_die["tag"] != "DW_TAG_pointer_type":
             return False
-        _variabledata = VariableInfo(
+        variable_data = VariableInfo(
             name=die["DW_AT_name"],
-            byte_size=end_die["DW_AT_byte_size"],
             type="pointer",
+            byte_size=end_die["DW_AT_byte_size"],
             address=address,
+            array_size=0,
+            valid_values = {}
         )
-        self.variable_map[die["DW_AT_name"]] = _variabledata
+        self.variable_map[die["DW_AT_name"]] = variable_data
         return True
 
     def _check_for_structure_tag(self, die, end_die, address):
@@ -404,9 +410,11 @@ def _check_for_structure_tag(self, die, end_die, address):
                 # Return the entire structure as a single variable
                 variable_data = VariableInfo(
                     name=die["DW_AT_name"],
-                    byte_size=end_die["DW_AT_byte_size"],
                     type=end_die["DW_AT_name"],
+                    byte_size=end_die["DW_AT_byte_size"],
                     address=address,
+                    array_size=0,
+                    valid_values={}
                 )
                 self.variable_map[die["DW_AT_name"]] = variable_data
             if members:
@@ -418,6 +426,7 @@ def _check_for_structure_tag(self, die, end_die, address):
                         type=member_info.get("type"),
                         address=address + (member_info.get("address_offset")),
                         array_size=member_info.get("array_size"),
+                        valid_values={}
                     )
                     self.variable_map[member_name] = variable_data
                     # Reset array attributes for each variable
@@ -531,14 +540,15 @@ def _map_variables(self) -> dict[str, VariableInfo]:
                         type=end_die["DW_AT_name"],
                         address=address,
                         array_size=self.calculate_array_size(die),
+                        valid_values={}
                     )
                     self.variable_map[die["DW_AT_name"]] = variable_data
         return self.variable_map
 
 
 if __name__ == "__main__":
-    # elf_file = r"C:\_DESKTOP\_Projects\Motorbench_Projects\ZSMT-42BLF02-MCLV2-33ck256mp508.X\dist\default\production\ZSMT-42BLF02-MCLV2-33ck256mp508.X.production.elf"
-    elf_file = r"C:\_DESKTOP\_Projects\Motorbench_Projects\motorbench_FOC_PLL_PIC33CK256mp508_MCLV2\ZSMT_dsPIC33CK_MCLV_48_300.X\dist\default\production\ZSMT_dsPIC33CK_MCLV_48_300.X.production.elf"
+    elf_file = r"..\..\tests\data\MCAF_ZSMT_dsPIC33CK.elf"
+    # elf_file = r"..\..\tests\data\mc_foc_sl_fip_dspic33ck_mclv48v300w.elf"
     # logging.basicConfig(level=logging.DEBUG)  # Set the desired logging level and stream
     elf_reader = Elf16Parser(elf_file)
     variable_map = elf_reader.map_variables()