CHB:ARM: add more support for shifted-index operands

Author: sipma

CodeHawk/CHB/bchlibarm32/bCHARMOperand.ml

@@ -357,9 +357,21 @@ object (self:'a)
               let xoffset = int_constant_expr indexoffset in
               (match srt with
                | ARMImmSRT (_, 0)-> Ok (XOp (XPlus, [XVar indexvar; xoffset]))
+               | ARMImmSRT (SRType_LSL, 1) ->
+                  let shifted = XOp (XMult, [XVar indexvar; int_constant_expr 2]) in
+                  Ok (XOp (XPlus, [shifted; xoffset]))
                | ARMImmSRT (SRType_LSL, 2) ->
                   let shifted = XOp (XMult, [XVar indexvar; int_constant_expr 4]) in
                   Ok (XOp (XPlus, [shifted; xoffset]))
+               | ARMImmSRT (SRType_LSL, 3) ->
+                  let shifted = XOp (XMult, [XVar indexvar; int_constant_expr 8]) in
+                  Ok (XOp (XPlus, [shifted; xoffset]))
+               | ARMImmSRT (SRType_LSL, 4) ->
+                  let shifted = XOp (XMult, [XVar indexvar; int_constant_expr 16]) in
+                  Ok (XOp (XPlus, [shifted; xoffset]))
+               | ARMImmSRT (SRType_LSL, 5) ->
+                  let shifted = XOp (XMult, [XVar indexvar; int_constant_expr 32]) in
+                  Ok (XOp (XPlus, [shifted; xoffset]))
                | ARMImmSRT (SRType_ASR, 1) ->
                   let shifted = XOp (XDiv, [XVar indexvar; int_constant_expr 2]) in
                   Ok (XOp (XPlus, [shifted; xoffset]))
@@ -369,6 +381,9 @@ object (self:'a)
                | ARMImmSRT (SRType_ASR, 3) ->
                   let shifted = XOp (XDiv, [XVar indexvar; int_constant_expr 8]) in
                   Ok (XOp (XPlus, [shifted; xoffset]))
+               | ARMImmSRT (SRType_ASR, 4) ->
+                  let shifted = XOp (XDiv, [XVar indexvar; int_constant_expr 16]) in
+                  Ok (XOp (XPlus, [shifted; xoffset]))
                | ARMRegSRT (SRType_LSL, srtreg) ->
                   let shiftvar = env#mk_arm_register_variable srtreg in
                   let shifted = XOp (XLsl, [XVar indexvar; XVar shiftvar]) in

CodeHawk/CHB/bchlibarm32/bCHFnARMDictionary.ml

@@ -2377,16 +2377,16 @@ object (self)
          (tags, args)
 
       | SignedBitFieldExtract (c, rd, rn) ->
-         let lhs_r = rd#to_variable floc in
-         let rhs_r = rn#to_expr floc in
-         let rrhs_r = TR.tmap rewrite_expr rhs_r in
-         let rdefs = [get_rdef_r rhs_r] in
-         let uses = [get_def_use_r lhs_r] in
-         let useshigh = [get_def_use_high_r lhs_r] in
+         let vrd_r = rd#to_variable floc in
+         let xrn_r = rn#to_expr floc in
+         let xxrn_r = TR.tmap rewrite_expr xrn_r in
+         let rdefs = [get_rdef_r xrn_r] in
+         let uses = [get_def_use_r vrd_r] in
+         let useshigh = [get_def_use_high_r vrd_r] in
          let (tagstring, args) =
            mk_instrx_data_r
-             ~vars_r:[lhs_r]
-             ~xprs_r:[rhs_r; rrhs_r]
+             ~vars_r:[vrd_r]
+             ~xprs_r:[xrn_r; xxrn_r]
              ~rdefs
              ~uses
              ~useshigh