Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions CodeHawk/CHB/bchlib/bCHVersion.ml
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,8 @@ end


let version = new version_info_t
~version:"0.6.0_20250810"
~date:"2025-08-10"
~version:"0.6.0_20250811"
~date:"2025-08-11"
~licensee: None
~maxfilesize: None
()
11 changes: 11 additions & 0 deletions CodeHawk/CHB/bchlibarm32/bCHARMOperand.ml
Original file line number Diff line number Diff line change
Expand Up @@ -624,6 +624,9 @@ object (self:'a)
| ARMShiftedReg (r, ARMImmSRT (SRType_LSL, n)) ->
let vreg = floc#env#mk_arm_register_variable r in
Ok (XOp (XLsl, [XVar vreg; int_constant_expr n]))
| ARMShiftedReg (r, ARMImmSRT (SRType_ROR, n)) ->
let vreg = floc#env#mk_arm_register_variable r in
Ok (XOp ((Xf "ror"), [XVar vreg; int_constant_expr n]))
| ARMShiftedReg (r, ARMRegSRT (SRType_LSL, sr)) ->
let vsreg = floc#env#mk_arm_register_variable sr in
let vreg = floc#env#mk_arm_register_variable r in
Expand All @@ -633,6 +636,14 @@ object (self:'a)
let vsreg = floc#env#mk_arm_register_variable sr in
let vreg = floc#env#mk_arm_register_variable r in
Ok (XOp (XLsr, [XVar vreg; XVar vsreg]))
| ARMShiftedReg (r, ARMRegSRT (SRType_ASR, sr)) ->
let vsreg = floc#env#mk_arm_register_variable sr in
let vreg = floc#env#mk_arm_register_variable r in
Ok (XOp (XAsr, [XVar vreg; XVar vsreg]))
| ARMShiftedReg (r, ARMRegSRT (SRType_ROR, sr)) ->
let vsreg = floc#env#mk_arm_register_variable sr in
let vreg = floc#env#mk_arm_register_variable r in
Ok (XOp ((Xf "ror"), [XVar vreg; XVar vsreg]))
| ARMShiftedReg (_, srt) ->
Error [__FILE__ ^ ":" ^ (string_of_int __LINE__) ^ ": "
^ "Shifted reg: " ^ (register_shift_to_string srt)
Expand Down