fixed arm cross-compilation

Author: luyaohan1001

example/multi_thread/main.cpp

@@ -7,7 +7,7 @@
  * @copyright Copyright (c) 2024
  */
 
-// #include "baremetal_api.h"
+#include "baremetal_api.h"
 #include "preempt_fifo_scheduler.hpp"
 #include "rr_scheduler.hpp"
 #include "mutex.hpp"
@@ -30,8 +30,8 @@ void(thread0_routine)() {
   while (1) {
     {
       {
-      // atomic_section a;
-      // itm_trace("thread 0\n");
+      atomic_section a;
+      itm_trace("thread 0\n");
       }
     }
   }
@@ -44,8 +44,8 @@ void(thread1_routine)() {
   while (1) {
     {
       {
-      // atomic_section a;
-      // itm_trace("thread 1\n");
+      atomic_section a;
+      itm_trace("thread 1\n");
       }
     }
   }
@@ -57,8 +57,8 @@ void(thread1_routine)() {
 void(thread2_routine)() {
   while (1) {
     {
-      // atomic_section a;
-      // itm_trace("thread 2\n");
+      atomic_section a;
+      itm_trace("thread 2\n");
     }
   }
 }

kernel/CMakeLists.txt

@@ -45,20 +45,16 @@ add_library(${LIBRARY_NAME} STATIC
   ${CMAKE_CURRENT_LIST_DIR}/src/preempt_fifo_scheduler.cpp
   ${CMAKE_CURRENT_LIST_DIR}/src/thread.cpp
   ${CMAKE_CURRENT_LIST_DIR}/src/bitops.cpp
-  # ${CMAKE_CURRENT_LIST_DIR}/src/atomic_section.cpp
+  ${CMAKE_CURRENT_LIST_DIR}/src/atomic_section.cpp
   ${CMAKE_CURRENT_LIST_DIR}/src/mempool.cpp
   ${CMAKE_CURRENT_LIST_DIR}/src/linkedlist.cpp
-  # ${CMAKE_CURRENT_LIST_DIR}/src/mutex.cpp
-)
-
-target_include_directories(${LIBRARY_NAME} PRIVATE
-    ${CMAKE_CURRENT_LIST_DIR}/include/
+  ${CMAKE_CURRENT_LIST_DIR}/src/mutex.cpp
 )
 
 if (ARCH_DEFINED STREQUAL "ARMV7M")
   target_compile_definitions(${LIBRARY_NAME} PRIVATE ARMV7M)
 
-  target_include_directories(${LIBRARY_NAME} PRIVATE 
+  target_include_directories(${LIBRARY_NAME} PRIVATE
     ${CMAKE_CURRENT_LIST_DIR}/arch/armv7m/
     ${CMAKE_CURRENT_LIST_DIR}/include/
     )

kernel/arch/armv7m/CMakeLists.txt

@@ -21,3 +21,5 @@ target_include_directories(LibBareMetal PRIVATE
     ${CMAKE_CURRENT_LIST_DIR}   # ${CMAKE_CURRENT_LIST_DIR} maps to current folder: arch/armv7m
     ${CMAKE_CURRENT_LIST_DIR}/../../include
 )
+
+target_compile_definitions(LibBareMetal PRIVATE ARMV7M)

kernel/arch/armv7m/gcc-arm-none-eabi.cmake

@@ -49,7 +49,7 @@ set(CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY)
 
 # MCU specific flags.
 set(TARGET_FLAGS "-mcpu=cortex-m7 -mfpu=fpv5-d16 -mfloat-abi=hard")
-# set(LINKER_SCRIPT_PATH ${CMAKE_SOURCE_DIR}/arch/armv7m)
+set(LINKER_SCRIPT_PATH ${CMAKE_CURRENT_LIST_DIR}/../../arch/armv7m)
 
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${TARGET_FLAGS}")
 
@@ -71,7 +71,7 @@ set(CMAKE_ASM_FLAGS "${CMAKE_C_FLAGS} -x assembler-with-cpp -MMD -MP")
 set(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} -fno-rtti -fno-exceptions -fno-threadsafe-statics")
 
 set(CMAKE_C_LINK_FLAGS "${TARGET_FLAGS}")
-# set(CMAKE_C_LINK_FLAGS "${CMAKE_C_LINK_FLAGS} -T \"${LINKER_SCRIPT_PATH}/STM32F767ZITx_FLASH.ld\"")
+set(CMAKE_C_LINK_FLAGS "${CMAKE_C_LINK_FLAGS} -T \"${LINKER_SCRIPT_PATH}/STM32F767ZITx_FLASH.ld\"")
 set(CMAKE_C_LINK_FLAGS "${CMAKE_C_LINK_FLAGS} --specs=nano.specs")
 set(CMAKE_C_LINK_FLAGS "${CMAKE_C_LINK_FLAGS} -Wl,-Map=${CMAKE_PROJECT_NAME}.map -Wl,--gc-sections")
 set(CMAKE_C_LINK_FLAGS "${CMAKE_C_LINK_FLAGS} -Wl,--start-group -lc -lm -Wl,--end-group")

kernel/include/mempool.hpp

@@ -33,6 +33,8 @@ extern "C" {
   extern size_t _ld_start_heap[];
   extern size_t _ld_end_heap[];
 }
+#else
+static_assert(0, "invalid architecture");
 #endif
 
 class mempool {

kernel/include/preempt_fifo_scheduler.hpp

@@ -19,7 +19,7 @@ namespace YesRTOS {
 
 class PreemptFIFOScheduler final {
   public:
-  volatile static void schedule_next();
+  static void schedule_next();
   static void start();
   static void init();
 

kernel/src/preempt_fifo_scheduler.cpp

@@ -85,7 +85,7 @@ void PreemptFIFOScheduler::start() {
  * @brief Return the next thread to run.
  */
 __attribute__((optimize("O0")))
-volatile void PreemptFIFOScheduler::schedule_next() {
+void PreemptFIFOScheduler::schedule_next() {
   list_node_t<Thread>* p_curr_thread_node = running_threads[curr_prio];
   list_node_t<Thread>* p_next_thread_node = ready_list[curr_prio]->get_next_node_circular(p_curr_thread_node);