CHB:ELF: import symbol names for global variables

Author: sipma

CodeHawk/CHB/bchlibelf/bCHELFHeader.ml

@@ -977,6 +977,7 @@ object(self)
         symboltable#set_symbol_names stringtable ;
         symboltable#set_function_entry_points ;
         symboltable#set_function_names;
+        symboltable#set_data_object_names;
         (if system_settings#is_arm then symboltable#set_mapping_symbols);
       end
     else
@@ -989,7 +990,8 @@ object(self)
       begin
         symboltable#set_symbol_names stringtable ;
         symboltable#set_function_entry_points ;
-        symboltable#set_function_names
+        symboltable#set_function_names;
+        symboltable#set_data_object_names
       end
     else
       chlog#add "no symbols found" (STR "No symbols found")

CodeHawk/CHB/bchlibelf/bCHELFSymbolTable.ml

@@ -6,7 +6,7 @@
 
    Copyright (c) 2005-2020 Kestrel Technology LLC
    Copyright (c) 2020      Henny Sipma
-   Copyright (c) 2021-2023 Aarno Labs LLC
+   Copyright (c) 2021-2024 Aarno Labs LLC
 
    Permission is hereby granted, free of charge, to any person obtaining a copy
    of this software and associated documentation files (the "Software"), to deal
@@ -143,6 +143,8 @@ object (self)
 
   method is_function = self#get_st_type = 2
 
+  method is_data_object = self#get_st_type = 1
+
   method has_address_value = not (st_value#equal wordzero)
 
   method write_xml (node:xml_element_int) =
@@ -240,6 +242,21 @@ object (self)
               v in
           (functions_data#add_function addr)#add_name e#get_name) entries
 
+  method set_data_object_names =
+    H.iter (fun _ e ->
+        if e#is_data_object && e#has_address_value && e#has_name then
+          let cdef = {
+              xconst_name = e#get_name;
+              xconst_value = e#get_st_value;
+              xconst_type = BCHBCTypeUtil.t_unknown;
+              xconst_desc = "symbol-table";
+              xconst_is_addr = true;
+            } in
+          BCHConstantDefinitions.add_address cdef
+        else
+          ()
+      ) entries
+
   method set_mapping_symbols =
     let symbols = H.create 13 in
     let _ =
@@ -311,6 +328,9 @@ object (self)
         (BCH_failure
            (LBLOCK [STR "Symbol with index "; INT index; STR " not found"]))
 
+  method has_symbol (index: int) =
+    H.mem entries index
+
   method write_xml_symbols (node:xml_element_int) =
     let table = mk_num_record_table "symbol-table" in
     begin

CodeHawk/CHB/bchlibelf/bCHELFTypes.mli

@@ -259,6 +259,7 @@ class type elf_symbol_table_entry_int =
     method has_address_value: bool
     method has_name: bool
     method is_function: bool
+    method is_data_object: bool
     method to_rep_record: string list * int list
     method write_xml: xml_element_int -> unit
   end
@@ -270,12 +271,14 @@ class type elf_symbol_table_int =
     method set_symbol_names: elf_string_table_int -> unit
     method set_function_entry_points: unit
     method set_function_names: unit
+    method set_data_object_names: unit
     method set_mapping_symbols: unit
     method get_xstring: string
     method get_size: int
     method get_xsubstring: doubleword_int -> int -> string
     method get_vaddr: doubleword_int
     method get_symbol: int -> elf_symbol_table_entry_int
+    method has_symbol: int -> bool
     method get_string_reference: doubleword_int -> string option
     method includes_VA: doubleword_int -> bool
     method write_xml: xml_element_int -> unit