CHB:ARM: handle ADR instructions with PC-target

Author: sipma

CodeHawk/CHB/bchlibarm32/bCHConstructARMFunction.ml

@@ -4,7 +4,7 @@
    ------------------------------------------------------------------------------
    The MIT License (MIT)
 
-   Copyright (c) 2022-2024  Aarno Labs LLC
+   Copyright (c) 2022-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
@@ -126,6 +126,20 @@ let get_successors
         | Pop (_, _, rl, _) when rl#includes_pc ->
            (next ()) @ [wordmax]
 
+        | Adr (ACCAlways, dst, src)
+             when dst#is_pc_register && dst#is_absolute_address ->
+           if src#get_absolute_address#equal iaddr then
+             []
+           else
+             [src#get_absolute_address]
+
+        | Adr (_, dst, src)
+             when dst#is_pc_register && dst#is_absolute_address ->
+           if src#get_absolute_address#equal iaddr then
+             (next ())
+           else
+             (next ()) @ [src#get_absolute_address]
+
         (* return via LDM/LDMDB/LDMDA/LDMIB *)
         | LoadMultipleDecrementBefore (_, ACCAlways, _, rl, _)
           | LoadMultipleDecrementAfter (_, ACCAlways, _, rl, _)

CodeHawk/CHB/bchlibarm32/bCHDisassembleARM.ml

@@ -696,6 +696,13 @@ let set_block_boundaries () =
                 when is_nr_call_instruction instr ->
               set_block_entry (va#add_int 4)
 
+           | Adr (_, dst, src) when dst#is_pc_register ->
+              begin
+                set_block_entry (va#add_int 4);
+                if src#is_absolute_address then
+                  set_block_entry src#get_absolute_address
+              end
+
            | _ -> ())
         with
         | BCH_failure p ->