CHB: remove types from functioninfo

Author: sipma

CodeHawk/CHB/bchlib/bCHFloc.ml

@@ -1427,6 +1427,7 @@ object (self)
        if self#is_composite_symbolic_value rhsx then
          let sv = self#env#mk_symbolic_value rhsx in
          begin
+           (*
            (match vtype with
             | TUnknown _ -> ()
             | _ ->
@@ -1440,7 +1441,7 @@ object (self)
                         STR ": ";
                         STR (btype_to_string vtype)]);
                  self#f#set_btype sv vtype
-               end);
+               end); *)
            XVar sv
          end
        else

CodeHawk/CHB/bchlib/bCHFunctionInfo.ml

@@ -81,8 +81,6 @@ module H = Hashtbl
 module LF = CHOnlineCodeSet.LanguageFactory
 module TR = CHTraceResult
 
-let bcd = BCHBCDictionary.bcdictionary
-
 let x2p = xpr_formatter#pr_expr
 let p2s = CHPrettyUtil.pretty_to_string
 
@@ -651,7 +649,9 @@ object (self)
     end
 
   method get_symbolic_num_variable(v: variable_t): variable_t traceresult =
-    self#get_variable v#getName#getSeqNumber
+    tprop
+      (self#get_variable v#getName#getSeqNumber)
+      (__FILE__ ^ ":" ^ (string_of_int __LINE__))
 
   method private has_chifvar index = H.mem chifvars index
 
@@ -868,7 +868,7 @@ object (self)
          end
        else
          tmap
-           ~msg:"finfo.mk_global_variable"
+           ~msg:(__FILE__ ^ ":" ^ (string_of_int __LINE__) ^ ": memref:global")
            (fun offset ->
              let gvar =
                self#mk_variable
@@ -1551,7 +1551,7 @@ object (self)
   val test_expressions = H.create 3                      (* test-expressions *)
   val test_variables = H.create 3                          (* test-variables *)
 
-  val cvariable_types = H.create 3      (* types of constant-value variables *)
+  (* val cvariable_types = H.create 3 *)     (* types of constant-value variables *)
 
   (* ------------------------------------------------------------------------- *)
 
@@ -1605,48 +1605,6 @@ object (self)
                 STR " in function ";
                 faddr#toPretty]))
 
-  method set_btype (v: variable_t) (ty: btype_t) =
-    let vix = v#getName#getSeqNumber in
-    let bix = bcd#index_typ ty in
-    let entry: int list =
-      if H.mem cvariable_types vix then
-        H.find cvariable_types vix
-      else
-        [] in
-    if List.mem bix entry then
-      ()
-    else
-      H.replace cvariable_types vix (bix :: entry)
-
-  method has_btype (v: variable_t): bool =
-    let vix = v#getName#getSeqNumber in
-    H.mem cvariable_types vix
-
-  method get_btype (v: variable_t): btype_t =
-    let vix = v#getName#getSeqNumber in
-    if H.mem cvariable_types vix then
-      let btypes = List.map bcd#get_typ (H.find cvariable_types vix) in
-      btype_join btypes
-    else
-      TUnknown []
-
-  method get_btypes (v: variable_t): btype_t list =
-    let vix = v#getName#getSeqNumber in
-    if H.mem cvariable_types vix then
-      List.map bcd#get_typ (H.find cvariable_types vix)
-    else
-      []
-
-  method get_btype_table: (int * int * int list) list =
-    let result = ref [] in
-    let _ =
-      H.iter (fun vix bixs ->
-          let btypes = List.map bcd#get_typ bixs in
-          let jbtype = btype_join btypes in
-          let entry = (vix, bcd#index_typ jbtype, bixs) in
-          result := entry :: !result) cvariable_types in
-    !result
-
   method sideeffects_changed = sideeffects_changed
 
   method call_targets_were_set = call_targets_set

CodeHawk/CHB/bchlib/bCHGlobalMemoryMap.ml

@@ -458,7 +458,7 @@ object (self)
            ?(btype = t_unknown)
            ?(initialvalue = None)
            ?(size = None)
-           (address: doubleword_int): global_location_int TR.traceresult =
+           (address: doubleword_int): global_location_int traceresult =
     if H.mem locations address#index then
       begin
         ch_error_log#add

CodeHawk/CHB/bchlib/bCHLibTypes.mli

@@ -4491,9 +4491,12 @@ class type function_environment_int =
 
     (** {2 Register variables} *)
 
-    (** {3 x86} *)
+    (** {3 Generic} *)
 
     method mk_register_variable: register_t -> variable_t
+
+    (** {3 x86} *)
+
     method mk_cpu_register_variable: cpureg_t -> variable_t
     method mk_fpu_register_variable: int -> variable_t
     method mk_mmx_register_variable: int -> variable_t
@@ -5355,34 +5358,6 @@ object
   method restore_register: xpr_t -> ctxt_iaddress_t -> register_t -> unit
 
 
-  (** {2 Auxvar types}
-
-      The types set and retrieved are inferred variable types for constant-value
-      variables. Inferences are based on their appearance in certain instructions
-      or operations performed on them. Throughout the analysis different aspects
-      may be revealed, and a list of these is maintained.*)
-
-  (** [finfo#set_btype v ty] records type [ty] for variable [v].*)
-  method set_btype: variable_t -> btype_t -> unit
-
-  (** [finfo#has_btype v] returns true if at least one type has been recorded for
-      variable [v].*)
-  method has_btype: variable_t -> bool
-
-  (** [finfo#get_btype v] returns the join of all types that have been recorded
-      for variable [v]. If no types were recorded [t_unknown] is returned.*)
-  method get_btype: variable_t -> btype_t
-
-  (** [finfo#get_btypes v] returns all types that have been recorded for
-      variable [v]. If no types were recorded the empty list is returned.*)
-  method get_btypes: variable_t -> btype_t list
-
-  (** Returns a list of indexed variable type records, where each entry
-      represents (index of variable, index of joined type, indices of all
-      types).*)
-  method get_btype_table: (int * int * int list) list
-
-
   (** {1 Function summaries}
       Information registered to create a function summary for the application
       function represented by this function_info (possibly including global

CodeHawk/CHB/bchlib/bCHVariable.ml

@@ -692,7 +692,7 @@ object (self)
   method make_runtime_constant (name:string) =
     self#mk_variable (AuxiliaryVariable (RuntimeConstant name))
 
-  method get_initial_memory_value_variable (v: variable_t) =
+  method get_initial_memory_value_variable (v: variable_t): variable_t traceresult =
     tbind
       ~msg:(__FILE__ ^ ":" ^ (string_of_int __LINE__) ^ ": " ^ (p2s v#toPretty))
       (fun av -> av#get_initial_memory_value_variable)