Enable printing function pointers using debug::log.

This requires a reinterpret_cast rather than a static cast.
CHERIoT-Platform · Feb 21, 2025 · fafa7aa · fafa7aa
1 parent 092a41b
commit fafa7aa
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/sdk/include/debug.hh b/sdk/include/debug.hh
@@ -388,7 +388,7 @@ struct DebugFormatArgumentAdaptor<T>
 	__always_inline static DebugFormatArgument construct(T value)
 	{
 		return {reinterpret_cast<uintptr_t>(
-		          static_cast<const volatile void *>(value)),
+		          reinterpret_cast<const volatile void *>(value)),
 		        DebugFormatArgumentKind::DebugFormatArgumentPointer};
 	}
 };

diff --git a/tests/test-runner.cc b/tests/test-runner.cc
@@ -121,6 +121,7 @@ int __cheri_compartment("test_runner") run_tests()
 	debug_log("Trying to print unsigned 32-bit integer: {}", 0x12345U);
 	debug_log("Trying to print unsigned 64-bit integer: {}",
 	          0x123456789012345ULL);
+	debug_log("Trying to print function pointer {}", compartment_error_handler);
 	const char *testString = "Hello, world! with some trailing characters";
 	// Make sure that we don't print the trailing characters
 	debug_log("Trying to print std::string_view: {}",