CHB: rename methods that convert var/xpr into cvar/cxpr

Author: sipma

CodeHawk/CHB/bchlib/bCHFloc.ml

@@ -1303,7 +1303,7 @@ object (self)
     | XOp (XPlus, [XOp ((Xf "addressofvar"), [XVar v]); xoff])
          when self#f#env#is_global_variable v ->
        let gvaddr_r = self#f#env#get_global_variable_address v in
-       let cxoff_r = self#convert_xpr_to_c_expr xoff in
+       let cxoff_r = self#xpr_to_cxpr xoff in
        TR.tbind
          ~msg:(eloc __LINE__)
          (fun gvaddr ->
@@ -1352,6 +1352,35 @@ object (self)
               self#f#env#mk_offset_memory_variable memref memoff)
             memref_r memoff_r
 
+  (* deprecated. to be merged with get_var_at_address *)
+   method get_lhs_from_address (xpr:xpr_t) =
+     let xpr = self#inv#rewrite_expr xpr in
+     let default () =
+       self#env#mk_memory_variable
+         (self#env#mk_unknown_memory_reference "lhs-from-address")
+         numerical_zero in
+     match xpr with
+     | XConst (IntConst n) when n#gt numerical_zero ->
+        log_tfold_default
+          (mk_tracelog_spec
+             ~tag:"get_lhs_from_address"
+             (self#cia ^ ": constant: " ^ n#toString))
+          (fun base ->
+            if system_info#get_image_base#le base then
+              log_tfold_default
+                (log_error
+                   "get_lhs_from_address"
+                   (self#cia ^ ": constant: " ^ n#toString))
+                (fun v -> v)
+                (default ())
+	        (self#env#mk_global_variable self#l n)
+            else
+              default ())
+          (default ())
+          (numerical_to_doubleword n)
+     | _ ->
+        default ()          
+
   method get_variable_type (v: variable_t): btype_t traceresult =
     let is_zero (x: xpr_t) =
       match x with
@@ -1504,12 +1533,12 @@ object (self)
       | None -> Error [(elocm __LINE__) ^ "variable: " ^ (x2s (XVar v))]
       | Some t -> Ok t
 
-  method convert_xpr_to_c_expr
+  method xpr_to_cxpr
            ?(size=None) ?(xtype=None) (x: xpr_t): xpr_t traceresult =
     let _ =
       log_diagnostics_result
         ~msg:(p2s self#l#toPretty)
-        ~tag:"convert_xpr_to_c_expr"
+        ~tag:"xpr_to_cxpr"
         __FILE__ __LINE__
         ["size: " ^ (opti2s size);
          "xtype: " ^ (optty2s xtype);
@@ -1523,7 +1552,7 @@ object (self)
           Ok (int_constant_expr (-1))
        | _ -> self#convert_xpr_offsets ~xtype ~size x
 
-  method convert_addr_to_c_pointed_to_expr
+  method addr_to_ctgt_xpr
            ?(size=None) ?(xtype=None) (a: xpr_t): xpr_t traceresult =
     let vars = vars_as_positive_terms a in
     let knownpointers =
@@ -1533,7 +1562,7 @@ object (self)
         ) vars in
     let _ =
       log_diagnostics_result
-        ~tag:"convert_addr_to_c_pointed_to_expr"
+        ~tag:"addr_to_ctgt_xpr"
         __FILE__ __LINE__
         [(p2s self#l#toPretty);
          "known pointers: ";
@@ -1597,7 +1626,7 @@ object (self)
               ^ "addr: " ^ (x2s a)
               ^ ": Not yet handled"]
 
-  method convert_var_to_c_variable
+  method var_to_cvar
            ?(size=None) ?(vtype=None) (v: variable_t): variable_t traceresult =
     match vtype with
     | None -> self#convert_variable_offsets ~size v
@@ -2137,34 +2166,6 @@ object (self)
 	 default ()
        end
 
-   method get_lhs_from_address (xpr:xpr_t) =
-     let xpr = self#inv#rewrite_expr xpr in
-     let default () =
-       self#env#mk_memory_variable
-         (self#env#mk_unknown_memory_reference "lhs-from-address")
-         numerical_zero in
-     match xpr with
-     | XConst (IntConst n) when n#gt numerical_zero ->
-        log_tfold_default
-          (mk_tracelog_spec
-             ~tag:"get_lhs_from_address"
-             (self#cia ^ ": constant: " ^ n#toString))
-          (fun base ->
-            if system_info#get_image_base#le base then
-              log_tfold_default
-                (log_error
-                   "get_lhs_from_address"
-                   (self#cia ^ ": constant: " ^ n#toString))
-                (fun v -> v)
-                (default ())
-	        (self#env#mk_global_variable self#l n)
-            else
-              default ())
-          (default ())
-          (numerical_to_doubleword n)
-     | _ ->
-        default ()
-
    method get_bridge_variable_value (par_index:int) (var:variable_t) =
      if self#f#has_constant var then
        num_constant_expr (self#f#get_constant var )

CodeHawk/CHB/bchlib/bCHLibTypes.mli

@@ -6111,41 +6111,6 @@ class type floc_int =
      *)
     method decompose_address: xpr_t -> (memory_reference_int * memory_offset_t)
 
-    method convert_xpr_to_c_expr:
-             ?size:int option -> ?xtype:btype_t option -> xpr_t -> xpr_t traceresult
-
-    method convert_addr_to_c_pointed_to_expr:
-             ?size:int option -> ?xtype:btype_t option -> xpr_t -> xpr_t traceresult
-
-    method convert_var_to_c_variable:
-             ?size:int option
-             -> ?vtype:btype_t option
-             -> variable_t
-             -> variable_t traceresult
-
-         (*
-    method convert_addr_to_c_pointed_to_variable:
-             ?size:int option
-             -> ?vtype:btype_t option
-             -> xpr_t
-             -> variable_t traceresult
-          *)
-
-    method convert_value_offsets:
-             ?size:int option -> variable_t -> variable_t traceresult
-
-    method convert_variable_offsets:
-             ?vtype:btype_t option
-             -> ?size:int option
-             -> variable_t
-             -> variable_t traceresult
-
-    method convert_xpr_offsets:
-             ?xtype:btype_t option -> ?size:int option -> xpr_t -> xpr_t traceresult
-
-    (* returns the variable associated with the address expression *)
-    method get_lhs_from_address: xpr_t -> variable_t
-
     (* returns the value of the bridge variable for a given stack
        parameter at this instruction *)
     method get_bridge_variable_value: int -> variable_t -> xpr_t
@@ -6163,10 +6128,17 @@ class type floc_int =
              -> xpr_t               (** address value *)
              -> variable_t traceresult
 
+    (* returns the variable associated with the address expression
+       Deprecated. To be merged with get_var_at_address
+     *)
+    method get_lhs_from_address: xpr_t -> variable_t
+
     method get_variable_type: variable_t -> btype_t traceresult
 
     method get_xpr_type: xpr_t -> btype_t traceresult
 
+
+
     (** {2 Predicates on variables}*)
 
     (* returns true if the given variable evaluates to a constant at this
@@ -6187,6 +6159,33 @@ class type floc_int =
     method has_initial_value: variable_t -> bool
 
 
+    (** {1 Conversion to c expressions / variables}*)
+
+    method xpr_to_cxpr:
+             ?size:int option -> ?xtype:btype_t option -> xpr_t -> xpr_t traceresult
+
+    method addr_to_ctgt_xpr:
+             ?size:int option -> ?xtype:btype_t option -> xpr_t -> xpr_t traceresult
+
+    method var_to_cvar:
+             ?size:int option
+             -> ?vtype:btype_t option
+             -> variable_t
+             -> variable_t traceresult
+
+    method convert_value_offsets:
+             ?size:int option -> variable_t -> variable_t traceresult
+
+    method convert_variable_offsets:
+             ?vtype:btype_t option
+             -> ?size:int option
+             -> variable_t
+             -> variable_t traceresult
+
+    method convert_xpr_offsets:
+             ?xtype:btype_t option -> ?size:int option -> xpr_t -> xpr_t traceresult
+
+
     (** {1 Conditional jumps}*)
 
     (* sets the test expression for this instruction *)