CHB: save reglhs and stack offset types in function data

Author: sipma

CodeHawk/CHB/bchlib/bCHFunctionData.ml

@@ -134,6 +134,8 @@ object (self)
   val mutable functiontype = t_unknown
   val mutable callsites = 0
   val mutable pathcontexts = []  (* (ctxt_iaddress_t, ctxt_iaddress_t list) list *)
+  val mutable reglhstypes = []  (* (register_t * iaddr * btype_t option) list *)
+  val mutable stacklhstypes = [] (* (offset * btype_t option) list *)
 
   method set_function_type (ty: btype_t) = functiontype <- ty
 
@@ -174,6 +176,30 @@ object (self)
 
   method has_callsites = callsites > 0
 
+  method set_reglhs_types (regtypes: (register_t * string * btype_t option) list) =
+    reglhstypes <- regtypes
+
+  method get_reglhs_types = reglhstypes
+
+  method get_reglhs_type (reg: register_t) (iaddr: string): btype_t option =
+    List.fold_left (fun acc (r, i, t) ->
+        match acc with
+        | Some _ -> acc
+        | _ ->
+           if BCHCPURegisters.register_equal reg r && i = iaddr then t else acc)
+      None reglhstypes
+
+  method set_stack_offset_types (stacktypes: (int * btype_t option) list) =
+    stacklhstypes <- stacktypes
+
+  method get_stack_offset_types = stacklhstypes
+
+  method get_stack_offset_type (offset: int): btype_t option =
+    List.fold_left (fun acc (o, t) ->
+        match acc with
+        | Some _ -> acc
+        | _ -> if offset == o then t else acc) None stacklhstypes
+
   method add_name (s:string) =
     let s = sanitize_function_name s in
     if List.mem s names then

CodeHawk/CHB/bchlib/bCHLibTypes.mli

@@ -1564,6 +1564,10 @@ class type function_data_int =
         returns the number of remaining call sites.*)
     method remove_callsite: int
 
+    method set_reglhs_types: ((register_t * string * btype_t option) list) -> unit
+
+    method set_stack_offset_types: ((int * btype_t option) list) -> unit
+
     (* accessors *)
     method get_names: string list  (* raw names *)
     method get_function_name: string  (* demangled or combination of all names *)
@@ -1575,6 +1579,10 @@ class type function_data_int =
     method get_inlined_blocks: doubleword_int list
     method get_function_type: btype_t
     method get_path_contexts: (string * string list) list
+    method get_reglhs_types: (register_t * string * btype_t option) list
+    method get_reglhs_type: register_t -> string -> btype_t option
+    method get_stack_offset_types: (int * btype_t option) list
+    method get_stack_offset_type: int -> btype_t option
 
     (* predicates *)
     method has_function_type: bool

CodeHawk/CHB/bchlibarm32/bCHARMAnalysisResults.ml

@@ -284,26 +284,28 @@ object (self)
   val typeconstraintstore = mk_type_constraint_store ()
 
   method record_results ?(save=true) (fn:arm_assembly_function_int) =
-    let fndata = new fn_analysis_results_t fn in
+    let fnadata = new fn_analysis_results_t fn in
     let vard = (get_function_info fn#get_address)#env#varmgr#vard in
     let typeconstraints =
       mk_arm_fn_type_constraints typeconstraintstore fn in
     let node = xmlElement "application-results" in
     begin
       (if save then
          let faddr = fn#get_address#to_hex_string in
+         let fndata = BCHFunctionData.functions_data#get_function fn#get_address in
          begin
-           fndata#write_xml node;
            typeconstraints#record_type_constraints;
-           fndata#write_xml_register_types node
-             (typeconstraintstore#resolve_reglhs_types faddr);
-           fndata#write_xml_stack_types node
+           fndata#set_reglhs_types (typeconstraintstore#resolve_reglhs_types faddr);
+           fndata#set_stack_offset_types
              (typeconstraintstore#resolve_local_stack_lhs_types faddr);
+           fnadata#write_xml_register_types node fndata#get_reglhs_types;
+           fnadata#write_xml_stack_types node fndata#get_stack_offset_types;
+           fnadata#write_xml node;
            node#setAttribute "a" faddr;
            save_app_function_results_file faddr node;
            save_vars faddr vard
          end );
-           (* (if save then fndata#save); *)
+           (* (if save then fnadata#save); *)
       H.add table fn#get_address#to_hex_string fn
     end