CHB: convert init location into function parameter typing constraint variable

Author: sipma

CodeHawk/CHB/bchlib/bCHFunctionInterface.ml

@@ -1133,7 +1133,13 @@ let record_function_interface_type_constraints
         let fretvar = add_return_capability ftypevar in
         begin
           (match mk_btype_constraint fretvar returntype with
-           | Some tyc -> store#add_constraint tyc
+           | Some tyc ->
+              let _ =
+                log_diagnostics_result
+                  ~tag:("function-interface type constraint")
+                  __FILE__ __LINE__
+                  [faddr ^ ": " ^ (type_constraint_to_string tyc)] in
+              store#add_constraint tyc
            | _ -> ());
           (match fargs with
            | None ->

CodeHawk/CHB/bchlib/bCHTypeConstraintGraph.ml

@@ -56,7 +56,7 @@ object (self: 'a)
      Update for constraint of type (v, c) or (c, w), v in V, c in C:
 
      tvars'(w) = tvars(w) u {c}, tvreps' = tvreps           if w = tvreps(v)
-     tvars'(w) = tvars(w), tvreps' = tvresp                 otherwise
+     tvars'(w) = tvars(w), tvreps' = tvreps                 otherwise
 
      Update for constraint of type (v1, v2), v1, v2 in V:
 

CodeHawk/CHB/bchlib/bCHTypeConstraintStore.ml

@@ -437,7 +437,6 @@ object (self)
   method resolve_reglhs_type
            (reg: register_t) (faddr: string) (iaddr: string): btype_t option =
     let evaluation = self#evaluate_reglhs_type reg faddr iaddr in
-    let logresults = iaddr = "0xffffffff" in
     let log_evaluation () =
       log_diagnostics_result
         ~tag:("reglhs resolution not successfull for " ^ faddr)
@@ -463,9 +462,17 @@ object (self)
       List.iter (fun (vars, consts) ->
           let jointy = type_constant_join consts in
           let _ =
-            if logresults then
-              log_result __FILE__ __LINE__
-                ["jointy: " ^ (type_constant_to_string jointy)] in
+            log_diagnostics_result
+              ~tag:("result of type_constant_join for " ^ faddr)
+              __FILE__ __LINE__
+              [iaddr
+               ^ ": jointy: "
+               ^ (type_constant_to_string jointy)
+               ^ " from "
+               ^ (p2s (pretty_print_list
+                         consts
+                         (fun c -> STR (type_constant_to_string c))
+                         "[" ", " "]"))] in
           List.iter (fun v ->
               let optty =
                 match jointy with

CodeHawk/CHB/bchlib/bCHTypeConstraintUtil.ml

@@ -277,11 +277,6 @@ let mk_global_variable_typevar (gaddr: string): type_variable_t =
   mk_type_basevar (GlobalVariableType gaddr)
 
 
-let mk_reglhs_typevar (reg: register_t) (faddr: string) (iaddr: string)
-    : type_variable_t =
-  mk_type_basevar (RegisterLhsType (reg, faddr, iaddr))
-
-
 let mk_localstack_lhs_typevar (off: int) (faddr: string) (iaddr: string)
     : type_variable_t =
   mk_type_basevar (LocalStackLhsType (off, faddr, iaddr))
@@ -356,6 +351,15 @@ let add_stack_address_capability (offset: int) (tv: type_variable_t)
   add_capability [FLocStackAddress offset] tv
 
 
+let mk_reglhs_typevar (reg: register_t) (faddr: string) (iaddr: string)
+    : type_variable_t =
+  if iaddr = "init" then
+    let ftypevar = mk_function_typevar faddr in
+    add_freg_param_capability reg ftypevar
+  else
+    mk_type_basevar (RegisterLhsType (reg, faddr, iaddr))
+
+
 let mk_cty_term (c: type_constant_t): type_term_t = TyConstant c
 
 

CodeHawk/CHB/bchlib/bCHVersion.ml

@@ -95,8 +95,8 @@ end
 
 
 let version = new version_info_t 
-  ~version:"0.6.0_20250702"
-  ~date:"2025-07-02"
+  ~version:"0.6.0_20250713"
+  ~date:"2025-07-13"
   ~licensee: None
   ~maxfilesize: None
   ()