Preliminary support for multithreading in IAR (#57)

Author: RobinKastberg

ARM.CMSIS-Compiler.pdsc

@@ -147,6 +147,12 @@
       <require condition="CORE"/>
       <require Cclass="CMSIS" Cgroup="RTOS2"/>
     </condition>
+    <condition id="IAR CORE CMSIS-RTOS2">
+      <description>IAR and CORE component and CMSIS-RTOS2</description>
+      <require Tcompiler="IAR"/>
+      <require condition="CORE"/>
+      <require Cclass="CMSIS" Cgroup="RTOS2"/>
+    </condition>
   </conditions>
   <taxonomy>
     <description Cclass="CMSIS-Compiler" doc="documentation/html/index.html">Compiler Specific Interfaces</description>
@@ -450,6 +456,18 @@
         <file category="sourceC" name="source/gcc/retarget_lock_rtos2.c"/>
       </files>
     </component>
+    <component Cclass="CMSIS-Compiler" Cgroup="OS Interface" Csub="CMSIS-RTOS2" Capiversion="1.0.0" Cversion="2.0.0" condition="IAR CORE CMSIS-RTOS2">
+      <description>C library OS interface implementation using CMSIS-RTOS2</description>
+      <RTE_Components_h>
+        #define RTE_CMSIS_Compiler_OS_Interface       /* Compiler OS Interface */
+        #define RTE_CMSIS_Compiler_OS_Interface_RTOS2 /* Compiler OS Interface: CMSIS-RTOS2 */
+        /* Features */
+        #define RTE_CMSIS_Compiler_OS_Interface_RTOS2_LOCKS     /* Implements locking routines */
+      </RTE_Components_h>
+      <files>
+        <file category="sourceC" name="source/iar/retarget_os_rtos2.c"/>
+      </files>
+    </component>
   </components>
 
   <examples>

example/build.py

@@ -25,7 +25,7 @@ def image_ext(self):
         ext = {
             CompilerAxis.AC6: 'axf',
             CompilerAxis.GCC: 'elf',
-            CompilerAxis.IAR: 'elf',
+            CompilerAxis.IAR: 'out',
             CompilerAxis.CLANG: 'elf',
         }
         return ext[self]

source/iar/retarget_os_rtos2.c

@@ -0,0 +1,118 @@
+/*
+ * Copyright (C) 2023 ARM Limited or its affiliates. All rights reserved.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed under the Apache License, Version 2.0 (the License); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "cmsis_os2.h"
+#include "cmsis_compiler.h"
+
+/* Check if the kernel has been initialized */
+static uint32_t os_kernel_is_initialized (void) {
+  if (osKernelGetState() > osKernelInactive) {
+    return 1U;
+  } else {
+    return 0U;
+  }
+}
+
+/* Check if the kernel is running */
+static uint32_t os_kernel_is_running (void) {
+  if (osKernelGetState() == osKernelRunning) {
+    return 1U;
+  } else {
+    return 0U;
+  }
+}
+
+/* Check if processor is in Thread or Handler mode */
+static uint32_t is_thread_mode (void) {
+  if (__get_IPSR() == 0U) {
+    return 1U; /* Thread mode  */
+  } else {
+    return 0U; /* Handler mode */
+  }
+}
+
+/* Define retarget mutex structure to hold mutex identifier */
+struct rt_mutex_s {
+  osMutexId_t id;
+};
+
+#pragma language=save
+#pragma language=extended
+/* Initialize mutex */
+__USED void __iar_system_Mtxinit(struct rt_mutex_s *mutex)
+{
+  if (os_kernel_is_initialized()) {
+    mutex->id = osMutexNew(NULL);
+  }
+}
+
+/* Acquire mutex */
+__USED void __iar_system_Mtxlock(struct rt_mutex_s *mutex)
+{
+  if (os_kernel_is_running() && is_thread_mode()) {
+    (void)osMutexAcquire(mutex->id, osWaitForever);
+  }
+}
+
+/* Release mutex */
+__USED void __iar_system_Mtxunlock(struct rt_mutex_s *mutex) // Unlock a system lock
+{
+  if (os_kernel_is_running() && is_thread_mode()) {
+    (void)osMutexRelease(mutex->id);
+  }
+}
+
+/* Free mutex */
+__USED void __iar_system_Mtxdst(struct rt_mutex_s *mutex)    // Destroy a system lock
+{
+  (void)osMutexDelete(mutex->id);
+}
+
+//#endif //defined(_DLIB_THREAD_SUPPORT) && _DLIB_THREAD_SUPPORT > 0
+
+/* Initialize mutex */
+__USED void __iar_file_Mtxinit(struct rt_mutex_s *mutex)
+{
+  if (os_kernel_is_initialized()) {
+    mutex->id = osMutexNew(NULL);
+  }
+}
+
+/* Acquire mutex */
+__USED void __iar_file_Mtxlock(struct rt_mutex_s *mutex)
+{
+  if (os_kernel_is_running() && is_thread_mode()) {
+    (void)osMutexAcquire(mutex->id, osWaitForever);
+  }
+}
+
+/* Release mutex */
+__USED void __iar_file_Mtxunlock(struct rt_mutex_s *mutex) // Unlock a system lock
+{
+  if (os_kernel_is_running() && is_thread_mode()) {
+    (void)osMutexRelease(mutex->id);
+  }
+}
+
+/* Free mutex */
+__USED void __iar_file_Mtxdst(struct rt_mutex_s *mutex)    // Destroy a system lock
+{
+  (void)osMutexDelete(mutex->id);
+}
+
+#pragma language=restore