CHT: fix warnings and add tests to dune files

Author: sipma

.gitignore

@@ -25,6 +25,7 @@ _build/
 *.mli~
 *.sh~
 *.yaml~
+*.i~
 .gitignore~
 
 # binary analyzer executables

CodeHawk/CHT/CHB_tests/bchlib_tests/txbchlib/bCHARMFunctionInterfaceTest.ml

@@ -58,12 +58,12 @@ let get_arm_int_param_next_state_test () =
     TS.new_testsuite
       (testname ^ "_get_int_paramloc_next_test") lastupdated;
 
-    List.iter (fun (title, nxtreg, xlocreg, xnxtreg, xnxtoff) ->
+    List.iter (fun (title, nxtreg, _xlocreg, xnxtreg, xnxtoff) ->
         TS.add_simple_test
           ~title
           (fun () ->
             let aas = {aas_start_state with aas_next_core_reg = Some nxtreg} in
-            let (par, naas) = get_arm_int_param_next_state 4 "name" t_int aas 1 in
+            let (_par, naas) = get_arm_int_param_next_state 4 "name" t_int aas 1 in
             let xnaas =
               {aas_start_state with
                 aas_next_core_reg = xnxtreg; aas_next_offset = xnxtoff} in
@@ -76,7 +76,7 @@ let get_arm_int_param_next_state_test () =
         let aas =
           {aas_start_state with
             aas_next_core_reg = None; aas_next_offset = Some 0} in
-        let (par, naas) = get_arm_int_param_next_state 4 "name" t_int aas 1 in
+        let (_par, naas) = get_arm_int_param_next_state 4 "name" t_int aas 1 in
         let xnaas = {aas with aas_next_offset = Some 4} in
         BA.equal_arm_argument_state ~expected:xnaas ~received:naas ());
 
@@ -105,14 +105,14 @@ let get_arm_struct_field_locations_test () =
 
     parse_cil_file ~removeUnused:false "header.i";
 
-    List.iter (fun (title, locations) ->
+    List.iter (fun (title, _locations) ->
         TS.add_simple_test
           ~title
           (fun () ->
             let cinfo = bcfiles#get_compinfo_by_name title in
             let finfo = List.hd cinfo.bcfields in
             let aas = push_field_pos aas_start_state finfo in
-            let (locs, naas) = get_arm_struct_field_locations finfo aas in
+            let (locs, _naas) = get_arm_struct_field_locations finfo aas in
             let xlocs = [
                 mk_register_parameter_location
                   ~position:[mk_field_position cinfo.bckey 0 (get_struct_field_name finfo)]
@@ -140,7 +140,7 @@ let get_arm_struct_param_next_state_test () =
             let cinfo = bcfiles#get_compinfo_by_name title in
             let btype = get_compinfo_struct_type cinfo in
             let size = CHTraceResult.tget_ok (size_of_btype btype) in
-            let (param, naas) =
+            let (param, _naas) =
               get_arm_struct_param_next_state
                 size "arg_1" btype aas_start_state 1 in
             let xlocs =

CodeHawk/CHT/CHB_tests/bchlib_tests/txbchlib/bCHFlocTest.ml

@@ -28,19 +28,12 @@
 
 (* chlib *)
 open CHNumerical
-open CHPretty
-
-(* chutil *)
-open CHLogger
-open CHPrettyUtil
 
 (* xprlib *)
 open Xprt
-open XprToPretty
 open XprTypes
 
 (* bchlib *)
-open BCHBasicTypes
 open BCHBCFiles
 open BCHBCTypes
 open BCHConstantDefinitions
@@ -49,7 +42,6 @@ open BCHFloc
 open BCHFunctionData
 open BCHFunctionInfo
 open BCHLibTypes
-open BCHMemoryReference
 
 (* bchcil *)
 open BCHParseCilFile
@@ -63,11 +55,6 @@ let testname = "bCHFlocTest"
 let lastupdated = "2024-08-20"
 
 
-let x2p = xpr_formatter#pr_expr
-let p2s = pretty_to_string
-let x2s x = p2s (x2p x)
-
-
 let decompose_memvar_address_test () =
   let faddr = "0x1d6bfc" in
   let iaddr = "0x1d6cbc" in

CodeHawk/CHT/CHB_tests/bchlib_tests/txbchlib/bCHFunctionInterfaceTest.ml

@@ -5,7 +5,7 @@
    ------------------------------------------------------------------------------
    The MIT License (MIT)
 
-   Copyright (c) 2023  Aarno Labs LLC
+   Copyright (c) 2023-2024  Aarno Labs LLC
 
    Permission is hereby granted, free of charge, to any person obtaining a copy
    of this software and associated documentation files (the "Software"), to deal
@@ -35,10 +35,6 @@
 
 (* chlib *)
 open CHPretty
-open CHNumerical
-
-(* tchblib *)
-open TCHSpecification
 
 (* bchlib *)
 open BCHBasicTypes
@@ -181,7 +177,7 @@ let function_signature_of_bvarinfo_arm () =
               else
                 raise
                   (BCH_failure (LBLOCK [STR title; STR " not found"])) in
-            let (xresult, fintf, tsig) =
+            let (xresult, _fintf, tsig) =
               try
                 let xresult = List.map BU.convert_fts_parameter_input result in
                 let fintf = FI.bvarinfo_to_function_interface bvinfo in

CodeHawk/CHT/CHB_tests/bchlib_tests/txbchlib/bCHMemoryReferenceTest.ml

@@ -28,26 +28,13 @@
 
 (* chlib *)
 open CHNumerical
-open CHPretty
-
-(* chutil *)
-open CHLogger
-open CHPrettyUtil
-
-(* xprlib *)
-open Xprt
-open XprToPretty
-open XprTypes
 
 (* bchlib *)
-open BCHBasicTypes
 open BCHBCFiles
 open BCHBCTypes
 open BCHConstantDefinitions
 open BCHDoubleword
-open BCHFloc
 open BCHFunctionData
-open BCHFunctionInfo
 open BCHLibTypes
 
 (* bchcil *)
@@ -65,11 +52,6 @@ let testname = "bCHMemoryReferenceTest"
 let lastupdated = "2024-08-21"
 
 
-let x2p = xpr_formatter#pr_expr
-let p2s = pretty_to_string
-let x2s x = p2s (x2p x)
-
-
 let mk_maximal_memory_offset_test () =
   begin
 

CodeHawk/CHT/CHB_tests/bchlib_tests/txbchlib/bCHTypeConstraintStoreTest.ml

@@ -36,8 +36,6 @@ open CHPretty
 (* bchlib *)
 open BCHBasicTypes
 open BCHBCFiles
-open BCHBCTypePretty
-open BCHCPURegisters
 open BCHFunctionInterface
 open BCHLibTypes
 open BCHSystemSettings

CodeHawk/CHT/CHB_tests/bchlib_tests/txbchlib/bCHXprUtilTest.ml

@@ -28,14 +28,8 @@
 
 (* chlib *)
 open CHNumerical
-open CHPretty
-
-(* chutil *)
-open CHPrettyUtil
 
 (* xprlib *)
-open Xprt
-open XprToPretty
 open XprTypes
 open Xsimplify
 

CodeHawk/CHT/CHB_tests/bchlib_tests/txbchlib/dune

@@ -1,3 +1,14 @@
-(tests 
-  (names bCHDoublewordTest bCHImmediateTest bCHLocationTest bCHStreamWrapperTest)
-  (libraries bchlib chlib chutil tbchlib tchlib))
+(tests
+  (names
+	bCHDoublewordTest
+	bCHImmediateTest
+	bCHLocationTest
+	bCHStreamWrapperTest
+	bCHXprUtilTest
+	bCHMemoryReferenceTest
+	bCHFunctionInterfaceTest
+	bCHARMFunctionInterfaceTest
+	bCHTypeConstraintStoreTest
+	bCHFlocTest)
+  (deps header.i decompose_array_address.i)
+  (libraries bchcil bchlib xprlib chlib chutil tbchlib tchlib txprlib))

CodeHawk/CHT/CHB_tests/bchlibarm32_tests/tbchlibarm32/tCHBchlibarm32Utils.ml

@@ -125,7 +125,7 @@ let thumb_function_setup
       | _ -> ()
     done;
     let _ = set_block_boundaries () in
-    let _ = construct_functions_arm ~construct_all_functions:false in
+    let _ = construct_functions_arm ~construct_all_functions:false () in
     get_arm_assembly_function faddr
   end
 

CodeHawk/CHT/CHB_tests/bchlibelf_tests/txbchlibelf/bCHDwarfTest.ml

@@ -5,7 +5,7 @@
    ------------------------------------------------------------------------------
    The MIT License (MIT)
  
-   Copyright (c) 2023  Aarno Labs LLC
+   Copyright (c) 2023-2024  Aarno Labs LLC
 
    Permission is hereby granted, free of charge, to any person obtaining a copy
    of this software and associated documentation files (the "Software"), to deal
@@ -26,25 +26,15 @@
    SOFTWARE.
    ============================================================================= *)
 
-(* chlib *)
-open CHPretty
-
-(* chutil *)
-open CHXmlDocument
-open CHXmlReader
-
 (* bchlib *)
-open BCHBasicTypes
 open BCHDoubleword
-open BCHLibTypes
 open BCHStreamWrapper
 
 (* bchlibelf *)
 open BCHDwarf
 open BCHDwarfTypes
 open BCHDwarfUtils
 open BCHELFDebugAbbrevSection
-open BCHELFTypes
 open BCHELFSectionHeader
 
 (* tchlib *)
@@ -169,7 +159,7 @@ let decode_variable_die_test () =
             let sh = mk_elf_section_header () in
             let section = mk_elf_debug_abbrev_section astring sh in
             let abbreventry = section#get_abbrev_entry in
-            let fabbrev = fun (i: int) -> abbreventry in
+            let fabbrev = fun (_i: int) -> abbreventry in
             let chi = make_pushback_stream ~little_endian:true istring in
             let base = TR.tget_ok (string_to_doubleword base) in
             let var =