CHB:ARM: add convenience function to access test instructions

Author: sipma

CodeHawk/CHB/bchlibarm32/bCHARMAssemblyInstructions.ml

@@ -4,7 +4,7 @@
    ------------------------------------------------------------------------------
    The MIT License (MIT)
 
-   Copyright (c) 2021-2024  Aarno Labs, LLC
+   Copyright (c) 2021-2025  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
@@ -1138,3 +1138,24 @@ let get_aggregate (iaddr: doubleword_int): arm_instruction_aggregate_int =
 
 let get_arm_jumptables (): (doubleword_int * arm_jumptable_int) list =
   !arm_assembly_instructions#get_jumptables
+
+
+let get_associated_test_instr
+      (finfo: function_info_int)
+      (ctxtiaddr: ctxt_iaddress_t)
+    : (location_int * arm_assembly_instruction_int) option =
+  if finfo#has_associated_cc_setter ctxtiaddr then
+    let faddr = finfo#get_address in
+    let testiaddr = finfo#get_associated_cc_setter ctxtiaddr in
+    let testloc = BCHLocation.ctxt_string_to_location faddr testiaddr in
+    let testaddr = testloc#i in
+    TR.tfold
+      ~ok:(fun testinstr -> Some (testloc, testinstr))
+      ~error:(fun e ->
+        begin
+          log_error_result __FILE__ __LINE__ e;
+          None
+        end)
+      (get_arm_assembly_instruction testaddr)
+  else
+    None

CodeHawk/CHB/bchlibarm32/bCHARMAssemblyInstructions.mli

@@ -102,9 +102,20 @@ val has_aggregate: doubleword_int -> bool
 
 (** [get_aggregate iaddr] returns the aggregate registered at virtual address [iaddr].
 
-    @raises [BCH_failure] if no aggregate is registered at [iaddr].*)
+    raise BCH_failure if no aggregate is registered at [iaddr].*)
 val get_aggregate: doubleword_int -> arm_instruction_aggregate_int
 
 
 
 val get_arm_jumptables: unit -> (doubleword_int * arm_jumptable_int) list
+
+
+(** [get_associated_test_instr finfo iaddr] returns the location and instruction
+    that provides the test that is associated with the condition code of the
+    instruction at address [iaddr]
+
+    If no test instruction is associated with the instruction at [iaddr] [None]
+    is returned.
+ *)
+val get_associated_test_instr:
+  function_info_int -> ctxt_iaddress_t -> (location_int * arm_assembly_instruction_int) option