CHB: allow named functions without listing in userdata

Author: sipma

CodeHawk/CHB/bchlib/bCHBCFiles.ml

@@ -316,10 +316,40 @@ object (self)
         (BCH_failure
            (LBLOCK [STR "No enuminfo found with name "; STR name]))
 
-  method has_varinfo (name: string) =
-    (H.mem gvars name) || (H.mem gvardecls name)
-
-  method get_varinfo (name: string) =
+  method private get_prefixed_name (name: string): bvarinfo_t option =
+    let declnames = H.fold (fun k _ a -> k :: a) gvardecls [] in
+    let gvarnames = H.fold (fun k _ a -> k :: a) gvars [] in
+    let namelen = String.length name in
+    let result =
+      List.fold_left (fun result n ->
+          match result with
+          | Some _ -> result
+          | _ ->
+             if String.length n > namelen && (String.sub n 0 namelen) = name then
+               let (ix, _) = H.find gvardecls n in
+               Some ix
+             else
+               None) None declnames in
+    let result =
+      List.fold_left (fun result n ->
+          match result with
+          | Some _ -> result
+          | _ ->
+             if String.length n > namelen && (String.sub n 0 namelen) = name then
+               let (ix, _, _) = H.find gvars n in
+               Some ix
+             else
+               None) result gvarnames in
+    match result with
+    | Some ix -> Some (bcd#get_varinfo ix)
+    | _ -> None
+
+  method has_varinfo ?(prefix=false) (name: string) =
+    (H.mem gvars name)
+    || (H.mem gvardecls name)
+    || (prefix && (Option.is_some (self#get_prefixed_name name)))
+
+  method get_varinfo ?(prefix=false) (name: string): bvarinfo_t =
     if self#has_varinfo name then
       let ix =
         if H.mem gvars name then
@@ -328,6 +358,13 @@ object (self)
           let (ix, _) = H.find gvardecls name in ix
       in
       bcd#get_varinfo ix
+    else if prefix then
+      match self#get_prefixed_name name with
+      | Some vinfo -> vinfo
+      | _ ->
+         raise
+           (BCH_failure
+              (LBLOCK [STR "No varinfo found with prefixed name "; STR name]))
     else
       raise
         (BCH_failure

CodeHawk/CHB/bchlib/bCHBCTypes.mli

@@ -592,12 +592,12 @@ class type bcfiles_int =
     (** [get_varinfo name] returns the varinfo with name [name].
 
         @raise BCH_failure if no varinfo exists with name [name].*)
-    method get_varinfo: string -> bvarinfo_t
+    method get_varinfo: ?prefix:bool -> string -> bvarinfo_t
 
     (** [has_varinfo name] returns true if there exists either a defined or
         declared variable with name [name]. Note that this includes function
         names.*)
-    method has_varinfo: string -> bool
+    method has_varinfo: ?prefix:bool -> string -> bool
 
     method list_varinfos: string list
 

CodeHawk/CHB/bchlib/bCHFunctionInfo.ml

@@ -2651,27 +2651,50 @@ let load_finfo_userdata (finfo: function_info_int) (faddr: doubleword_int) =
   | Some node ->
      finfo#read_xml_user_summary node
   | _ ->
-     let fname =
-       if functions_data#has_function_name faddr then
-         (functions_data#get_function faddr)#get_function_name
+     if functions_data#has_function_name faddr then
+       let fname = (functions_data#get_function faddr)#get_function_name in
+       if bcfiles#has_varinfo fname then
+         let vinfo = bcfiles#get_varinfo fname in
+         let bcsum = function_summary_of_bvarinfo vinfo in
+         begin
+           finfo#set_bc_summary bcsum;
+           chlog#add
+             "bc-function-summary"
+             (LBLOCK [
+                  STR fname;
+                  STR ": ";
+                  function_interface_to_pretty bcsum#get_function_interface])
+         end
        else
+         ()
+     else
+       let fname =
          let hexfaddr = faddr#to_hex_string in
          let lenfaddr = String.length hexfaddr in
          "sub_" ^ (String.sub (faddr#to_hex_string) 2 (lenfaddr - 2)) in
-     if bcfiles#has_varinfo fname then
-       let vinfo = bcfiles#get_varinfo fname in
-       let bcsum = function_summary_of_bvarinfo vinfo in
-       begin
-         finfo#set_bc_summary bcsum;
-         chlog#add
-           "bc-function-summary"
-           (LBLOCK [
-                STR fname;
-                STR ": ";
-                function_interface_to_pretty bcsum#get_function_interface])
-       end
-     else
-       ()
+       if bcfiles#has_varinfo ~prefix:true fname then
+         let vinfo = bcfiles#get_varinfo ~prefix:true fname in
+         let bcsum = function_summary_of_bvarinfo vinfo in
+         begin
+           (if not (vinfo.bvname = fname) then
+              if functions_data#has_function faddr then
+                let fndata = functions_data#get_function faddr in
+                begin
+                  fndata#add_name vinfo.bvname;
+                  chlog#add
+                    "bc-function-summary (update name)"
+                    (LBLOCK [STR vinfo.bvname; STR " from "; STR fname])
+                end);
+           finfo#set_bc_summary bcsum;
+           chlog#add
+             "bc-function-summary"
+             (LBLOCK [
+                  STR vinfo.bvname;
+                  STR ": ";
+                  function_interface_to_pretty bcsum#get_function_interface])
+         end
+       else
+         ()
 
 
 let load_function_info ?(reload=false) (faddr:doubleword_int) =

CodeHawk/CHB/bchlib/bCHVersion.ml

@@ -95,8 +95,8 @@ end
 
 
 let version = new version_info_t 
-  ~version:"0.6.0_20241127"
-  ~date:"2024-11-27"
+  ~version:"0.6.0_20241128"
+  ~date:"2024-11-28"
   ~licensee: None
   ~maxfilesize: None
   ()