Merge pull request #91 from tim-becker/fix_lift_failure

Fixes issue in lifter where register offsets were not accounted for.
BinaryAnalysisPlatform · Feb 13, 2015 · df8bc62 · df8bc62
2 parents c85021f + 165cb35
commit df8bc62
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/lib/bap_disasm/bap_disasm_arm_mem_shift.ml b/lib/bap_disasm/bap_disasm_arm_mem_shift.ml
@@ -46,7 +46,7 @@ let lift_r_op ~dest1 ?dest2 ?shift ~base ~offset mode sign size operation =
   let base = assert_reg _here_ base |> Env.of_reg in
   let (offset : exp) =
     match offset with
-    | Op.Reg _ -> fail _here_ "got register instead of imm"
+    | Op.Reg r -> Exp.(var (Env.of_reg r))
     | Op.Imm w ->
       let width = Word.bitwidth w in
       let _1 = Word.one 32 in