CHB: remove maybe-non-returning annotation

Author: sipma

CodeHawk/CHB/bchlib/bCHFunctionData.ml

@@ -61,7 +61,6 @@ object (self)
 
   val mutable names = []
   val mutable non_returning = false
-  val mutable maybe_non_returning = false
   val mutable incomplete = false
   val mutable ida_provided = false
   val mutable user_provided = false
@@ -79,8 +78,6 @@ object (self)
 
   method set_non_returning = non_returning <- true
 
-  method set_maybe_non_returning = maybe_non_returning <- true
-
   method set_inlined = inlined <- true
 
   method set_by_preamble = by_preamble <- true
@@ -171,8 +168,6 @@ object (self)
 
   method is_non_returning = non_returning
 
-  method is_maybe_non_returning = maybe_non_returning
-
   method is_incomplete = incomplete
 
   method is_virtual = virtual_function

CodeHawk/CHB/bchlib/bCHLibTypes.mli

@@ -1504,7 +1504,6 @@ class type function_data_int =
     (* setters *)
     method set_function_type: btype_t -> unit
     method set_non_returning: unit
-    method set_maybe_non_returning: unit
     method add_name: string -> unit
     method set_ida_provided: unit
     method set_user_provided: unit
@@ -1542,7 +1541,6 @@ class type function_data_int =
     method has_callsites: bool
     method has_path_contexts: bool
     method is_non_returning: bool
-    method is_maybe_non_returning: bool
     method is_incomplete: bool
     method is_ida_provided: bool
     method is_user_provided: bool

CodeHawk/CHB/bchlib/bCHSystemInfo.ml

@@ -192,7 +192,6 @@ object (self)
   val mutable user_call_targets = 0
   val mutable user_structs = 0
   val mutable user_nonreturning = 0
-  val mutable user_maybe_nonreturning = 0
   val mutable user_classes = 0
   val mutable encodings = []
   val mutable inlined_functions = []
@@ -701,13 +700,6 @@ object (self)
 	   user_nonreturning <- List.length nrnode#getChildren
 	 end);
 
-      (if hasc "maybe-non-returning-functions" then
-         let mnrnode = getc "maybe-non-returning-functions" in
-         begin
-           self#read_xml_user_maybe_nonreturning_functions mnrnode;
-           user_maybe_nonreturning <- List.length mnrnode#getChildren
-         end);
-
       (if hasc "non-returning-calls" then
 	 let nrnode = getc "non-returning-calls" in
 	 begin
@@ -1465,22 +1457,6 @@ object (self)
           chlog#add "user-declared non-returning function" (geta n)#toPretty in
         fd#set_non_returning) (getcc "nr")
 
-  method private read_xml_user_maybe_nonreturning_functions
-                   (node:xml_element_int) =
-    let geta n =
-      fail_tvalue
-        (trerror_record
-           (LBLOCK [
-                STR "read_xml_user_maybe_nonreturning_functions: ";
-                STR (n#getAttribute "a")]))
-        (string_to_doubleword (n#getAttribute "a")) in
-    let getcc = node#getTaggedChildren in
-    List.iter (fun n ->
-        let fd = functions_data#add_function (geta n) in
-        let _ =
-          chlog#add "user-declared non-returning function" (geta n)#toPretty in
-        fd#set_maybe_non_returning) (getcc "mnr")
-
   method private read_xml_nonreturning_calls (node:xml_element_int) =
     let geta n tag = geta_fail "read_xml_nonreturning_functions" n tag in
     let getcc = node#getTaggedChildren in

CodeHawk/CHB/bchlibarm32/bCHConstructARMFunction.ml

@@ -81,15 +81,6 @@ let get_successors
           []
           (get_next_valid_instruction_address iaddr) in
 
-      let is_maybe_non_returning_call_instr =
-        match instr#get_opcode with
-        | BranchLink (ACCAlways, tgt)
-          | BranchLinkExchange (ACCAlways, tgt) when tgt#is_absolute_address ->
-           let tgtaddr = tgt#get_absolute_address in
-           ((functions_data#is_function_entry_point tgtaddr)
-            && (functions_data#get_function tgtaddr)#is_maybe_non_returning)
-        | _ -> false in
-
       let next_from (va: doubleword_int) =
         log_tfold_default
           (mk_tracelog_spec
@@ -135,12 +126,6 @@ let get_successors
         | Pop (_, _, rl, _) when rl#includes_pc ->
            (next ()) @ [wordmax]
 
-        (* maybe non-returning call instruction *)
-        | BranchLink _ | BranchLinkExchange _
-             when is_maybe_non_returning_call_instr ->
-           let _ = chlog#add "maybe non returning" (iaddr#toPretty) in
-           (next ()) @ [wordmax]
-
         (* return via LDM/LDMDB/LDMDA/LDMIB *)
         | LoadMultipleDecrementBefore (_, ACCAlways, _, rl, _)
           | LoadMultipleDecrementAfter (_, ACCAlways, _, rl, _)

CodeHawk/CHB/bchlibarm32/bCHDisassembleARM.ml

@@ -466,17 +466,6 @@ let is_nr_call_instruction (instr:arm_assembly_instruction_int) =
   | _ -> false
 
 
-let is_maybe_nr_call_instruction (instr: arm_assembly_instruction_int) =
-  match instr#get_opcode with
-  | BranchLink (ACCAlways, tgt)
-    | BranchLinkExchange (ACCAlways, tgt) when tgt#is_absolute_address ->
-     let tgtaddr = tgt#get_absolute_address in
-     ((functions_data#is_function_entry_point tgtaddr)
-      && (functions_data#get_function tgtaddr)#is_maybe_non_returning)
-  | _ -> false
-
-
-
 let collect_function_entry_points () =
   let addresses = new DoublewordCollections.set_t in
   begin
@@ -693,8 +682,7 @@ let set_block_boundaries () =
             *)
 
            | BranchLink _ | BranchLinkExchange _
-                when is_nr_call_instruction instr
-                     || is_maybe_nr_call_instruction instr ->
+                when is_nr_call_instruction instr ->
               set_block_entry (va#add_int 4)
 
            | _ -> ())

CodeHawk/CHB/bchlibarm32/bCHTranslateARMToCHIF.ml

@@ -634,15 +634,6 @@ let translate_arm_instruction
             (floc#env#variables_in_expr xs) in
         vars @ acc) [] xprs in
 
-  let is_maybe_non_returning_call_instr =
-    match instr#get_opcode with
-    | BranchLink (ACCAlways, tgt)
-      | BranchLinkExchange (ACCAlways, tgt) when tgt#is_absolute_address ->
-       let tgtaddr = tgt#get_absolute_address in
-       ((functions_data#is_function_entry_point tgtaddr)
-        && (functions_data#get_function tgtaddr)#is_maybe_non_returning)
-    | _ -> false in
-
   let flagdefs =
     let flags_set = get_arm_flags_set instr#get_opcode in
     List.map (fun f -> finfo#env#mk_flag_variable (ARMCCFlag f)) flags_set in
@@ -1136,17 +1127,6 @@ let translate_arm_instruction
    * SelectInstrSet(targetInstrSet);
    * BranchWritePC(targetAddress);
    * ------------------------------------------------------------------------ *)
-  | BranchLink (_c, tgt) when is_maybe_non_returning_call_instr ->
-     (* TODO: incorporate condition *)
-     let elseaddr = codepc#get_false_branch_successor in
-     let callcmds = calltgt_cmds tgt in
-     let cmds = cmds @ (invop :: callcmds) @ [bwdinvop] @ pcassign in
-     let transaction = package_transaction finfo blocklabel cmds in
-     let elselabel = make_code_label elseaddr in
-     let nodes = [(blocklabel, [transaction])] in
-     let edges = [(blocklabel, exitlabel); (blocklabel, elselabel)] in
-     (nodes, edges, [])
-
   | BranchLink (c, tgt)
     | BranchLinkExchange (c, tgt) when tgt#is_absolute_address ->
      if instr#is_inlined_call then