fix thumb bit removal and add test that repl_test_calculate_returns_even

YSaxon · Apr 15, 2024 · d775431 · d775431
1 parent 0352198
commit d775431
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -752,6 +752,19 @@ ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_SHARED_LIBRARY_PREFIX}cliffi_test${CMA
 )
 set_tests_properties(repl_test_address_addition PROPERTIES PASS_REGULAR_EXPRESSION "Function returned: \"?Hallo,_wyrld:")
 
+if(CMAKE_SYSTEM_PROCESSOR MATCHES "arm")
+add_test(NAME repl_test_calculate_returns_even
+COMMAND cliffi --repltest
+calculate_offset testlib_offset ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_SHARED_LIBRARY_PREFIX}cliffi_test${CMAKE_SHARED_LIBRARY_SUFFIX} add 0x10000 \n
+calculate_offset testlib_offset2 ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_SHARED_LIBRARY_PREFIX}cliffi_test${CMAKE_SHARED_LIBRARY_SUFFIX} add 0x10001 \n
+
+testlib_offset \n
+testlib_offset2 \n
+)
+set_tests_properties(repl_test_calculate_returns_even PROPERTIES PASS_REGULAR_EXPRESSION "testlib_offset = [0-9a-fA-FxX]+[02468ace]")
+set_tests_properties(repl_test_calculate_returns_even PROPERTIES PASS_REGULAR_EXPRESSION "testlib_offset2 = [0-9a-fA-FxX]+[02468ace]")
+endif()
+
 
 
 endif()

diff --git a/main.c b/main.c
@@ -46,7 +46,7 @@
 #endif
 
 const char* NAME = "cliffi";
-const char* VERSION = "v1.6.8";
+const char* VERSION = "v1.6.9";
 const char* BASIC_USAGE_STRING = "<library> <return_typeflag> <function_name> [[-typeflag] <arg>.. [ ... <varargs>..] ]\n";
 
 sigjmp_buf jmpBuffer;
@@ -543,7 +543,7 @@ void parseCalculateOffset(char* calculateCommand) {
     void* lib_handle = getOrLoadLibrary(libraryName);
     void* symbol_handle = loadFunctionHandle(lib_handle, symbolName);
     uintptr_t symbol_address = (uintptr_t)symbol_handle;
-    #if defined(__TARGET_FEATURE_THUMB)
+    #if defined(__arm__)
     address = (void*)((uintptr_t) address & ~1);    // clear the thumb bit
     symbol_address &= ~1;                           // clear the thumb bit
     #endif