Merge pull request #488 from lioncash/strbt

dyncom: Handle the ARM A2 encoding of LDRBT/STRBT.

src/core/arm/dyncom/arm_dyncom_interpreter.cpp

@@ -1734,17 +1734,13 @@ ARM_INST_PTR INTERPRETER_TRANSLATE(ldrbt)(unsigned int inst, int index)
     inst_base->br   = NON_BRANCH;
 
     inst_cream->inst = inst;
-    if (I_BIT == 0) {
+    if (BITS(inst, 25, 27) == 2) {
         inst_cream->get_addr = LnSWoUB(ImmediatePostIndexed);
+    } else if (BITS(inst, 25, 27) == 3) {
+        inst_cream->get_addr = LnSWoUB(ScaledRegisterPostIndexed);
     } else {
         DEBUG_MSG;
     }
-    #if 0
-    inst_cream->get_addr = get_calc_addr_op(inst);
-    if(inst == 0x54f13001) {
-        DEBUG_LOG(ARM11, "get_calc_addr_op:%llx\n", inst_cream->get_addr);
-    }
-    #endif
 
     if (BITS(inst, 12, 15) == 15) {
         inst_base->br = INDIRECT_BRANCH;
@@ -2720,9 +2716,11 @@ ARM_INST_PTR INTERPRETER_TRANSLATE(strbt)(unsigned int inst, int index)
     inst_base->br   = NON_BRANCH;
 
     inst_cream->inst = inst;
-//    inst_cream->get_addr = get_calc_addr_op(inst);
-    if (I_BIT == 0) {
+
+    if (BITS(inst, 25, 27) == 2) {
         inst_cream->get_addr = LnSWoUB(ImmediatePostIndexed);
+    } else if (BITS(inst, 25, 27) == 3) {
+        inst_cream->get_addr = LnSWoUB(ScaledRegisterPostIndexed);
     } else {
         DEBUG_MSG;
     }