Merge pull request #111 from sp1187/master

Fix shift undefined behaviour in CArmInstruction
Kingcom · Jul 10, 2017 · 6f4daef · 6f4daef
2 parents 7f8579a + 05dddf8
commit 6f4daef
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/Archs/ARM/CArmInstruction.cpp b/Archs/ARM/CArmInstruction.cpp
@@ -32,12 +32,12 @@ int CArmInstruction::getShiftedImmediate(unsigned int num, int& ShiftAmount)
 {
 	for (int i = 0; i < 32; i+=2)
 	{
-		unsigned int andval = (0xFFFFFF00 >> i) | (0xFFFFFF00 << (32-i));
+		unsigned int andval = (0xFFFFFF00 >> i) | (0xFFFFFF00 << (-i & 31));
 
 		if ((num & andval) == 0)	// found it
 		{
 			ShiftAmount = i;
-			return (num << i) | (num >> (32 - i));
+			return (num << i) | (num >> (-i & 31));
 		}
 	}
 	return -1;