[ARM64] Fix lifting of tbz / tbnz for bits >= 32

bdash · bdash · commit 3e9f6433c838 · 2025-07-30T16:43:46.000-07:00
diff --git a/arch/arm64/il.cpp b/arch/arm64/il.cpp
@@ -1159,13 +1159,13 @@ static ExprId ExtractBits(
     LowLevelILFunction& il, InstructionOperand& reg, size_t nbits, size_t rightMostBit)
 {
 // Get N set bits at offset O
-#define BITMASK(N, O) (((1LL << nbits) - 1) << O)
+#define BITMASK(N, O) (((UINT64_C(1) << nbits) - 1) << O)
 	return il.And(REGSZ_O(reg), ILREG_O(reg), il.Const(REGSZ_O(reg), BITMASK(nbits, rightMostBit)));
 }
 
 static ExprId ExtractBit(LowLevelILFunction& il, InstructionOperand& reg, size_t bit)
 {
-	return il.And(REGSZ_O(reg), ILREG_O(reg), il.Const(REGSZ_O(reg), (1 << bit)));
+	return il.And(REGSZ_O(reg), ILREG_O(reg), il.Const(REGSZ_O(reg), (UINT64_C(1) << bit)));
 }
 
 static void ConditionalJump(Architecture* arch, LowLevelILFunction& il, size_t cond,

Original file line number	Diff line number	Diff line change
`@@ -1159,13 +1159,13 @@ static ExprId ExtractBits(`
`1159`	`1159`	`LowLevelILFunction& il, InstructionOperand& reg, size_t nbits, size_t rightMostBit)`
`1160`	`1160`	`{`
`1161`	`1161`	`// Get N set bits at offset O`
`1162`		`-#define BITMASK(N, O) (((1LL << nbits) - 1) << O)`
	`1162`	`+#define BITMASK(N, O) (((UINT64_C(1) << nbits) - 1) << O)`
`1163`	`1163`	`return il.And(REGSZ_O(reg), ILREG_O(reg), il.Const(REGSZ_O(reg), BITMASK(nbits, rightMostBit)));`
`1164`	`1164`	`}`
`1165`	`1165`
`1166`	`1166`	`static ExprId ExtractBit(LowLevelILFunction& il, InstructionOperand& reg, size_t bit)`
`1167`	`1167`	`{`
`1168`		`- return il.And(REGSZ_O(reg), ILREG_O(reg), il.Const(REGSZ_O(reg), (1 << bit)));`
	`1168`	`+ return il.And(REGSZ_O(reg), ILREG_O(reg), il.Const(REGSZ_O(reg), (UINT64_C(1) << bit)));`
`1169`	`1169`	`}`
`1170`	`1170`
`1171`	`1171`	`static void ConditionalJump(Architecture* arch, LowLevelILFunction& il, size_t cond,`