Merge pull request #1410 from NickeZ/nickez/better-debug

DX: minor things

Author: NickeZ

src/CMakeLists.txt

@@ -532,7 +532,9 @@ if(CMAKE_CROSSCOMPILING)
       WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
       COMMENT "\nGenerating binary ${name}.bin"
     )
-    # Fail on warnings for our builds
-    target_compile_options(${name}.elf PRIVATE "-Werror")
+    # Fail on warnings for our release builds
+    if(NOT CMAKE_BUILD_TYPE STREQUAL "DEBUG")
+      target_compile_options(${name}.elf PRIVATE "-Werror")
+    endif()
   endforeach()
 endif()

src/hardfault.c

@@ -14,6 +14,7 @@
 
 #include "hardfault.h"
 #include "util.h"
+#include "utils_assert.h"
 #include <memory/memory.h>
 #include <platform_config.h>
 #include <screen.h>
@@ -43,6 +44,8 @@ void Abort(const char* msg)
     system_close_interfaces();
 #endif
 #endif
+    // Break the program if we are debugging
+    ASSERT(false);
     while (1) {
     }
 }

src/util.c

@@ -42,10 +42,10 @@ void util_uint8_to_hex(const uint8_t* in_bin, const size_t in_len, char* out)
 const char* util_dbg_hex(const uint8_t* bin, const size_t len)
 {
     if (len > UTIL_DBG_HEX_MAX_LEN) {
-        util_log("len too large, %zu > %d", len, UTIL_DBG_HEX_MAX_LEN);
+        util_log("len too large, %u > %d", (unsigned int)len, UTIL_DBG_HEX_MAX_LEN);
     }
     static char buf[UTIL_DBG_HEX_MAX_LEN * 2 + 1] = {0};
-    util_uint8_to_hex(bin, len, buf);
+    util_uint8_to_hex(bin, MIN(len, (unsigned int)UTIL_DBG_HEX_MAX_LEN), buf);
     return buf;
 }
 
@@ -70,7 +70,7 @@ void util_cleanup_64(uint8_t** buf)
 }
 
 // Max message size is MAX_LOG_LENGTH-1, becuase vsnprintf will always print a null character
-#define MAX_LOG_LENGTH 101
+#define MAX_LOG_LENGTH 200
 
 void util_log(const char* fmt, ...)
 {

test/simulator/CMakeLists.txt

@@ -94,6 +94,7 @@ target_include_directories(
   bitbox_objects-simulator
   SYSTEM PUBLIC
   ${CMAKE_SOURCE_DIR}/external
+  ${CMAKE_SOURCE_DIR}/external/asf4-drivers/hal/utils/include
   ${CMAKE_SOURCE_DIR}/external/ctaes
   ${CMAKE_SOURCE_DIR}/external/fatfs/source
   $<TARGET_PROPERTY:wallycore,INTERFACE_INCLUDE_DIRECTORIES>
@@ -113,6 +114,7 @@ target_include_directories(
   bitbox-simulator
   SYSTEM PUBLIC
   ${CMAKE_SOURCE_DIR}/external
+  ${CMAKE_SOURCE_DIR}/external/asf4-drivers/hal/utils/include
   ${CMAKE_SOURCE_DIR}/external/ctaes
   ${CMAKE_SOURCE_DIR}/external/fatfs/source
   $<TARGET_PROPERTY:wallycore,INTERFACE_INCLUDE_DIRECTORIES>
@@ -140,13 +142,13 @@ add_dependencies(bitbox_objects-simulator
 target_link_libraries(bitbox-simulator PRIVATE ${LIBBITBOX02_RUST} "-lm")
 
 target_compile_definitions(bitbox_objects-simulator PUBLIC "PRODUCT_BITBOX_MULTI=1" "APP_BTC=1" "APP_LTC=1" "APP_U2F=1" "APP_ETH=1")
-target_compile_definitions(bitbox_objects-simulator PUBLIC TESTING)
+target_compile_definitions(bitbox_objects-simulator PUBLIC TESTING _UNIT_TEST_)
 
 # Since wallycore is an external projects we need to specify the dependency
 add_dependencies(bitbox_objects-simulator libwally-core)
 
 target_compile_definitions(bitbox-simulator PUBLIC "PRODUCT_BITBOX_MULTI=1" "APP_BTC=1" "APP_LTC=1" "APP_U2F=1" "APP_ETH=1")
-target_compile_definitions(bitbox-simulator PUBLIC TESTING)
+target_compile_definitions(bitbox-simulator PUBLIC TESTING _UNIT_TEST_)
 
 target_link_libraries(bitbox-simulator
   PUBLIC

test/unit-test/CMakeLists.txt

@@ -99,6 +99,7 @@ target_include_directories(
   bitbox_objects
   SYSTEM PUBLIC
   ${CMAKE_SOURCE_DIR}/external
+  ${CMAKE_SOURCE_DIR}/external/asf4-drivers/hal/utils/include
   ${CMAKE_SOURCE_DIR}/external/ctaes
   ${CMAKE_SOURCE_DIR}/external/fatfs/source
   $<TARGET_PROPERTY:wallycore,INTERFACE_INCLUDE_DIRECTORIES>
@@ -118,6 +119,7 @@ target_include_directories(
   bitbox
   SYSTEM PUBLIC
   ${CMAKE_SOURCE_DIR}/external
+  ${CMAKE_SOURCE_DIR}/external/asf4-drivers/hal/utils/include
   ${CMAKE_SOURCE_DIR}/external/ctaes
   ${CMAKE_SOURCE_DIR}/external/fatfs/source
   $<TARGET_PROPERTY:wallycore,INTERFACE_INCLUDE_DIRECTORIES>
@@ -145,13 +147,13 @@ add_dependencies(bitbox_objects
 target_link_libraries(bitbox PRIVATE ${LIBBITBOX02_RUST} "-lm")
 
 target_compile_definitions(bitbox_objects PUBLIC "PRODUCT_BITBOX_MULTI=1" "APP_BTC=1" "APP_LTC=1" "APP_U2F=1" "APP_ETH=1")
-target_compile_definitions(bitbox_objects PUBLIC TESTING)
+target_compile_definitions(bitbox_objects PUBLIC TESTING _UNIT_TEST_)
 
 # Since wallycore is an external projects we need to specify the dependency
 add_dependencies(bitbox_objects libwally-core)
 
 target_compile_definitions(bitbox PUBLIC "PRODUCT_BITBOX_MULTI=1" "APP_BTC=1" "APP_LTC=1" "APP_U2F=1" "APP_ETH=1")
-target_compile_definitions(bitbox PUBLIC TESTING)
+target_compile_definitions(bitbox PUBLIC TESTING _UNIT_TEST_)
 
 target_link_libraries(bitbox
   PUBLIC
@@ -195,7 +197,7 @@ target_include_directories(
   ${INCLUDES}
   ${CMAKE_BINARY_DIR}/src
 )
-target_compile_definitions(u2f-util PUBLIC "TESTING" PRODUCT_BITBOX_MULTI "APP_U2F=1" "APP_BTC=1" "APP_LTC=1" "APP_ETH=1")
+target_compile_definitions(u2f-util PUBLIC "TESTING" _UNIT_TEST_ PRODUCT_BITBOX_MULTI "APP_U2F=1" "APP_BTC=1" "APP_LTC=1" "APP_ETH=1")
 target_compile_definitions(u2f-util PUBLIC "USE_KECCAK")