Add more plugins to free

Cargo.toml

@@ -10,13 +10,16 @@ members = [
     "arch/msp430",
     "view/minidump",
     "plugins/dwarf/dwarf_import",
+    "plugins/dwarf/dwarf_import/demo",
     "plugins/dwarf/dwarf_export",
+    "plugins/dwarf/dwarf_export/demo",
     "plugins/dwarf/dwarfdump",
     "plugins/dwarf/shared",
     "plugins/idb_import",
     "plugins/pdb-ng",
     "plugins/pdb-ng/demo",
-    "plugins/warp", 
+    "plugins/warp",
+    "plugins/warp/demo",
     "plugins/svd",
     "plugins/svd/demo"
 ]

plugins/dwarf/dwarf_export/CMakeLists.txt

@@ -2,92 +2,167 @@ cmake_minimum_required(VERSION 3.15 FATAL_ERROR)
 
 project(dwarf_export)
 
-file(GLOB PLUGIN_SOURCES CONFIGURE_DEPENDS
-	${PROJECT_SOURCE_DIR}/Cargo.toml
-	${PROJECT_SOURCE_DIR}/src/*.rs
-	${PROJECT_SOURCE_DIR}/../shared/Cargo.toml
-	${PROJECT_SOURCE_DIR}/../shared/src/*.rs)
+if(NOT BN_API_BUILD_EXAMPLES AND NOT BN_INTERNAL_BUILD)
+	if(NOT BN_API_PATH)
+		# If we have not already defined the API source directory try and find it.
+		find_path(
+				BN_API_PATH
+				NAMES binaryninjaapi.h
+				# List of paths to search for the clone of the api
+				HINTS ../../.. ../../binaryninja/api/ binaryninjaapi binaryninja-api $ENV{BN_API_PATH}
+				REQUIRED
+		)
+	endif()
+	set(CARGO_STABLE_VERSION 1.83.0)
+	add_subdirectory(${BN_API_PATH} binaryninjaapi)
+endif()
 
-file(GLOB API_SOURCES CONFIGURE_DEPENDS
-	${PROJECT_SOURCE_DIR}/../../../binaryninjacore.h
-	${PROJECT_SOURCE_DIR}/../../../rust/binaryninjacore-sys/build.rs
-	${PROJECT_SOURCE_DIR}/../../../rust/binaryninjacore-sys/Cargo.toml
-	${PROJECT_SOURCE_DIR}/../../../rust/binaryninjacore-sys/src/*
-	${PROJECT_SOURCE_DIR}/../../../rust/Cargo.toml
-	${PROJECT_SOURCE_DIR}/../../../rust/src/*.rs)
+file(GLOB_RECURSE PLUGIN_SOURCES CONFIGURE_DEPENDS
+		${PROJECT_SOURCE_DIR}/Cargo.toml
+		${PROJECT_SOURCE_DIR}/src/*.rs)
 
 if(CMAKE_BUILD_TYPE MATCHES Debug)
-	set(TARGET_DIR ${PROJECT_BINARY_DIR}/target/debug)
-	set(CARGO_OPTS --target-dir=${PROJECT_BINARY_DIR}/target)
+	if(DEMO)
+		set(TARGET_DIR ${PROJECT_BINARY_DIR}/target/dev-demo)
+		set(CARGO_OPTS --target-dir=${PROJECT_BINARY_DIR}/target --profile=dev-demo)
+	else()
+		set(TARGET_DIR ${PROJECT_BINARY_DIR}/target/debug)
+		set(CARGO_OPTS --target-dir=${PROJECT_BINARY_DIR}/target)
+	endif()
 else()
-	set(TARGET_DIR ${PROJECT_BINARY_DIR}/target/release)
-	set(CARGO_OPTS --target-dir=${PROJECT_BINARY_DIR}/target --release)
-	set(OUTPUT_PDB_NAME ${CMAKE_SHARED_LIBRARY_PREFIX}dwarf_export.pdb)
+	if(DEMO)
+		set(TARGET_DIR ${PROJECT_BINARY_DIR}/target/release-demo)
+		set(CARGO_OPTS --target-dir=${PROJECT_BINARY_DIR}/target --profile=release-demo)
+	else()
+		set(TARGET_DIR ${PROJECT_BINARY_DIR}/target/release)
+		set(CARGO_OPTS --target-dir=${PROJECT_BINARY_DIR}/target --release)
+	endif()
+endif()
+
+if(FORCE_COLORED_OUTPUT)
+	set(CARGO_OPTS ${CARGO_OPTS} --color always)
 endif()
 
-set(OUTPUT_FILE ${CMAKE_STATIC_LIBRARY_PREFIX}dwarf_export${CMAKE_SHARED_LIBRARY_SUFFIX})
-set(PLUGIN_PATH ${TARGET_DIR}/${OUTPUT_FILE})
+if(DEMO)
+	set(CARGO_FEATURES --features demo --manifest-path ${PROJECT_SOURCE_DIR}/demo/Cargo.toml)
 
-add_custom_target(dwarf_export ALL DEPENDS ${PLUGIN_PATH})
-add_dependencies(dwarf_export binaryninjaapi)
+	set(OUTPUT_FILE_NAME ${CMAKE_STATIC_LIBRARY_PREFIX}${PROJECT_NAME}_static${CMAKE_STATIC_LIBRARY_SUFFIX})
+	set(OUTPUT_PDB_NAME ${CMAKE_STATIC_LIBRARY_PREFIX}${PROJECT_NAME}.pdb)
+	set(OUTPUT_FILE_PATH ${CMAKE_BINARY_DIR}/${OUTPUT_FILE_NAME})
+	set(OUTPUT_PDB_PATH ${CMAKE_BINARY_DIR}/${OUTPUT_PDB_NAME})
 
-find_program(RUSTUP_PATH rustup REQUIRED HINTS ~/.cargo/bin)
-if(CARGO_API_VERSION)
-	set(RUSTUP_COMMAND ${RUSTUP_PATH} run ${CARGO_API_VERSION} cargo build)
+	set(BINJA_LIB_DIR $<TARGET_FILE_DIR:binaryninjacore>)
 else()
-	set(RUSTUP_COMMAND ${RUSTUP_PATH} run ${CARGO_STABLE_VERSION} cargo build)
+	# NOTE: --no-default-features is set to disable building artifacts used for testing
+	# NOTE: the linker is looking in the target dir and linking on it apparently.
+	set(CARGO_FEATURES "--no-default-features")
+
+	set(OUTPUT_FILE_NAME ${CMAKE_SHARED_LIBRARY_PREFIX}${PROJECT_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX})
+	set(OUTPUT_PDB_NAME ${CMAKE_SHARED_LIBRARY_PREFIX}${PROJECT_NAME}.pdb)
+	set(OUTPUT_FILE_PATH ${BN_CORE_PLUGIN_DIR}/${OUTPUT_FILE_NAME})
+	set(OUTPUT_PDB_PATH ${BN_CORE_PLUGIN_DIR}/${OUTPUT_PDB_NAME})
+
+	set(BINJA_LIB_DIR ${BN_INSTALL_BIN_DIR})
 endif()
 
+
+add_custom_target(${PROJECT_NAME} ALL DEPENDS ${OUTPUT_FILE_PATH})
+add_dependencies(${PROJECT_NAME} binaryninjaapi)
+get_target_property(BN_API_SOURCE_DIR binaryninjaapi SOURCE_DIR)
+list(APPEND CMAKE_MODULE_PATH "${BN_API_SOURCE_DIR}/cmake")
+find_package(BinaryNinjaCore REQUIRED)
+
+set_property(TARGET ${PROJECT_NAME} PROPERTY OUTPUT_FILE_PATH ${OUTPUT_FILE_PATH})
+
+# Add the whole api to the depends too
+file(GLOB API_SOURCES CONFIGURE_DEPENDS
+		${BN_API_SOURCE_DIR}/binaryninjacore.h
+		${BN_API_SOURCE_DIR}/rust/src/*.rs
+		${BN_API_SOURCE_DIR}/rust/binaryninjacore-sys/src/*.rs)
+
+find_program(RUSTUP_PATH rustup REQUIRED HINTS ~/.cargo/bin)
+set(RUSTUP_COMMAND ${RUSTUP_PATH} run ${CARGO_STABLE_VERSION} cargo)
+
 if(APPLE)
 	if(UNIVERSAL)
 		if(CMAKE_BUILD_TYPE MATCHES Debug)
-			set(AARCH64_LIB_PATH ${PROJECT_BINARY_DIR}/target/aarch64-apple-darwin/debug/${OUTPUT_FILE})
-			set(X86_64_LIB_PATH ${PROJECT_BINARY_DIR}/target/x86_64-apple-darwin/debug/${OUTPUT_FILE})
+			if(DEMO)
+				set(AARCH64_LIB_PATH ${PROJECT_BINARY_DIR}/target/aarch64-apple-darwin/dev-demo/${OUTPUT_FILE_NAME})
+				set(X86_64_LIB_PATH ${PROJECT_BINARY_DIR}/target/x86_64-apple-darwin/dev-demo/${OUTPUT_FILE_NAME})
+			else()
+				set(AARCH64_LIB_PATH ${PROJECT_BINARY_DIR}/target/aarch64-apple-darwin/debug/${OUTPUT_FILE_NAME})
+				set(X86_64_LIB_PATH ${PROJECT_BINARY_DIR}/target/x86_64-apple-darwin/debug/${OUTPUT_FILE_NAME})
+			endif()
 		else()
-			set(AARCH64_LIB_PATH ${PROJECT_BINARY_DIR}/target/aarch64-apple-darwin/release/${OUTPUT_FILE})
-			set(X86_64_LIB_PATH ${PROJECT_BINARY_DIR}/target/x86_64-apple-darwin/release/${OUTPUT_FILE})
+			if(DEMO)
+				set(AARCH64_LIB_PATH ${PROJECT_BINARY_DIR}/target/aarch64-apple-darwin/release-demo/${OUTPUT_FILE_NAME})
+				set(X86_64_LIB_PATH ${PROJECT_BINARY_DIR}/target/x86_64-apple-darwin/release-demo/${OUTPUT_FILE_NAME})
+			else()
+				set(AARCH64_LIB_PATH ${PROJECT_BINARY_DIR}/target/aarch64-apple-darwin/release/${OUTPUT_FILE_NAME})
+				set(X86_64_LIB_PATH ${PROJECT_BINARY_DIR}/target/x86_64-apple-darwin/release/${OUTPUT_FILE_NAME})
+			endif()
 		endif()
 
 		add_custom_command(
-			OUTPUT ${PLUGIN_PATH}
-			COMMAND ${CMAKE_COMMAND} -E env
-				MACOSX_DEPLOYMENT_TARGET=10.14 BINARYNINJADIR=${BN_CORE_OUTPUT_DIR}
-				${RUSTUP_COMMAND} --target=aarch64-apple-darwin ${CARGO_OPTS}
-			COMMAND ${CMAKE_COMMAND} -E env
-				MACOSX_DEPLOYMENT_TARGET=10.14 BINARYNINJADIR=${BN_CORE_OUTPUT_DIR}
-				${RUSTUP_COMMAND} --target=x86_64-apple-darwin ${CARGO_OPTS}
-			COMMAND mkdir -p ${TARGET_DIR}
-			COMMAND lipo -create ${AARCH64_LIB_PATH} ${X86_64_LIB_PATH} -output ${PLUGIN_PATH}
-			COMMAND ${CMAKE_COMMAND} -E copy ${PLUGIN_PATH} ${BN_CORE_PLUGIN_DIR}
-			WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
-			DEPENDS ${PLUGIN_SOURCES} ${API_SOURCES})
+				OUTPUT ${OUTPUT_FILE_PATH}
+				COMMAND ${CMAKE_COMMAND} -E env
+				MACOSX_DEPLOYMENT_TARGET=10.14 BINARYNINJADIR=${BINJA_LIB_DIR}
+				${RUSTUP_COMMAND} clean --target=aarch64-apple-darwin ${CARGO_OPTS} --package binaryninjacore-sys
+				COMMAND ${CMAKE_COMMAND} -E env
+				MACOSX_DEPLOYMENT_TARGET=10.14 BINARYNINJADIR=${BINJA_LIB_DIR}
+				${RUSTUP_COMMAND} clean --target=x86_64-apple-darwin ${CARGO_OPTS} --package binaryninjacore-sys
+				COMMAND ${CMAKE_COMMAND} -E env
+				MACOSX_DEPLOYMENT_TARGET=10.14 BINARYNINJADIR=${BINJA_LIB_DIR}
+				${RUSTUP_COMMAND} build --target=aarch64-apple-darwin ${CARGO_OPTS} ${CARGO_FEATURES}
+				COMMAND ${CMAKE_COMMAND} -E env
+				MACOSX_DEPLOYMENT_TARGET=10.14 BINARYNINJADIR=${BINJA_LIB_DIR}
+				${RUSTUP_COMMAND} build --target=x86_64-apple-darwin ${CARGO_OPTS} ${CARGO_FEATURES}
+				COMMAND lipo -create ${AARCH64_LIB_PATH} ${X86_64_LIB_PATH} -output ${OUTPUT_FILE_PATH}
+				WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
+				DEPENDS ${PLUGIN_SOURCES} ${API_SOURCES}
+		)
 	else()
-		if(CMAKE_BUILD_TYPE MATCHES Debug)
-			set(LIB_PATH ${PROJECT_BINARY_DIR}/target/debug/${OUTPUT_FILE})
-		else()
-			set(LIB_PATH ${PROJECT_BINARY_DIR}/target/release/${OUTPUT_FILE})
-		endif()
-
 		add_custom_command(
-			OUTPUT ${PLUGIN_PATH}
-			COMMAND ${CMAKE_COMMAND} -E env MACOSX_DEPLOYMENT_TARGET=10.14 BINARYNINJADIR=${BN_CORE_OUTPUT_DIR} ${RUSTUP_COMMAND} ${CARGO_OPTS}
-			COMMAND ${CMAKE_COMMAND} -E copy ${PLUGIN_PATH} ${BN_CORE_PLUGIN_DIR}
-			WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
-			DEPENDS ${PLUGIN_SOURCES} ${API_SOURCES})
+				OUTPUT ${OUTPUT_FILE_PATH}
+				COMMAND ${CMAKE_COMMAND} -E env
+				MACOSX_DEPLOYMENT_TARGET=10.14 BINARYNINJADIR=${BINJA_LIB_DIR}
+				${RUSTUP_COMMAND} clean ${CARGO_OPTS} --package binaryninjacore-sys
+				COMMAND ${CMAKE_COMMAND} -E env
+				MACOSX_DEPLOYMENT_TARGET=10.14 BINARYNINJADIR=${BINJA_LIB_DIR}
+				${RUSTUP_COMMAND} build ${CARGO_OPTS} ${CARGO_FEATURES}
+				COMMAND ${CMAKE_COMMAND} -E copy ${TARGET_DIR}/${OUTPUT_FILE_NAME} ${OUTPUT_FILE_PATH}
+				WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
+				DEPENDS ${PLUGIN_SOURCES} ${API_SOURCES}
+		)
 	endif()
 elseif(WIN32)
-	add_custom_command(
-		OUTPUT ${PLUGIN_PATH}
-		COMMAND ${CMAKE_COMMAND} -E env BINARYNINJADIR=${BN_CORE_OUTPUT_DIR} ${RUSTUP_COMMAND} ${CARGO_OPTS}
-		COMMAND ${CMAKE_COMMAND} -E copy ${PLUGIN_PATH} ${BN_CORE_PLUGIN_DIR}
-		COMMAND ${CMAKE_COMMAND} -E copy ${TARGET_DIR}/${OUTPUT_PDB_NAME} ${BN_CORE_PLUGIN_DIR}
-		WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
-		DEPENDS ${PLUGIN_SOURCES} ${API_SOURCES})
+	if(DEMO)
+		add_custom_command(
+				OUTPUT ${OUTPUT_FILE_PATH}
+				COMMAND ${CMAKE_COMMAND} -E env BINARYNINJADIR=${BINJA_LIB_DIR} ${RUSTUP_COMMAND} clean ${CARGO_OPTS}
+				COMMAND ${CMAKE_COMMAND} -E env BINARYNINJADIR=${BINJA_LIB_DIR} ${RUSTUP_COMMAND} build ${CARGO_OPTS} ${CARGO_FEATURES}
+				COMMAND ${CMAKE_COMMAND} -E copy ${TARGET_DIR}/${OUTPUT_FILE_NAME} ${OUTPUT_FILE_PATH}
+				WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
+				DEPENDS ${PLUGIN_SOURCES} ${API_SOURCES}
+		)
+	else()
+		add_custom_command(
+				OUTPUT ${OUTPUT_FILE_PATH}
+				COMMAND ${CMAKE_COMMAND} -E env BINARYNINJADIR=${BINJA_LIB_DIR} ${RUSTUP_COMMAND} clean ${CARGO_OPTS} --package binaryninjacore-sys
+				COMMAND ${CMAKE_COMMAND} -E env BINARYNINJADIR=${BINJA_LIB_DIR} ${RUSTUP_COMMAND} build ${CARGO_OPTS} ${CARGO_FEATURES}
+				COMMAND ${CMAKE_COMMAND} -E copy ${TARGET_DIR}/${OUTPUT_FILE_NAME} ${OUTPUT_FILE_PATH}
+				COMMAND ${CMAKE_COMMAND} -E copy ${TARGET_DIR}/${OUTPUT_PDB_NAME} ${OUTPUT_PDB_PATH}
+				WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
+				DEPENDS ${PLUGIN_SOURCES} ${API_SOURCES}
+		)
+	endif()
 else()
 	add_custom_command(
-		OUTPUT ${PLUGIN_PATH}
-		COMMAND ${CMAKE_COMMAND} -E env BINARYNINJADIR=${BN_CORE_OUTPUT_DIR} ${RUSTUP_COMMAND} ${CARGO_OPTS}
-		COMMAND ${CMAKE_COMMAND} -E copy ${PLUGIN_PATH} ${BN_CORE_PLUGIN_DIR}
-		WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
-		DEPENDS ${PLUGIN_SOURCES} ${API_SOURCES})
+			OUTPUT ${OUTPUT_FILE_PATH}
+			COMMAND ${CMAKE_COMMAND} -E env BINARYNINJADIR=${BINJA_LIB_DIR} ${RUSTUP_COMMAND} clean ${CARGO_OPTS} --package binaryninjacore-sys
+			COMMAND ${CMAKE_COMMAND} -E env BINARYNINJADIR=${BINJA_LIB_DIR} ${RUSTUP_COMMAND} build ${CARGO_OPTS} ${CARGO_FEATURES}
+			COMMAND ${CMAKE_COMMAND} -E copy ${TARGET_DIR}/${OUTPUT_FILE_NAME} ${OUTPUT_FILE_PATH}
+			WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
+			DEPENDS ${PLUGIN_SOURCES} ${API_SOURCES}
+	)
 endif()

plugins/dwarf/dwarf_export/Cargo.toml

@@ -7,6 +7,9 @@ license = "Apache-2.0"
 [lib]
 crate-type = ["cdylib"]
 
+[features]
+demo = []
+
 [dependencies]
 binaryninja.workspace = true
 binaryninjacore-sys.workspace = true

plugins/dwarf/dwarf_export/demo/Cargo.toml

@@ -0,0 +1,19 @@
+[package]
+name = "dwarf_export-static"
+version = "0.1.0"
+edition = "2021"
+license = "Apache-2.0"
+
+[lib]
+crate-type = ["staticlib"]
+path = "../src/lib.rs"
+
+[features]
+demo = []
+
+[dependencies]
+binaryninja = { workspace = true, features = ["demo"]}
+binaryninjacore-sys.workspace = true
+gimli = "^0.31"
+log = "0.4"
+object = { version = "0.32.1", features = ["write"] }

plugins/dwarf/dwarf_export/demo/build.rs

@@ -0,0 +1,15 @@
+fn main() {
+    let link_path = std::env::var_os("DEP_BINARYNINJACORE_PATH")
+        .expect("DEP_BINARYNINJACORE_PATH not specified");
+
+    println!("cargo::rustc-link-lib=dylib=binaryninjacore");
+    println!("cargo::rustc-link-search={}", link_path.to_str().unwrap());
+
+    #[cfg(not(target_os = "windows"))]
+    {
+        println!(
+            "cargo::rustc-link-arg=-Wl,-rpath,{0},-L{0}",
+            link_path.to_string_lossy()
+        );
+    }
+}

plugins/dwarf/dwarf_export/src/lib.rs

@@ -792,8 +792,7 @@
     }
 }
 
-#[no_mangle]
-pub extern "C" fn CorePluginInit() -> bool {
+fn plugin_init() {
     Logger::new("DWARF Export")
         .with_level(LevelFilter::Debug)
         .init();
@@ -803,6 +802,20 @@
         "Export current analysis state and annotations as DWARF for import into other tools",
         MyCommand {},
     );
+}
 
+#[no_mangle]
+#[allow(non_snake_case)]
+#[cfg(not(feature = "demo"))]
+pub extern "C" fn CorePluginInit() -> bool {
+    plugin_init();
     true
 }
+
+#[no_mangle]
+#[allow(non_snake_case)]
+#[cfg(feature = "demo")]
+pub extern "C" fn DwarfExportPluginInit() -> bool {
+    plugin_init();
+    true
+}