Merge branch 'upstream/arm64/feature/semantics' of coriander.cs.wisc.…

…edu:/p/paradyn/development/xmeng/dyninstapi/dyninst_development/dyninst into upstream/arm64/feature/semantics
dyninst · Nov 7, 2016 · c7cf7ce · c7cf7ce
2 parents 5bbe517 + 5f9bbfd
commit c7cf7ce
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/instructionAPI/src/InstructionDecoder-aarch64.C b/instructionAPI/src/InstructionDecoder-aarch64.C
@@ -2544,7 +2544,15 @@ Expression::Ptr InstructionDecoder_aarch64::makeMemRefExPair2(){
             else if (hasShift) {
                 if (IS_INSN_ADDSUB_SHIFT(insn) || IS_INSN_LOGICAL_SHIFT(insn))    //add-sub shifted | logical shifted
                 {
-                    processShiftFieldShiftedInsn(immLen, immVal);
+                    if(IS_INSN_LOGICAL_SHIFT(insn) && shiftField == 0 && field<5, 9>(insn) == 0x1F && immVal == 0) {
+                        insn_in_progress->getOperation().operationID = aarch64_op_mov_orr_log_shift;
+                        insn_in_progress->getOperation().mnemonic = "mov";
+                        skipRn = true;
+
+                        insn_in_progress->appendOperand(makeRmExpr(), true, false);
+                    } else {
+                        processShiftFieldShiftedInsn(immLen, immVal);
+                    }
                 }
                 else if (IS_INSN_ADDSUB_IMM(insn))        //add-sub (immediate)
                 {