uemu: Enable -DNDEBUG for Release build

Author: snnbyyds

CMakeLists.txt

@@ -25,8 +25,8 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 # Compiler flags
 set(CMAKE_C_FLAGS_DEBUG   "-g -O0 -Wall -Werror -Wno-unused-command-line-argument -Wno-implicit-fallthrough -Wno-unused-result")
 set(CMAKE_CXX_FLAGS_DEBUG "-g -O0 -Wall -Werror -Wno-sign-compare -Wno-unused-command-line-argument -Wno-implicit-fallthrough -Wno-unused-result")
-set(CMAKE_C_FLAGS_RELEASE   "-O3 -Wall -Werror -flto -Wno-unused-command-line-argument -Wno-implicit-fallthrough -Wno-unused-result")
-set(CMAKE_CXX_FLAGS_RELEASE "-O3 -Wall -Werror -Wno-sign-compare -flto -Wno-unused-command-line-argument -Wno-implicit-fallthrough -Wno-unused-result")
+set(CMAKE_C_FLAGS_RELEASE   "-O3 -Wall -Werror -flto -Wno-unused-command-line-argument -Wno-implicit-fallthrough -Wno-unused-result -DNDEBUG")
+set(CMAKE_CXX_FLAGS_RELEASE "-O3 -Wall -Werror -Wno-sign-compare -flto -Wno-unused-command-line-argument -Wno-implicit-fallthrough -Wno-unused-result -DNDEBUG")
 
 # Prefer LLVM tools when using Clang (helps with -flto)
 if (CMAKE_C_COMPILER_ID MATCHES "Clang")

src/utils/alarm.cpp

@@ -15,6 +15,7 @@
  */
 
 #include <cassert>
+#include <cstdlib>
 #include <cstring>
 #include <signal.h>
 #include <sys/time.h>
@@ -58,15 +59,22 @@ void alarm_init() {
     };
 
     int ret = sigaction(SIGVTALRM, &s, nullptr);
-    assert(ret == 0);
+    if (ret)
+        goto fail;
 
     struct itimerval it;
     memset(&it, 0, sizeof(it));
     it.it_value.tv_sec = 0;
     it.it_value.tv_usec = 1000000 / TIMER_HZ;
     it.it_interval = it.it_value;
     ret = setitimer(ITIMER_VIRTUAL, &it, NULL);
-    assert(ret == 0);
+    if (ret)
+        goto fail;
 
     log_info("Alarm initialized");
+    return;
+
+fail:
+    log_error("Alarm init failed");
+    exit(EXIT_FAILURE);
 }

tests/bus-tests/simple-uart.c

@@ -19,14 +19,8 @@
 
 #include "simple-uart.h"
 
-uint64_t simple_uart_read(uint64_t addr, size_t n) {
-    uint64_t off = addr - SIMPLE_UART_BASE_ADDR;
-    assert(off == 0);
-    return -1;
-}
+uint64_t simple_uart_read(uint64_t addr, size_t n) { return -1; }
 
 void simple_uart_write(uint64_t addr, uint64_t value, size_t n) {
-    uint64_t off = addr - SIMPLE_UART_BASE_ADDR;
-    assert(off == 0 && n == 4);
     putchar((int)value);
 }