Merge branch 'Vector35:dev' into dev

Author: nullableVoidPtr

.github/ISSUE_TEMPLATE/bug_report.md

@@ -32,11 +32,12 @@ If applicable, please add screenshots/video recording here to help explain your
 **Binary:**
 If applicable, please provide us with the binary to help us work with the issue faster. Here are a few options:
 
-1. Directly attach it to this issue in a ZIP archive
-2. Share a publicly accessible link to it (For malware samples, we do not have access to VirusTotal; [Malshare](https://malshare.com/) is an option)
-3. Email it to binaryninja at vector35.com, or join our [slack](https://slack.binary.ninja/) and share with us in private
-4. We understand sometimes it is not possible to share the binary -- sure, no worries, we can still work with it!
-5. If your issue is general and not related to a specific binary, then there is no need to attach the binary as well
+1. Upload it privately using the [Binary Ninja Portal file uploader](https://portal.binary.ninja/upload) and add the provided reference phrase here
+2. Directly attach it to this issue in a ZIP archive
+3. Share a publicly accessible link to it (For malware samples, we do not have access to VirusTotal; [Malshare](https://malshare.com/) is an option)
+4. Email it to binaryninja at vector35.com, or join our [Slack](https://slack.binary.ninja/) and share it with us in private
+5. We understand sometimes it is not possible to share the binary -- sure, no worries, we can still work with it!
+6. If your issue is general and not related to a specific binary, then there is no need to attach the binary as well
 
 **Additional Information:**
 Please add any other context about the problem here.

.github/workflows/rust.yml

@@ -23,13 +23,13 @@ jobs:
       # Ensure clippy is installed
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
+          toolchain: 1.83.0
           components: clippy
       - name: Clippy Check
         uses: clechasseur/rs-clippy-check@v4
         with:
           # We do not run clippy on plugins.
-          working-directory: ./rust
-          args: --all-features
+          args: -p binaryninja --all-features
 
   # Check formatting with rustfmt
   formatting:
@@ -40,6 +40,7 @@ jobs:
       # Ensure rustfmt is installed
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
+          toolchain: 1.83.0
           components: rustfmt
       - name: Rustfmt Check
         uses: actions-rust-lang/rustfmt@v1

Cargo.lock

@@ -16,7 +16,8 @@ members = [
     "plugins/idb_import",
     "plugins/pdb-ng",
     "plugins/pdb-ng/demo",
-    "plugins/warp"
+    "plugins/warp", 
+    "plugins/svd"
 ]
 
 [workspace.dependencies]
@@ -35,4 +36,4 @@ lto = false
 # Disable LTO on demo builds, it will export `rust_eh_personality`
 [profile.dev-demo]
 inherits = "dev"
-lto = false
+lto = false

Cargo.toml

@@ -167,13 +167,73 @@ static ExprId GetShiftedOffset(LowLevelILFunction& il, InstructionOperand& op)
 }
 
 
+static ExprId GetRegisterShiftedRegister(LowLevelILFunction& il, Register reg, Register shiftReg, Shift shiftType)
+{
+	if (shiftType == SHIFT_NONE)
+		return il.Register(get_register_size(reg), reg);
+
+	uint32_t regSize = get_register_size(reg);
+	uint32_t shiftRegSize = get_register_size(shiftReg);
+	switch (shiftType)
+	{
+		case SHIFT_ASR:
+			return il.ArithShiftRight(
+				regSize,
+				il.Register(regSize, reg),
+				il.And(
+					shiftRegSize,
+					il.Register(shiftRegSize, shiftReg),
+					il.Const(shiftRegSize, 0xff)
+				));
+		case SHIFT_LSL:
+			return il.ShiftLeft(
+				regSize,
+				il.Register(regSize, reg),
+				il.And(
+					shiftRegSize,
+					il.Register(shiftRegSize, shiftReg),
+					il.Const(shiftRegSize, 0xff)
+				));
+		case SHIFT_LSR:
+			return il.LogicalShiftRight(
+				regSize,
+				il.Register(regSize, reg),
+				il.And(
+					shiftRegSize,
+					il.Register(shiftRegSize, shiftReg),
+					il.Const(shiftRegSize, 0xff)
+				));
+		case SHIFT_ROR:
+			return il.RotateRight(
+				regSize,
+				il.Register(regSize, reg),
+				il.And(
+					shiftRegSize,
+					il.Register(shiftRegSize, shiftReg),
+					il.Const(shiftRegSize, 0xff)
+				));
+		case SHIFT_RRX:
+			//RRX can only shift 1 at a time
+			return il.RotateRightCarry(
+				regSize,
+				il.Register(regSize, reg),
+				il.Const(1, 1),
+				il.Flag(IL_FLAG_C)
+			);
+		default:
+			return 0;
+	}
+}
+
+
 static ExprId GetShiftedRegister(LowLevelILFunction& il, InstructionOperand& op)
 {
+	if (op.flags.offsetRegUsed == 1)
+		return GetRegisterShiftedRegister(il, op.reg, op.offset, op.shift);
 	return GetShifted(il, op.reg, op.imm, op.shift);
 }
 
 
-
 static ExprId ReadAddress(LowLevelILFunction& il, InstructionOperand& op, size_t addr)
 {
 	//This should only be called by with cls or MEM_* or label
@@ -227,7 +287,7 @@ static ExprId ReadILOperand(LowLevelILFunction& il, InstructionOperand& op, size
 		case REG:
 			if (op.shift == SHIFT_NONE)
 				return ReadRegisterOrPointer(il, op, addr);
-			else if (op.flags.offsetRegUsed == 1)
+			else if (op.flags.offsetRegUsed == 1 && op.imm != 0)
 			{
 				return GetShiftedOffset(il, op);
 			}

arch/armv7/il.cpp

@@ -9,9 +9,9 @@
 	# r0 = (r1 & 0b11111111111111111111111111100011) | ((r1 & 0b111) << 2)
 	(b'\x11\x01\xc4\xe7', 'LLIL_SET_REG(r0,LLIL_OR(LLIL_AND(LLIL_REG(r0),LLIL_CONST(4294967267)),LLIL_LSL(LLIL_AND(LLIL_REG(r1),LLIL_CONST(7)),LLIL_CONST(2))))'), # bfi r0, r1, #2, #3
 	# temp0 = r2*r3; r0=tmp0&0xFFFFFFFF; r1=tmp0>>32 ... LOGICAL shift since mul is unsigned
-	(b'\x92\x03\x81\xe0', 'LLIL_SET_REG(temp0,LLIL_MUL(LLIL_REG(r2),LLIL_REG(r3))); LLIL_SET_REG(r0,LLIL_LOW_PART(LLIL_REG(temp0))); LLIL_SET_REG(r1,LLIL_LSR(LLIL_REG(temp0),LLIL_CONST(32)))'), # umull r0, r1, r2, r3
+	(b'\x92\x03\x81\xe0', 'LLIL_SET_REG_SPLIT(r1,r0,LLIL_MULU_DP(LLIL_REG(r2),LLIL_REG(r3)))'), # umull r0, r1, r2, r3
 	# same, but ARITHMETIC shift since mul is signed
-	(b'\x92\x03\xc1\xe0', 'LLIL_SET_REG(temp0,LLIL_MUL(LLIL_REG(r2),LLIL_REG(r3))); LLIL_SET_REG(r0,LLIL_LOW_PART(LLIL_REG(temp0))); LLIL_SET_REG(r1,LLIL_ASR(LLIL_REG(temp0),LLIL_CONST(32)))'), # smull r0, r1, r2, r3
+	(b'\x92\x03\xc1\xe0', 'LLIL_SET_REG_SPLIT(r1,r0,LLIL_MULS_DP(LLIL_REG(r2),LLIL_REG(r3)))'), # smull r0, r1, r2, r3
 	# multiply and accumulate: mla r0, r1, r2, r3 lift to r0 = r3 + (r1 * r2)
 	(b'\x91\x32\x20\xe0', 'LLIL_SET_REG(r0,LLIL_ADD(LLIL_REG(r3),LLIL_MUL(LLIL_REG(r1),LLIL_REG(r2))))'), # mla r0, r1, r2, r3
 	# multiply and subtract: mls r0, r1, r2, r3 lift to r0 = r3 - (r1 * r2)

arch/armv7/test.py

@@ -100,6 +100,9 @@
     ('A', b'\x02\x0a\x83\xed', 'LLIL_STORE.d(LLIL_ADD.d(LLIL_REG.d(r3),LLIL_CONST.d(0x8)),LLIL_REG.d(s0))'),
     # vstr d16, [r3, #0x8]
     ('A', b'\x02\x0b\xc3\xed', 'LLIL_STORE.q(LLIL_ADD.d(LLIL_REG.d(r3),LLIL_CONST.d(0x8)),LLIL_REG.q(d16))'),
+    # orr r0, r1, r3, lsl r4
+    ('A', b'\x13\x04\x81\xe1', 'LLIL_SET_REG.d(r0,LLIL_OR.d(LLIL_REG.d(r1),LLIL_LSL.d(LLIL_REG.d(r3),LLIL_AND.d(LLIL_REG.d(r4),LLIL_CONST.d(0xFF)))))'),
+
     # mov r2, r0
     ('T', b'\x02\x46', 'LLIL_SET_REG.d(r2,LLIL_REG.d(r0))'),
     # cmp r1, r2
@@ -124,7 +127,7 @@
     # just r0 = r1 >> 20, no left shift required
     ('T', b'\x41\xf3\x1d\x50', 'LLIL_SET_REG.d(r0,LLIL_ASR.d(LLIL_REG.d(r1),LLIL_CONST.b(0x14)))'),
     # rev r1, r1
-    ('T', b'\x09\xba',         'LLIL_SET_REG.d(r1,LLIL_OR.d(LLIL_LSR.d(LLIL_REG.d(r1),LLIL_CONST.d(0x18)),LLIL_OR.d(LLIL_LSL.d(LLIL_AND.d(LLIL_LSR.d(LLIL_REG.d(r1),LLIL_CONST.d(0x10)),LLIL_CONST.d(0xFF)),LLIL_CONST.d(0x8)),LLIL_OR.d(LLIL_LSL.d(LLIL_AND.d(LLIL_LSR.d(LLIL_REG.d(r1),LLIL_CONST.d(0x8)),LLIL_CONST.d(0xFF)),LLIL_CONST.d(0x10)),LLIL_LSL.d(LLIL_AND.d(LLIL_REG.d(r1),LLIL_CONST.d(0xFF)),LLIL_CONST.d(0x18))))))'),
+    ('T', b'\x09\xba',         'LLIL_SET_REG.d(r1,LLIL_OR.d(LLIL_LSR.d(LLIL_REG.d(r1),LLIL_CONST.d(0x18)),LLIL_OR.d(LLIL_LSL.d(LLIL_AND.d(LLIL_LSR.d(LLIL_REG.d(r1),LLIL_CONST.d(0x10)),LLIL_CONST.d(0xFF)),LLIL_CONST.b(0x8)),LLIL_OR.d(LLIL_LSL.d(LLIL_AND.d(LLIL_LSR.d(LLIL_REG.d(r1),LLIL_CONST.d(0x8)),LLIL_CONST.d(0xFF)),LLIL_CONST.b(0x10)),LLIL_LSL.d(LLIL_AND.d(LLIL_REG.d(r1),LLIL_CONST.d(0xFF)),LLIL_CONST.b(0x18))))))'),
 ]
 
 import re

arch/armv7/test_lift.py

@@ -2776,6 +2776,10 @@ namespace BinaryNinja {
 	};
 
 
+	namespace Collaboration
+	{
+		class RemoteProject;
+	}
 	/*!
 
 		\ingroup project
@@ -2827,6 +2831,8 @@ namespace BinaryNinja {
 
 		void BeginBulkOperation();
 		void EndBulkOperation();
+
+		Ref<Collaboration::RemoteProject> GetRemoteProject();
 	};
 
 	/*!
@@ -3928,6 +3934,8 @@ namespace BinaryNinja {
 		    const NameSpace& nameSpace = NameSpace(DEFAULT_INTERNAL_NAMESPACE), uint64_t ordinal = 0);
 		Symbol(BNSymbolType type, const std::string& name, uint64_t addr, BNSymbolBinding binding = NoBinding,
 		    const NameSpace& nameSpace = NameSpace(DEFAULT_INTERNAL_NAMESPACE), uint64_t ordinal = 0);
+		Symbol(BNSymbolType type, const std::string& shortName, const std::string& fullName, const std::string& rawName,
+			uint64_t addr, BNNameSpace* nameSpace, BNSymbolBinding binding = NoBinding, uint64_t ordinal = 0);
 		Symbol(BNSymbolType type, const std::string& name, uint64_t addr, BNNameSpace* nameSpace,
 			BNSymbolBinding binding = NoBinding, uint64_t ordinal = 0);
 		Symbol(BNSymbol* sym);
@@ -6482,7 +6490,9 @@ namespace BinaryNinja {
 			const FunctionViewType& viewType, const std::function<bool(size_t current, size_t total)>& progress,
 		    const std::function<bool(uint64_t addr, const LinearDisassemblyLine& line)>& matchCallback);
 
-		bool Search(const std::string& query, const std::function<bool(uint64_t offset, const DataBuffer& buffer)>& otherCallback);
+		bool Search(const std::string& query,
+			const std::function<bool(size_t current, size_t total)>& progressCallback,
+			const std::function<bool(uint64_t addr, const DataBuffer& buffer)>& matchCallback);
 
 		void Reanalyze();
 
@@ -10088,11 +10098,11 @@ namespace BinaryNinja {
 
 		/*! Clone a workflow, copying all Activities and the execution strategy
 
-			\param name Name for the new Workflow
+			\param name If specified, name the new Workflow, otherwise the name is copied from the original
 			\param activity If specified, perform the clone with `activity` as the root
 			\return A new Workflow
 		*/
-		Ref<Workflow> Clone(const std::string& name, const std::string& activity = "");
+		Ref<Workflow> Clone(const std::string& name = "", const std::string& activity = "");
 
 		/*! Register an Activity with this Workflow
 
@@ -10203,6 +10213,22 @@ namespace BinaryNinja {
 		*/
 		bool Insert(const std::string& activity, const std::vector<std::string>& activities);
 
+		/*! Insert an activity after the specified activity and at the same level.
+
+			\param activity Name of the activity to insert the new one after
+			\param newActivity Name of the new activity to be inserted
+			\return true on success, false otherwise
+		*/
+		bool InsertAfter(const std::string& activity, const std::string& newActivity);
+
+		/*! Insert a list of activities after the specified activity and at the same level.
+
+			\param activity Name of the activity to insert the new one after
+			\param newActivity Name of the new activities to be inserted
+			\return true on success, false otherwise
+		*/
+		bool InsertAfter(const std::string& activity, const std::vector<std::string>& activities);
+
 		/*! Remove an activity by name
 
 			\param activity Name of the activity to remove