CHB:FSUM: remove lhsnames from summaries

Author: sipma

CodeHawk/CHB/bchlib/bCHCallTargetInfo.ml

@@ -62,8 +62,6 @@ object (self)
 
   method get_name = fintf.fintf_name
 
-  method get_lhsname = fintf.fintf_lhsname
-
   method get_target = tgt
 
   method get_app_address =

CodeHawk/CHB/bchlib/bCHFunctionInfo.ml

@@ -2014,8 +2014,7 @@ object (self)
         fintf_type_signature = fts;
         fintf_bctype = None;
         fintf_parameter_locations = [];
-        fintf_returntypes = [];
-        fintf_lhsname = None
+        fintf_returntypes = []
       } in
     let fsem = default_function_semantics in
     let fdoc = default_function_documentation in
@@ -2363,9 +2362,6 @@ object (self)
            begin
              v#write_xml ctnode;
              ctnode#setAttribute "a" k;
-             (match v#get_lhsname with
-              | Some name -> ctnode#setAttribute "lhs" name
-              | _ -> ());
              ctnode
            end) calltargets)
 

CodeHawk/CHB/bchlib/bCHFunctionInterface.ml

@@ -620,8 +620,7 @@ let read_xml_function_interface (node:xml_element_int):function_interface_t =
     fintf_type_signature = fts;
     fintf_bctype = Some bctype;
     fintf_parameter_locations = [];
-    fintf_returntypes = [];
-    fintf_lhsname = if has "lhsname" then Some (get "lhsname") else None
+    fintf_returntypes = []
   }
 
 
@@ -899,8 +898,7 @@ let demangled_name_to_function_interface (dm: demangled_name_t) =
     fintf_type_signature = fts;
     fintf_parameter_locations = [];
     fintf_bctype = None;
-    fintf_returntypes = [];
-    fintf_lhsname = None
+    fintf_returntypes = []
   }
 
 
@@ -913,7 +911,6 @@ let default_function_interface
       ?(varargs=false)
       ?(locations=[])
       ?(returntypes=[])
-      ?(lhsname=None)
       (name:string): function_interface_t =
   let fts = {
       fts_parameters = bc_fts_parameters;
@@ -932,8 +929,7 @@ let default_function_interface
     fintf_type_signature = fts;
     fintf_parameter_locations = locations;
     fintf_bctype = bctype;
-    fintf_returntypes = returntypes;
-    fintf_lhsname = lhsname
+    fintf_returntypes = returntypes
   }
 
 

CodeHawk/CHB/bchlib/bCHFunctionInterface.mli

@@ -102,7 +102,6 @@ val default_function_interface:
   -> ?varargs:bool
   -> ?locations:parameter_location_t list
   -> ?returntypes: btype_t list
-  -> ?lhsname: string option
   -> string
   -> function_interface_t
 

CodeHawk/CHB/bchlib/bCHInterfaceDictionary.ml

@@ -390,7 +390,7 @@ object (self)
     }
 
   method index_function_interface (fintf: function_interface_t) =
-    let tags = match fintf.fintf_lhsname with Some name -> [name] | _ -> [] in
+    let tags = [] in
     let args = [
         bd#index_string fintf.fintf_name;
         (match fintf.fintf_jni_index with Some n -> n | _ -> (-1));
@@ -408,17 +408,15 @@ object (self)
 
   method get_function_interface (index: int): function_interface_t =
     let name = "function-interface" in
-    let (tags, args) = function_interface_table#retrieve index in
+    let (_, args) = function_interface_table#retrieve index in
     let a = a name args in
-    let t = t name tags in
     { fintf_name = bd#get_string (a 0);
       fintf_jni_index = if (a 1) = (-1) then None else Some (a 1);
       fintf_syscall_index = if (a 2) = (-1) then None else Some (a 2);
       fintf_type_signature = self#get_function_signature (a 3);
       fintf_parameter_locations = self#get_parameter_location_list (a 4);
       fintf_returntypes = (if (a 5) = (-1) then [] else [bcd#get_typ (a 5)]);
-      fintf_bctype = if (a 6) = (-1) then None else Some (bcd#get_typ (a 6));
-      fintf_lhsname = match tags with [] -> None | _ -> Some (t 0)
+      fintf_bctype = if (a 6) = (-1) then None else Some (bcd#get_typ (a 6))
     }
 
   method index_function_semantics (fsem: function_semantics_t) =

CodeHawk/CHB/bchlib/bCHLibTypes.mli

@@ -2093,8 +2093,7 @@ type function_interface_t = {
     fintf_type_signature: function_signature_t;
     fintf_parameter_locations: parameter_location_t list;
     fintf_returntypes: btype_t list;
-    fintf_bctype: btype_t option;
-    fintf_lhsname: string option
+    fintf_bctype: btype_t option
   }
 
 
@@ -4737,7 +4736,6 @@ class type call_target_info_int =
     (* accessors *)
     method get_target: call_target_t
     method get_name: string
-    method get_lhsname: string option
     method get_app_address: doubleword_int
     method get_application_target: doubleword_int
     method get_wrapped_app_address: doubleword_int

CodeHawk/CHB/bchlib/bCHTypeConstraintStore.ml

@@ -523,8 +523,8 @@ object (self)
          (match ftype with
          | Error _ -> None
          | Ok ftype ->
-            let ixftype = bcd#index_typ ftype in
-            let ixctype = bcd#index_typ ty in
+            let _ixftype = bcd#index_typ ftype in
+            let _ixctype = bcd#index_typ ty in
             let _ =
               chlog#add
                 "first field struct check"
@@ -568,7 +568,7 @@ object (self)
                       STR cinfo.bcname;
                       STR ": first field type: ";
                       STR (btype_to_string ftype)]) in
-             if s#fold (fun acc i -> acc & (i = ixftype || i = ixctype)) true then
+             if s#fold (fun acc i -> acc && (i = ixftype || i = ixctype)) true then
                Some ftype
              else
                None)

CodeHawk/CHB/bchlib/bCHVersion.ml

@@ -95,8 +95,8 @@ end
 
 
 let version = new version_info_t 
-  ~version:"0.6.0_20240830"
-  ~date:"2024-08-30"
+  ~version:"0.6.0_20241003"
+  ~date:"2024-10-03"
   ~licensee: None
   ~maxfilesize: None
   ()

CodeHawk/CHB/bchsummaries/so_functions/atoi.xml

@@ -11,7 +11,7 @@
      <return>int value produced by interpreting the input characters as an int</return>
     </apidoc>
    </documentation>
-   <api adj="0" cc="cdecl" name="atoi" lhsname="intval">
+   <api adj="0" cc="cdecl" name="atoi">
     <returntype>int</returntype>
     <par loc="stack" name="str" rep="hex" nr="1">
       <type><ptr>char</ptr></type>

CodeHawk/CHB/bchsummaries/so_functions/htons.xml

@@ -11,7 +11,7 @@
         <return>argument value converted from host ot network byte order</return>
       </apidoc>
     </documentation>
-    <api adj="0" cc="cdecl" name="htons" lhsname="htonsval">
+    <api adj="0" cc="cdecl" name="htons">
       <par loc="stack" name="hostshort" nr="1">
         <type>uint16_t</type>
       </par>