CHB: remove ssa varintros

Author: sipma

CodeHawk/CHB/bchlib/bCHLibTypes.mli

@@ -5888,16 +5888,6 @@ object
   method add_goto_return: doubleword_int -> doubleword_int -> unit
   method set_virtual_function_table: doubleword_int -> unit
 
-  (** [add_computed_varintros faddr iaddrs name] adds the name to be used for
-      the instructions at locations [iaddrs] in function [faddr] for
-      ssa-assignments and ssa-abstractions.
-
-      These names will be added as an optional, introduced name in addition to
-      the regular ssa name.
-   *)
-  method add_computed_join_varintros:
-           doubleword_int -> ctxt_iaddress_t list -> register_t -> unit
-
   (** [set_arm_thumb_switch addr arch] records a switch from arm to thumb at
       address [addr] if [arch] is ['T'] and a switch from thumb to arm if [arch]
       is ['A'].*)

CodeHawk/CHB/bchlib/bCHLocation.ml

@@ -33,10 +33,8 @@ open CHLanguage
 
 (* bchlib *)
 open BCHBasicTypes
-open BCHCPURegisters
 open BCHDoubleword
 open BCHLibTypes
-open BCHSystemSettings
 
 module H = Hashtbl
 module TR = CHTraceResult
@@ -327,93 +325,3 @@ let symbol_to_ctxt_string (s:symbol_t) =
 
 let ctxt_string_to_symbol (name:string) ?(atts=[]) (s:ctxt_iaddress_t) =
   new symbol_t ~atts:(s::atts) name
-
-
-class ssa_register_store_t =
-object
-
-  (* names of regular ssa variables *)
-  val store = H.create 3
-  val nextindex = H.create 3
-
-  (* names of introduced ssa variables for joins *)
-  val jstore = H.create 3
-  val jnextindex = H.create 3
-
-  method get_name
-           (name: string)
-           (faddr: doubleword_int)
-           (iaddr: ctxt_iaddress_t): string =
-    let key = faddr#to_hex_string ^ "_" ^ iaddr ^ "_" ^ name in
-    if H.mem store key then
-      H.find store key
-    else
-      let idwr = string_to_doubleword iaddr in
-      let alignment = system_settings#get_instruction_alignment in
-      let vname =
-        TR.tfold_default
-          (fun idw ->
-            let offsetr = idw#subtract_to_int faddr in
-            TR.tfold_default
-              (fun offset -> name ^ "_" ^ (string_of_int (offset / alignment)))
-              (name ^ "_" ^ iaddr)
-              offsetr)
-          (name ^ "_" ^ iaddr)
-          idwr in
-      begin
-        H.add store key vname;
-        vname
-      end
-
-  method get_join_name
-           (name: string)
-           (faddr: doubleword_int)
-           (iaddrs: ctxt_iaddress_t list): string =
-    let key = faddr#to_hex_string ^ "_" ^ name ^ (String.concat "_" iaddrs) in
-    if H.mem jstore key then
-      H.find jstore key
-    else
-      let alignment = system_settings#get_instruction_alignment in
-      let idws_r = List.map string_to_doubleword iaddrs in
-      let offsets_r =
-        List.map
-          (fun idw_r ->
-            TR.tbind
-              (fun idw ->
-                let offset_r = idw#subtract_to_int faddr in
-                TR.tbind
-                  (fun offset ->
-                    Ok (string_of_int (offset / alignment)))
-                  offset_r)
-              idw_r) idws_r in
-      let vname =
-        TR.tfold_list_default
-          ~ok:(fun acc offset -> acc ^ "_" ^ offset)
-          ~err:(fun acc -> acc ^ "_XXX")
-          name
-          offsets_r in
-      begin
-        H.add jstore key vname;
-        vname
-      end
-
-end
-
-
-let store = new ssa_register_store_t
-
-
-let ssa_register_value_name
-      (reg: register_t)
-      (faddr: doubleword_int)
-      (iaddr: ctxt_iaddress_t): string =
-  let name = "v" ^ (register_to_string reg) in
-  store#get_name name faddr iaddr
-
-
-let ssa_register_value_join_name
-      (reg: register_t)
-      (faddr: doubleword_int)
-      (iaddrs: ctxt_iaddress_t list): string =
-  let name = "vv" ^ register_to_string reg in
-  store#get_join_name name faddr iaddrs

CodeHawk/CHB/bchlib/bCHLocation.mli

@@ -196,20 +196,3 @@ val symbol_to_ctxt_string: symbol_t -> ctxt_iaddress_t
 
 val ctxt_string_to_symbol:
   string -> ?atts:string list -> ctxt_iaddress_t -> symbol_t
-
-
-(** [ssa_register_value_reg name faddr iaddr] returns a name for the
-    variable created as part of an ssa register assignment or abstraction
-    to the register [reg] at address [iaddr] in function [faddr].
-
-    Note: the case where [iaddr] has a context may produce a name that
-    is not a valid variable name in C.*)
-val ssa_register_value_name:
-  register_t -> doubleword_int -> ctxt_iaddress_t -> string
-
-
-(** [ssa_register_value_join_name name faddr] returns a name that may be
-    used for multiple ssa variables that can be colocated to the same variable
-    location.*)
-val ssa_register_value_join_name:
-  register_t -> doubleword_int -> ctxt_iaddress_t list -> string

CodeHawk/CHB/bchlib/bCHSystemInfo.ml

@@ -60,7 +60,6 @@ open BCHByteUtilities
 open BCHCallbackTables
 open BCHConstantDefinitions
 open BCHCppClass
-open BCHCPURegisters
 open BCHCStruct
 open BCHCStructConstant
 open BCHDataBlock
@@ -69,7 +68,6 @@ open BCHFunctionData
 open BCHFunctionSummaryLibrary
 open BCHJumpTable
 open BCHLibTypes
-open BCHLocation
 open BCHPreFileIO
 open BCHSectionHeadersInfo
 open BCHSpecializations
@@ -1441,26 +1439,6 @@ object (self)
              STR " variable introductions"])
     end
 
-  method add_computed_join_varintros
-           (faddr: doubleword_int)
-           (iaddrs: ctxt_iaddress_t list)
-           (reg: register_t) =
-    let name = ssa_register_value_join_name reg faddr iaddrs in
-    List.iter (fun iaddr ->
-        if is_iaddress iaddr then
-          let loc = ctxt_string_to_location faddr iaddr in
-          let iaddr = loc#i in
-          let _ =
-            chlog#add
-              "add computed join variable"
-              (LBLOCK [
-                   loc#toPretty;
-                   STR " ";
-                   STR (register_to_string reg);
-                   STR ": ";
-                   STR name]) in
-          H.replace variable_intros iaddr#index name) iaddrs
-
   method private write_xml_variable_introductions (node: xml_element_int) =
     let vintros = H.fold (fun k v a -> (k, v)::a) variable_intros [] in
     List.iter (fun (dwindex, name) ->

CodeHawk/CHB/bchlibarm32/bCHARMJumptable.ml

@@ -628,7 +628,7 @@ let is_addls_pc_jumptable
 
 
 let create_addls_pc_jumptable
-      (ch: pushback_stream_int)
+      (_ch: pushback_stream_int)
       (addpcinstr: arm_assembly_instruction_int):
       (arm_assembly_instruction_int list * arm_jumptable_int) option =
   match is_addls_pc_jumptable addpcinstr with