refactoring, attention:

removed from variable_factory.py the
condition below because this is done now
on the device_info at mchplnet:

        if (
            self.device_info.processor_id == "__GENERIC_MICROCHIP_DSPIC__"
        ):  # TODO implement it better for future cores.
            self.device_info.uc_width = 2

Author: Edras Pacola

pyx2cscope/parser/elf16_parser.py

@@ -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.
@@ -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.
 

pyx2cscope/parser/elf_parser.py

@@ -62,10 +62,11 @@ def __init__(self, elf_path: str):
         self.elf_file = None
         self.variable_map = {}
         self.symbol_table = {}
-        self.array_size = 0
+
         self._load_elf_file()
+        self._map_variables()
         self._load_symbol_table()
-
+        self._close_elf_file()
 
     def get_var_info(self, name: str) -> Optional[VariableInfo]:
         """Return the VariableInfo associated with a given variable name, or None if not found.
@@ -76,8 +77,6 @@ def get_var_info(self, name: str) -> Optional[VariableInfo]:
         Returns:
             Optional[VariableInfo]: The information of the variable, if available.
         """
-        if not self.variable_map:
-            self.map_variables()
         return self.variable_map.get(name)
 
     def get_var_list(self) -> List[str]:
@@ -86,20 +85,8 @@ def get_var_list(self) -> List[str]:
         Returns:
             List[str]: A sorted list of variable names.
         """
-        if not self.variable_map:
-            self._map_variables()
         return sorted(self.variable_map.keys(), key=lambda x: x.lower())
 
-    def map_variables(self) -> Dict[str, VariableInfo]:
-        """Map variables from the parsed DWARF information and return them.
-
-        Returns:
-            Dict[str, VariableInfo]: A dictionary of variable names to VariableInfo objects.
-        """
-        if not self.variable_map:
-            self._map_variables()
-        return self.variable_map
-
     @abstractmethod
     def _load_elf_file(self):
         """Load the ELF file according to the specific hardware architecture.
@@ -124,19 +111,32 @@ def _map_variables(self) -> Dict[str, VariableInfo]:
             Dict[str, VariableInfo]: A dictionary of variable names to VariableInfo objects.
         """
 
+    @abstractmethod
+    def _close_elf_file(self):
+        """Abstract method to close any open file connection after parsing is done."""
+
+
 class DummyParser(ElfParser):
     """Dummy implementation of ElfParser class.
 
     This class provides basic functionality of a parser in case an elf_file is
     not supplied. It is a pure implementation of class ElfParser.
     """
 
+
     def __init__(self, elf_path = ""):
         """DummyParser constructor takes no argument."""
         super().__init__(elf_path = elf_path)
 
     def _load_elf_file(self):
         pass
 
+    def _load_symbol_table(self):
+        pass
+
     def _map_variables(self) -> Dict[str, VariableInfo]:
-        return {}
+        return {}
+
+    def _close_elf_file(self):
+        pass
+

pyx2cscope/parser/generic_parser.py

@@ -34,7 +34,7 @@ def _load_elf_file(self):
         except IOError:
             raise Exception(f"Error loading ELF file: {self.elf_path}")
 
-    def close_elf_file(self):
+    def _close_elf_file(self):
         """Closes the ELF file stream."""
         if self.stream:
             self.stream.close()

pyx2cscope/variable/variable_factory.py

@@ -45,12 +45,8 @@ def __init__(self, l_net: LNet, elf_path=None):
         """
         self.l_net = l_net
         self.device_info = self.l_net.get_device_info()
-        if (
-            self.device_info.processor_id == "__GENERIC_MICROCHIP_DSPIC__"
-        ):  # TODO implement it better for future cores.
-            self.device_info.uc_width = 2
 
-        # we should be able to initialize without using and elf file
+        # we should be able to initialize without using and elf file.
         if elf_path is None:
             self.parser = DummyParser()
         else: