CHB: retain user entered function entry points

Author: sipma

CodeHawk/CHB/bchlib/bCHFunctionData.ml

@@ -223,21 +223,21 @@ object (self)
       H.clear nametable
     end
 
-  method add_function (fa:doubleword_int) =
+  method add_function (fa:doubleword_int): function_data_int =
     let ix = fa#index in
     if H.mem table ix then
       H.find table ix
     else
       let fe = new function_data_t fa in
       begin
-        H.add table ix fe ;
+        H.add table ix fe;
         fe
       end
 
   method remove_function (fa: doubleword_int) =
     H.remove table fa#index
 
-  method get_function (fa: doubleword_int) =
+  method get_function (fa: doubleword_int): function_data_int =
     if self#is_function_entry_point fa then
       H.find table fa#index
     else
@@ -249,20 +249,21 @@ object (self)
   method has_function (fa: doubleword_int) =
     self#is_function_entry_point fa
 
-  method get_functions = H.fold (fun _ v a -> v::a) table []
+  method get_functions: function_data_int list =
+    H.fold (fun _ v a -> v::a) table []
 
-  method get_inlined_function_entry_points =
+  method get_inlined_function_entry_points: doubleword_int list =
     self#retrieve_addresses (fun f -> f#is_inlined)
 
-  method get_function_entry_points =
+  method get_function_entry_points: doubleword_int list =
     let inlinedfns = self#get_inlined_function_entry_points in
     let otherfns = self#retrieve_addresses (fun f -> not f#is_inlined) in
     (* List inlined functions before other functions, so they are guaranteed
        to have been constructed before the functions that inline them are
        being constructed.*)
     inlinedfns @ otherfns
 
-  method get_library_stubs =
+  method get_library_stubs: doubleword_int list =
     self#retrieve_addresses (fun f -> f#is_library_stub)
 
   method is_function_entry_point (fa:doubleword_int) = H.mem table fa#index

CodeHawk/CHB/bchlib/bCHSystemInfo.ml

@@ -984,9 +984,12 @@ object (self)
   method private read_xml_user_function_entry_points (node:xml_element_int) =
     List.iter (fun n ->
         let fa = geta_fail "read_xml_user_function_entry_points" n "a" in
-        if functions_data#is_function_entry_point fa then () else
-          ignore (functions_data#add_function fa))
-      (node#getTaggedChildren "fe")
+        let fndata =
+          if functions_data#is_function_entry_point fa then
+            functions_data#get_function fa
+          else
+            functions_data#add_function fa in
+        fndata#set_user_provided) (node#getTaggedChildren "fe")
 
   method private read_xml_call_target(node: xml_element_int): call_target_t =
     let get = node#getAttribute in

CodeHawk/CHB/bchlibarm32/bCHARMAssemblyFunctions.ml

@@ -628,7 +628,7 @@ object (self)
                        if functions_data#is_function_entry_point tgtaddr then
                          let fndata = functions_data#get_function tgtaddr in
                          let remaining = fndata#remove_callsite in
-                         if remaining = 0 then
+                         if remaining = 0 && not fndata#is_user_provided then
                            begin
                              functions_data#remove_function tgtaddr;
                              self#remove_function tgtaddr;
@@ -748,10 +748,11 @@ object (self)
                     | BranchLink (_, op)
                       | BranchLinkExchange (_, op) when op#is_absolute_address ->
                        let tgtaddr = op#get_absolute_address in
-                       if functions_data#is_function_entry_point tgtaddr && !notcode then
+                       if functions_data#is_function_entry_point tgtaddr
+                          && !notcode then
                          let fndata = functions_data#get_function tgtaddr in
                          let remaining = fndata#remove_callsite in
-                         if remaining = 0 then
+                         if remaining = 0 && not fndata#is_user_provided then
                            begin
                              functions_data#remove_function tgtaddr;
                              self#remove_function tgtaddr;