Fix CMSIS-RTOS2 interface when stack is allocated dynamically (regression from previous change).

dmitrykos · dmitrykos · commit c862a623ec33 · 2026-06-01T13:50:08.000+03:00
diff --git a/build/example/blinky_c-cmsis-rtos2-prio/example.c b/build/example/blinky_c-cmsis-rtos2-prio/example.c
@@ -248,7 +248,6 @@ int main(int argc, char* argv[])
 
   osKernelInitialize();
   osThreadNew(app_main, NULL, NULL);
-
   if (osKernelGetState() == osKernelReady) {
     osKernelStart();
   }
diff --git a/build/example/project/eclipse/stm/blinky-cmsis-rtos2-prio-stm32f407g-disc1/.cproject b/build/example/project/eclipse/stm/blinky-cmsis-rtos2-prio-stm32f407g-disc1/.cproject
@@ -103,6 +103,7 @@
 									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
 									<listOptionValue builtIn="false" value="HSE_VALUE=8000000"/>
 								</option>
+								<option id="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.std.928086894" name="Language standard" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.std" useByScannerDiscovery="true" value="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.std.c11" valueType="enumerated"/>
 								<inputType id="ilg.gnuarmeclipse.managedbuild.cross.tool.c.compiler.input.121388447" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.c.compiler.input"/>
 							</tool>
 							<tool id="ilg.gnuarmeclipse.managedbuild.cross.tool.cpp.compiler.990087452" name="GNU Arm Cross C++ Compiler" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.cpp.compiler">
@@ -133,6 +134,7 @@
 									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
 									<listOptionValue builtIn="false" value="HSE_VALUE=8000000"/>
 								</option>
+								<option id="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.compiler.std.1073497478" name="Language standard" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.compiler.std" useByScannerDiscovery="true" value="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.compiler.std.cpp11" valueType="enumerated"/>
 								<inputType id="ilg.gnuarmeclipse.managedbuild.cross.tool.cpp.compiler.input.1033288883" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.cpp.compiler.input"/>
 							</tool>
 							<tool id="ilg.gnuarmeclipse.managedbuild.cross.tool.c.linker.748818968" name="GNU Arm Cross C Linker" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.c.linker">
@@ -284,6 +286,7 @@
 									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
 									<listOptionValue builtIn="false" value="HSE_VALUE=8000000"/>
 								</option>
+								<option id="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.std.1797662171" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.std" value="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.std.c11" valueType="enumerated"/>
 								<inputType id="ilg.gnuarmeclipse.managedbuild.cross.tool.c.compiler.input.1578028994" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.c.compiler.input"/>
 							</tool>
 							<tool id="ilg.gnuarmeclipse.managedbuild.cross.tool.cpp.compiler.689201451" name="GNU Arm Cross C++ Compiler" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.cpp.compiler">
@@ -311,6 +314,7 @@
 									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
 									<listOptionValue builtIn="false" value="HSE_VALUE=8000000"/>
 								</option>
+								<option id="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.compiler.std.1366966857" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.compiler.std" value="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.compiler.std.cpp11" valueType="enumerated"/>
 								<inputType id="ilg.gnuarmeclipse.managedbuild.cross.tool.cpp.compiler.input.1709785757" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.cpp.compiler.input"/>
 							</tool>
 							<tool id="ilg.gnuarmeclipse.managedbuild.cross.tool.c.linker.1905149858" name="GNU Arm Cross C Linker" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.c.linker">
@@ -464,6 +468,7 @@
 									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
 									<listOptionValue builtIn="false" value="HSE_VALUE=8000000"/>
 								</option>
+								<option id="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.std.319734450" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.std" value="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.std.c11" valueType="enumerated"/>
 								<inputType id="ilg.gnuarmeclipse.managedbuild.cross.tool.c.compiler.input.901229203" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.c.compiler.input"/>
 							</tool>
 							<tool id="ilg.gnuarmeclipse.managedbuild.cross.tool.cpp.compiler.519004615" name="GNU Arm Cross C++ Compiler" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.cpp.compiler">
@@ -491,6 +496,7 @@
 									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
 									<listOptionValue builtIn="false" value="HSE_VALUE=8000000"/>
 								</option>
+								<option id="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.compiler.std.1959063858" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.compiler.std" value="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.compiler.std.cpp11" valueType="enumerated"/>
 								<inputType id="ilg.gnuarmeclipse.managedbuild.cross.tool.cpp.compiler.input.1259684314" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.cpp.compiler.input"/>
 							</tool>
 							<tool id="ilg.gnuarmeclipse.managedbuild.cross.tool.c.linker.2049176525" name="GNU Arm Cross C Linker" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.c.linker">
diff --git a/deps/target/stm32fx/include/cortexm/exception-handlers.h b/deps/target/stm32fx/include/cortexm/exception-handlers.h
@@ -31,7 +31,7 @@
 #include <stdint.h>
 
 #if defined(DEBUG)
-#define __DEBUG_BKPT()  asm volatile ("bkpt 0")
+#define __DEBUG_BKPT()  __asm volatile ("bkpt 0")
 #endif
 
 // ----------------------------------------------------------------------------
diff --git a/interop/cmsis/rtos2/src/cmsis_os2_stk.cpp b/interop/cmsis/rtos2/src/cmsis_os2_stk.cpp
@@ -460,14 +460,14 @@ static T *PlacementNewOrHeap(void *mem, size_t size, const Args &... args)
 
     if ((mem != nullptr) && (size >= sizeof(T)))
     {
-        obj = new (mem) T(args...); 
+        obj = new (mem) T(args...);
         obj->m_cb_owned = false;
     }
     else
     {
         obj = new (std::nothrow) T(args...);
         // m_cb_owned is already true from the constructor default
-        STK_ASSERT(obj != nullptr); 
+        STK_ASSERT(obj != nullptr);
     }
 
     return obj;
@@ -844,24 +844,22 @@ osThreadId_t osThreadNew(osThreadFunc_t func, void *argument, const osThreadAttr
             th->m_name       = (attr != nullptr) ? attr->name : nullptr;
             th->m_join_state = (is_joinable ? StkThread::JoinState::Joinable : StkThread::JoinState::Detached);
 
-            size_t stack_words = CMSIS_STK_DEFAULT_STACK_WORDS;
-
             // stack configuration
             if (attr != nullptr)
             {
-                stack_words = stk::Max<size_t>(attr->stack_size / sizeof(stk::Word), CMSIS_STK_MIN_STACK_WORDS);
-              
                 if ((attr->stack_mem != nullptr) && (attr->stack_size != 0U))
                 {
                     th->m_stack       = static_cast<stk::Word *>(attr->stack_mem);
-                    th->m_stack_size  = stack_words;
+                    th->m_stack_size  = stk::Max<size_t>(attr->stack_size / sizeof(stk::Word), CMSIS_STK_MIN_STACK_WORDS);
                     th->m_stack_owned = false;
                 }
             }
 
             // allocate stack memory if not caller-provided
             if (th->m_stack == nullptr)
             {
+                const size_t stack_words = CMSIS_STK_DEFAULT_STACK_WORDS;
+
                 th->m_stack = new (std::nothrow) stk::Word[stack_words];
                 STK_ASSERT(th->m_stack != nullptr);
                 

Original file line number	Diff line number	Diff line change
`@@ -248,7 +248,6 @@ int main(int argc, char* argv[])`
`248`	`248`
`249`	`249`	`osKernelInitialize();`
`250`	`250`	`osThreadNew(app_main, NULL, NULL);`
`251`		`-`
`252`	`251`	`if (osKernelGetState() == osKernelReady) {`
`253`	`252`	`osKernelStart();`
`254`	`253`	`}`
Original file line number	Diff line number	Diff line change
`@@ -460,14 +460,14 @@ static T PlacementNewOrHeap(void mem, size_t size, const Args &... args)`
`460`	`460`
`461`	`461`	`if ((mem != nullptr) && (size >= sizeof(T)))`
`462`	`462`	`{`
`463`		`- obj = new (mem) T(args...);`
	`463`	`+ obj = new (mem) T(args...);`
`464`	`464`	`obj->m_cb_owned = false;`
`465`	`465`	`}`
`466`	`466`	`else`
`467`	`467`	`{`
`468`	`468`	`obj = new (std::nothrow) T(args...);`
`469`	`469`	`// m_cb_owned is already true from the constructor default`
`470`		`- STK_ASSERT(obj != nullptr);`
	`470`	`+ STK_ASSERT(obj != nullptr);`
`471`	`471`	`}`
`472`	`472`
`473`	`473`	`return obj;`
`@@ -844,24 +844,22 @@ osThreadId_t osThreadNew(osThreadFunc_t func, void *argument, const osThreadAttr`
`844`	`844`	`th->m_name = (attr != nullptr) ? attr->name : nullptr;`
`845`	`845`	`th->m_join_state = (is_joinable ? StkThread::JoinState::Joinable : StkThread::JoinState::Detached);`
`846`	`846`
`847`		`- size_t stack_words = CMSIS_STK_DEFAULT_STACK_WORDS;`
`848`		`-`
`849`	`847`	`// stack configuration`
`850`	`848`	`if (attr != nullptr)`
`851`	`849`	`{`
`852`		`- stack_words = stk::Max<size_t>(attr->stack_size / sizeof(stk::Word), CMSIS_STK_MIN_STACK_WORDS);`
`853`		`-`
`854`	`850`	`if ((attr->stack_mem != nullptr) && (attr->stack_size != 0U))`
`855`	`851`	`{`
`856`	`852`	`th->m_stack = static_cast<stk::Word *>(attr->stack_mem);`
`857`		`- th->m_stack_size = stack_words;`
	`853`	`+ th->m_stack_size = stk::Max<size_t>(attr->stack_size / sizeof(stk::Word), CMSIS_STK_MIN_STACK_WORDS);`
`858`	`854`	`th->m_stack_owned = false;`
`859`	`855`	`}`
`860`	`856`	`}`
`861`	`857`
`862`	`858`	`// allocate stack memory if not caller-provided`
`863`	`859`	`if (th->m_stack == nullptr)`
`864`	`860`	`{`
	`861`	`+ const size_t stack_words = CMSIS_STK_DEFAULT_STACK_WORDS;`
	`862`	`+`
`865`	`863`	`th->m_stack = new (std::nothrow) stk::Word[stack_words];`
`866`	`864`	`STK_ASSERT(th->m_stack != nullptr);`
`867`	`865`