Merge branch 'dev' into use-cached-exports

Author: WeiN76LQh

.github/workflows/rust.yml

@@ -24,7 +24,7 @@ jobs:
       - name: Install Rust
         uses: actions-rs/toolchain@v1
         with:
-          toolchain: 1.77.0
+          toolchain: 1.83.0
           profile: minimal
           override: true
           components: clippy

README.md

@@ -37,7 +37,7 @@ cmake --build build -j8
 In addition to the default build setup, you may want to:
 
 - **Build examples.** To build the [API examples](#examples), pass `-DBN_API_BUILD_EXAMPLES=ON` to CMake when configuring the build. After the build succeeds, you can install the built plugins by running the `install` target. When using the "Unix Makefiles" build generator, this looks like: `make install`.
-- **Build UI plugins.** You will need Qt 6.7.2 (as of writing) installed to build UI plugins.
+- **Build UI plugins.** You will need Qt 6.7.2 installed to build UI plugins. We use a slightly modified [build configuration](https://github.com/Vector35/qt-build) internally that has some ABI-compatible fixes and changes to defaults, but a stock build can also work. Note that it is not recommended to use pre-built configurations from Homebrew. Either using the official installer or building from our repo is recommended.
 - **Build headlessly.** If you are using a headless Binary Ninja distribution or you do not wish to build UI plugins, pass `-DHEADLESS=ON` to CMake when configuring the build.
 
 ### Troubleshooting

arch/mips/arch_mips.cpp

@@ -3001,13 +3001,44 @@ class MipsElfRelocationHandler: public RelocationHandler
 		}
 		case R_MIPS_HI16:
 		{
-			dest64[0] = swap64((inst64 & 0xffff0000ffffffff) | (((target + 0x8000) << 16) & 0xffff00000000 ));
+			// Find the first _LO16 in the list of relocations
+			BNRelocationInfo* cur = info.next;
+			while (cur && (cur->nativeType != R_MIPS_LO16))
+				cur = cur->next;
+
+			if (cur)
+			{
+				uint32_t inst2 = *(uint32_t*)(cur->relocationDataCache);
+				Instruction instruction;
+				memset(&instruction, 0, sizeof(instruction));
+				if (mips_decompose(&inst2, sizeof(uint32_t), &instruction, arch->GetAddressSize() == 8 ? MIPS_64 : MIPS_32, cur->address, arch->GetEndianness(), DECOMPOSE_FLAGS_PSEUDO_OP))
+					break;
+
+				int32_t immediate = swap(inst2) & 0xffff;
+
+				// ADDIU and LW has a signed immediate we have to subtract
+				if (instruction.operation == MIPS_ADDIU)
+					immediate = instruction.operands[2].immediate;
+				else if (instruction.operation == MIPS_LW)
+					immediate = instruction.operands[1].immediate;
+				uint32_t ahl = ((inst & 0xffff) << 16) + immediate;
+
+				// ((AHL + S) – (short)(AHL + S)) >> 16
+				dest32[0] = swap((uint32_t)(
+					(inst & ~0xffff) |
+					(((ahl + target) - (short)(ahl + target)) >> 16)
+				));
+			}
+			else
+			{
+				LogError("No corresponding R_MIPS_LO16 relocation for R_MIPS_HI16 relocation");
+			}
 			break;
 		}
 		case R_MIPS_LO16:
 		{
-			uint64_t ahl = (((inst64 & 0xffff00000000) >> 32) + target) & 0xffff;
-			dest64[0] = swap64((inst64 & 0xffff0000ffffffff) | ((ahl << 32) & 0xffff00000000) );
+			uint32_t ahl = ((inst & 0xffff) + target) & 0xffff;
+			dest32[0] = swap((inst & ~0xffff) | (ahl & 0xffff));
 			break;
 		}
 		case R_MIPS_26:
@@ -3084,6 +3115,21 @@ class MipsElfRelocationHandler: public RelocationHandler
 			case R_MIPS_HI16:
 				result[i].dataRelocation = false;
 				result[i].pcRelative = false;
+				// MIPS_HI16 relocations usually come before multiple MIPS_LO16 relocations. But, this is not always
+				// the case. Some binaries have MIPS_HI16 relocations after an associated MIPS_LO16 relocation.
+				for (size_t j = 0; j < result.size(); j++)
+				{
+					if (result[j].nativeType == R_MIPS_LO16 && result[j].symbolIndex == result[i].symbolIndex)
+					{
+						result[j].type = StandardRelocationType;
+						result[j].size = 4;
+						result[j].pcRelative = false;
+						result[j].dataRelocation = false;
+						result[i].next = new BNRelocationInfo(result[j]);
+						break;
+					}
+				}
+
 				break;
 			case R_MIPS_LO16:
 				result[i].pcRelative = false;

arch/msp430/Cargo.lock

@@ -47,3 +47,31 @@ if(BN_INTERNAL_BUILD)
 		LIBRARY_OUTPUT_DIRECTORY ${BN_CORE_PLUGIN_DIR}
 		RUNTIME_OUTPUT_DIRECTORY ${BN_CORE_PLUGIN_DIR})
 endif()
+
+if (DEFINED FORCE_TEST)
+	set(TEST_INLCUDE_LIST )
+	set(TEST_LINK_DIRECTORIES )
+	set(TEST_LINK_LIBRARIES capstone)
+	
+	if (NOT ${CMAKE_SYSTEM_NAME} MATCHES "Windows")
+		add_executable(test_disasm test_disasm.cpp disassembler.cpp)
+		add_executable(test_asm test_asm.cpp assembler.cpp)
+
+		target_compile_definitions(test_disasm PRIVATE FORCE_TEST=1)
+
+		set_target_properties(test_disasm test_asm PROPERTIES
+			CXX_STANDARD 17
+			CXX_VISIBILITY_PRESET hidden
+			CXX_STANDARD_REQUIRED ON
+			VISIBILITY_INLINES_HIDDEN ON
+			POSITION_INDEPENDENT_CODE ON)
+		
+		target_include_directories(test_disasm PRIVATE ${TEST_INCLUDE_LIST})
+		target_link_directories(test_disasm PRIVATE ${TEST_LINK_DIRECTORIES})
+		target_link_libraries(test_disasm PRIVATE ${TEST_LINK_LIBRARIES})
+
+		target_include_directories(test_asm PRIVATE ${TEST_INCLUDE_LIST})
+		target_link_directories(test_asm PRIVATE ${TEST_LINK_DIRECTORIES})
+		target_link_libraries(test_asm PRIVATE ${TEST_LINK_LIBRARIES})
+	endif()
+endif()