CHB:ARM: fix disassembly bug

Author: sipma

CodeHawk/CHB/bchlib/bCHVersion.ml

@@ -95,8 +95,8 @@ end
 
 
 let version = new version_info_t 
-  ~version:"0.6.0_20241005"
-  ~date:"2024-10-05"
+  ~version:"0.6.0_20241031"
+  ~date:"2024-10-31"
   ~licensee: None
   ~maxfilesize: None
   ()

CodeHawk/CHB/bchlibarm32/bCHARMAssemblyInstructions.ml

@@ -381,7 +381,7 @@ object (self)
   method private set_jumptable (jumptable: jumptable_int) =
     let saddr = jumptable#get_start_address in
     let eaddr = jumptable#get_end_address in
-    let len = saddr#value - eaddr#value in
+    let len = eaddr#value - saddr#value in
     if len > 0 then
       let startinstr =
         make_arm_assembly_instruction

CodeHawk/CHB/bchlibarm32/bCHDisassembleARMInstruction.ml

@@ -1045,7 +1045,8 @@ let parse_data_proc_imm_type
      let rd = r15 WR in
      let imm32 = arm_expand_imm (b 11 8) (b 7 0) in
      (try
-        let imm = mk_arm_absolute_target_op iaddr imm32 RD in
+        let base = iaddr#add_int 8 in
+        let imm = mk_arm_absolute_target_op base imm32 RD in
         (* ADR<c> <Rd>, <label> *)
         Adr (c, rd, imm)
       with

CodeHawk/CHT/CHB_tests/bchlibarm32_tests/txbchlibarm32/bCHDisassembleARMInstructionTest.ml

@@ -48,7 +48,7 @@ open BCHDisassembleARMInstruction
 
 
 let testname = "bCHDisassembleARMInstructionTest"
-let lastupdated = "2024-01-02"
+let lastupdated = "2024-10-31"
 
 
 let make_dw (s: string) = TR.tget_ok (string_to_doubleword s)
@@ -163,6 +163,8 @@ let arm_basic () =
 
 let arm_pc_relative () =
   let tests = [
+      ("ADR-A1", "0xa01021d8", "80104fe2", "ADR            R1, 0xa0102160");
+      ("ADR-A2", "0xa0354fc4", "14108fe2", "ADR            R1, 0xa0354fe0");
       ("B",    "0x116f8", "060000ea", "B              0x11718");
       ("BCS",  "0x118d4", "9d00002a", "BCS            0x11b50");
       ("BEQ",  "0x10764", "f5ffff0a", "BEQ            0x10740");