diff options
| author | Frédéric Desbiens <[email protected]> | 2026-10-02 10:42:44 -0400 |
|---|---|---|
| committer | GitHub <[email protected]> | 2026-10-02 10:42:44 -0400 |
| commit | 93387b0a60382a29579bbad5045c68328e3751df (patch) | |
| tree | 42be790d602cb76f55090e5a7c418df7ea2b3428 /ports_module/cortex_r4 | |
| parent | 44d7c95c582d415c4ad84527180b29c93c3bf664 (diff) | |
| parent | 28281cd5647d4671236ca08d19bd18ed15b2265a (diff) | |
Merge pull request #783 from eclipse-threadx/devv6.5.2.202603_rel
Merged changes ahead of the v6.5.2.202603 release
Diffstat (limited to 'ports_module/cortex_r4')
8 files changed, 13 insertions, 77 deletions
diff --git a/ports_module/cortex_r4/ac6/example_build/sample_threadx/tx_cortex_r4.launch b/ports_module/cortex_r4/ac6/example_build/sample_threadx/tx_cortex_r4.launch index 4d4f7ba9..18ea34a2 100644 --- a/ports_module/cortex_r4/ac6/example_build/sample_threadx/tx_cortex_r4.launch +++ b/ports_module/cortex_r4/ac6/example_build/sample_threadx/tx_cortex_r4.launch @@ -265,43 +265,10 @@ <listEntry value="formatter"/> <listEntry value="Hexadecimal"/> </listAttribute> - <listAttribute key="TREE_NODE_PROPERTIES:debugger.view.VariableTreeView"> - <listEntry value="NODE CACHE VERSION 1"/> - <listEntry value="LOCALS:Locals:VALUE:D:/threadx/modules/txm58/5.8.2/tx58_cortex-r4ac6/tx/txm_module_manager_mm_register_setup.c::_txm_module_manager_mm_register_setup::code_address"/> - <listEntry value="1"/> - <listEntry value="formatter"/> - <listEntry value="Hexadecimal"/> - <listEntry value="LOCALS:Locals:VALUE:D:/threadx/modules/txm58/5.8.2/tx58_cortex-r4ac6/tx/txm_module_manager_mm_register_setup.c::_txm_module_manager_mm_register_setup::data_address"/> - <listEntry value="1"/> - <listEntry value="formatter"/> - <listEntry value="Hexadecimal"/> - <listEntry value="LOCALS:Locals:VALUE:D:/threadx/modules/txm58/5.8.2/tx58_cortex-r4ac6/tx/txm_module_manager_mm_register_setup.c::_txm_module_manager_mm_register_setup::block_size"/> - <listEntry value="1"/> - <listEntry value="formatter"/> - <listEntry value="Hexadecimal"/> - <listEntry value="LOCALS:Locals:VALUE:D:/threadx/modules/txm58/5.8.2/tx58_cortex-r4ac6/tx/txm_module_manager_mm_register_setup.c::_txm_module_manager_mm_register_setup::base_address_register"/> - <listEntry value="1"/> - <listEntry value="formatter"/> - <listEntry value="Hexadecimal"/> - <listEntry value="LOCALS:Locals:VALUE:D:/threadx/modules/txm58/5.8.2/tx58_cortex-r4ac6/tx/txm_module_manager_in_place_load.c::_txm_module_manager_in_place_load::data_start"/> - <listEntry value="1"/> - <listEntry value="formatter"/> - <listEntry value="Hexadecimal"/> - <listEntry value="LOCALS:Locals:VALUE:D:/threadx/modules/txm58/5.8.2/tx58_cortex-r4ac6/tx/txm_module_manager_in_place_load.c::_txm_module_manager_in_place_load::module_name"/> - <listEntry value="1"/> - <listEntry value="formatter"/> - <listEntry value="Hexadecimal"/> - <listEntry value="LOCALS:Locals:VALUE:D:/threadx/modules/txm58/5.8.2/tx58_cortex-r4ac6/tx/txm_module_manager_in_place_load.c::_txm_module_manager_in_place_load::memory_ptr"/> - <listEntry value="2"/> - <listEntry value="formatter"/> - <listEntry value="Hexadecimal"/> - <listEntry value="element formatter"/> - <listEntry value="Character"/> - </listAttribute> <booleanAttribute key="VFS_ENABLED" value="true"/> <stringAttribute key="VFS_LOCAL_DIR" value="${workspace_loc}"/> <stringAttribute key="VFS_REMOTE_MOUNT" value="/writeable"/> - <stringAttribute key="breakpoints" value="<?xml version="1.0" encoding="UTF-8"?> <breakpoints order="ALPHA"> 	<breakpoint ignorecount="0" threadenabled="no" core_list="" continue="no" verboseBreakpoints="yes" kind="SOURCEPOSITION"> 		<master_location index="0" enabled="true" version="2" debugFile="D:/threadx/modules/txm58/5.8.2/tx58_cortex-r4ac6/v51ds5/tx/tx_thread_resume.c" hostFile="D:\threadx\modules\txm58\5.8.2\tx58_cortex-r4ac6\v51ds5\tx\tx_thread_resume.c" line="590"/> 		<location index="0" enabled="true" version="2" debugFile="D:/threadx/modules/txm58/5.8.2/tx58_cortex-r4ac6/v51ds5/tx/tx_thread_resume.c" hostFile="D:\threadx\modules\txm58\5.8.2\tx58_cortex-r4ac6\v51ds5\tx\tx_thread_resume.c" line="590"/> 	</breakpoint> 	<breakpoint ignorecount="0" threadenabled="no" core_list="" continue="no" verboseBreakpoints="yes" kind="SOURCEPOSITION"> 		<master_location index="0" enabled="true" version="2" debugFile="D:/threadx/modules/txm58/5.8.2/tx58_cortex-r4ac6/v51ds5/tx/tx_initialize_low_level.S" hostFile="D:\threadx\modules\txm58\5.8.2\tx58_cortex-r4ac6\v51ds5\tx\tx_initialize_low_level.S" line="176"/> 		<location index="0" enabled="true" version="2" debugFile="D:/threadx/modules/txm58/5.8.2/tx58_cortex-r4ac6/v51ds5/tx/tx_initialize_low_level.S" hostFile="D:\threadx\modules\txm58\5.8.2\tx58_cortex-r4ac6\v51ds5\tx\tx_initialize_low_level.S" line="176"/> 	</breakpoint> 	<breakpoint ignorecount="0" threadenabled="no" core_list="" continue="no" verboseBreakpoints="yes" kind="SOURCEPOSITION"> 		<master_location index="0" enabled="true" version="2" debugFile="D:/threadx/modules/txm58/5.8.2/tx58_cortex-r4ac6/v51ds5/tx/tx_initialize_low_level.S" hostFile="D:\threadx\modules\txm58\5.8.2\tx58_cortex-r4ac6\v51ds5\tx\tx_initialize_low_level.S" line="159"/> 		<location index="0" enabled="true" version="2" debugFile="D:/threadx/modules/txm58/5.8.2/tx58_cortex-r4ac6/v51ds5/tx/tx_initialize_low_level.S" hostFile="D:\threadx\modules\txm58\5.8.2\tx58_cortex-r4ac6\v51ds5\tx\tx_initialize_low_level.S" line="159"/> 	</breakpoint> 	<breakpoint ignorecount="0" threadenabled="no" core_list="" continue="no" verboseBreakpoints="yes" kind="SOURCEPOSITION"> 		<master_location index="0" enabled="true" version="2" debugFile="D:/threadx/modules/txm58/5.8.2/tx58_cortex-r4ac6/v51ds5/tx/tx_thread_context_restore.S" hostFile="D:\threadx\modules\txm58\5.8.2\tx58_cortex-r4ac6\v51ds5\tx\tx_thread_context_restore.S" line="151"/> 		<location index="0" enabled="true" version="2" debugFile="D:/threadx/modules/txm58/5.8.2/tx58_cortex-r4ac6/v51ds5/tx/tx_thread_context_restore.S" hostFile="D:\threadx\modules\txm58\5.8.2\tx58_cortex-r4ac6\v51ds5\tx\tx_thread_context_restore.S" line="151"/> 	</breakpoint> 	<breakpoint ignorecount="0" threadenabled="no" core_list="" continue="no" verboseBreakpoints="yes" kind="SOURCEPOSITION"> 		<master_location index="0" enabled="true" version="2" debugFile="D:/threadx/modules/txm58/5.8.2/tx58_cortex-r4ac6/v51ds5/tx/tx_thread_context_save.S" hostFile="D:\threadx\modules\txm58\5.8.2\tx58_cortex-r4ac6\v51ds5\tx\tx_thread_context_save.S" line="133"/> 		<location index="0" enabled="true" version="2" debugFile="D:/threadx/modules/txm58/5.8.2/tx58_cortex-r4ac6/v51ds5/tx/tx_thread_context_save.S" hostFile="D:\threadx\modules\txm58\5.8.2\tx58_cortex-r4ac6\v51ds5\tx\tx_thread_context_save.S" line="133"/> 	</breakpoint> 	<breakpoint ignorecount="0" threadenabled="no" core_list="" continue="no" verboseBreakpoints="yes" kind="SOURCEPOSITION"> 		<master_location index="0" enabled="true" version="2" debugFile="D:/threadx/modules/txm58/5.8.2/tx58_cortex-r4ac6/v51ds5/tx/tx_initialize_low_level.S" hostFile="D:\threadx\modules\txm58\5.8.2\tx58_cortex-r4ac6\v51ds5\tx\tx_initialize_low_level.S" line="401"/> 		<location index="0" enabled="true" version="2" debugFile="D:/threadx/modules/txm58/5.8.2/tx58_cortex-r4ac6/v51ds5/tx/tx_initialize_low_level.S" hostFile="D:\threadx\modules\txm58\5.8.2\tx58_cortex-r4ac6\v51ds5\tx\tx_initialize_low_level.S" line="401"/> 	</breakpoint> 	<breakpoint ignorecount="0" threadenabled="no" core_list="" continue="no" verboseBreakpoints="yes" kind="SOURCEPOSITION"> 		<master_location index="0" enabled="true" version="2" debugFile="D:/Documents/work/modules_testing/txmcortex-r4_mpu_arm_RC1-frombill_original/tx/tx_initialize_low_level.S" hostFile="D:\Documents\work\modules_testing\txmcortex-r4_mpu_arm_RC1-frombill_original\tx\tx_initialize_low_level.S" line="401"/> 		<location index="0" enabled="true" version="2" debugFile="D:/Documents/work/modules_testing/txmcortex-r4_mpu_arm_RC1-frombill_original/tx/tx_initialize_low_level.S" hostFile="D:\Documents\work\modules_testing\txmcortex-r4_mpu_arm_RC1-frombill_original\tx\tx_initialize_low_level.S" line="401"/> 	</breakpoint> 	<breakpoint ignorecount="0" threadenabled="no" core_list="" continue="no" verboseBreakpoints="yes" kind="SOURCEPOSITION"> 		<master_location index="0" enabled="true" version="2" debugFile="D:/Documents/work/modules_testing/txmcortex-r4_mpu_arm_RC1-frombill_original/sample_threadx_module_manager/sample_threadx_module_manager.c" hostFile="D:\Documents\work\modules_testing\txmcortex-r4_mpu_arm_RC1-frombill_original\sample_threadx_module_manager\sample_threadx_module_manager.c" line="94"/> 		<location index="0" enabled="true" version="2" debugFile="D:/Documents/work/modules_testing/txmcortex-r4_mpu_arm_RC1-frombill_original/sample_threadx_module_manager/sample_threadx_module_manager.c" hostFile="D:\Documents\work\modules_testing\txmcortex-r4_mpu_arm_RC1-frombill_original\sample_threadx_module_manager\sample_threadx_module_manager.c" line="94"/> 	</breakpoint> 	<breakpoint ignorecount="0" threadenabled="no" core_list="" continue="no" verboseBreakpoints="yes" kind="SOURCEPOSITION"> 		<master_location index="0" enabled="true" version="2" debugFile="D:/Documents/work/modules_testing/txmcortex-r4_mpu_arm_RC1-frombill_original/sample_threadx_module/sample_threadx_module.c" hostFile="D:\Documents\work\modules_testing\txmcortex-r4_mpu_arm_RC1-frombill_original\sample_threadx_module\sample_threadx_module.c" line="107"/> 		<location index="0" enabled="true" version="2" debugFile="D:/Documents/work/modules_testing/txmcortex-r4_mpu_arm_RC1-frombill_original/sample_threadx_module/sample_threadx_module.c" hostFile="D:\Documents\work\modules_testing\txmcortex-r4_mpu_arm_RC1-frombill_original\sample_threadx_module\sample_threadx_module.c" line="107"/> 	</breakpoint> 	<breakpoint ignorecount="0" threadenabled="no" core_list="" continue="no" verboseBreakpoints="yes" kind="SOURCEPOSITION"> 		<master_location index="0" enabled="true" version="2" debugFile="D:/Documents/work/modules_testing/txmcortex-r4_mpu_arm_RC1-frombill/tx/tx_initialize_low_level.S" hostFile="D:\Documents\work\modules_testing\txmcortex-r4_mpu_arm_RC1-frombill\tx\tx_initialize_low_level.S" line="401"/> 		<location index="0" enabled="true" version="2" debugFile="D:/Documents/work/modules_testing/txmcortex-r4_mpu_arm_RC1-frombill/tx/tx_initialize_low_level.S" hostFile="D:\Documents\work\modules_testing\txmcortex-r4_mpu_arm_RC1-frombill\tx\tx_initialize_low_level.S" line="401"/> 	</breakpoint> 	<breakpoint ignorecount="0" threadenabled="no" core_list="" continue="no" verboseBreakpoints="yes" kind="SOURCEPOSITION"> 		<master_location index="0" enabled="true" version="2" debugFile="D:/Documents/work/modules_testing/txmcortex-r4_mpu_arm_RC1-frombill/sample_threadx_module/sample_threadx_module.c" hostFile="D:\Documents\work\modules_testing\txmcortex-r4_mpu_arm_RC1-frombill\sample_threadx_module\sample_threadx_module.c" line="274"/> 		<location index="0" enabled="true" version="2" debugFile="D:/Documents/work/modules_testing/txmcortex-r4_mpu_arm_RC1-frombill/sample_threadx_module/sample_threadx_module.c" hostFile="D:\Documents\work\modules_testing\txmcortex-r4_mpu_arm_RC1-frombill\sample_threadx_module\sample_threadx_module.c" line="274"/> 	</breakpoint> 	<breakpoint ignorecount="0" threadenabled="no" core_list="" continue="no" verboseBreakpoints="yes" kind="SOURCEPOSITION"> 		<master_location index="0" enabled="true" version="2" address="0x0001C46C" debugFile="C:/Users/andrejm/work/git/AzureRTOS/threadx_andrejm_test/ports_module/cortex-r4/ac6/example_build/sample_threadx/sample_threadx.c" hostFile="C:\Users\andrejm\work\git\AzureRTOS\threadx_andrejm_test\ports_module\cortex-r4\ac6\example_build\sample_threadx\sample_threadx.c" line="193" function="thread_0_entry"/> 		<location index="0" enabled="true" version="2" address="0x0001C46C" debugFile="C:/Users/andrejm/work/git/AzureRTOS/threadx_andrejm_test/ports_module/cortex-r4/ac6/example_build/sample_threadx/sample_threadx.c" hostFile="C:\Users\andrejm\work\git\AzureRTOS\threadx_andrejm_test\ports_module\cortex-r4\ac6\example_build\sample_threadx\sample_threadx.c" line="193" function="thread_0_entry"/> 	</breakpoint> </breakpoints> "/> + <stringAttribute key="breakpoints" value="<?xml version="1.0" encoding="UTF-8"?> <breakpoints order="ALPHA"> </breakpoints> "/> <listAttribute key="com.arm.debug.views.common.AddressTracker.debugger.view.DisassemblyView.addresses"> <listEntry value="<Next Instruction>"/> <listEntry value=""/> diff --git a/ports_module/cortex_r4/ac6/example_build/sample_threadx_module_manager/txm_cortex_r4.launch b/ports_module/cortex_r4/ac6/example_build/sample_threadx_module_manager/txm_cortex_r4.launch index 9a6bfc71..55c1e26f 100644 --- a/ports_module/cortex_r4/ac6/example_build/sample_threadx_module_manager/txm_cortex_r4.launch +++ b/ports_module/cortex_r4/ac6/example_build/sample_threadx_module_manager/txm_cortex_r4.launch @@ -262,43 +262,10 @@ <listEntry value="formatter"/> <listEntry value="Hexadecimal"/> </listAttribute> -<listAttribute key="TREE_NODE_PROPERTIES:debugger.view.VariableTreeView"> -<listEntry value="NODE CACHE VERSION 1"/> -<listEntry value="LOCALS:Locals:VALUE:D:/threadx/modules/txm58/5.8.2/tx58_cortex-r4ac6/tx/txm_module_manager_mm_register_setup.c::_txm_module_manager_mm_register_setup::code_address"/> -<listEntry value="1"/> -<listEntry value="formatter"/> -<listEntry value="Hexadecimal"/> -<listEntry value="LOCALS:Locals:VALUE:D:/threadx/modules/txm58/5.8.2/tx58_cortex-r4ac6/tx/txm_module_manager_mm_register_setup.c::_txm_module_manager_mm_register_setup::data_address"/> -<listEntry value="1"/> -<listEntry value="formatter"/> -<listEntry value="Hexadecimal"/> -<listEntry value="LOCALS:Locals:VALUE:D:/threadx/modules/txm58/5.8.2/tx58_cortex-r4ac6/tx/txm_module_manager_mm_register_setup.c::_txm_module_manager_mm_register_setup::block_size"/> -<listEntry value="1"/> -<listEntry value="formatter"/> -<listEntry value="Hexadecimal"/> -<listEntry value="LOCALS:Locals:VALUE:D:/threadx/modules/txm58/5.8.2/tx58_cortex-r4ac6/tx/txm_module_manager_mm_register_setup.c::_txm_module_manager_mm_register_setup::base_address_register"/> -<listEntry value="1"/> -<listEntry value="formatter"/> -<listEntry value="Hexadecimal"/> -<listEntry value="LOCALS:Locals:VALUE:D:/threadx/modules/txm58/5.8.2/tx58_cortex-r4ac6/tx/txm_module_manager_in_place_load.c::_txm_module_manager_in_place_load::data_start"/> -<listEntry value="1"/> -<listEntry value="formatter"/> -<listEntry value="Hexadecimal"/> -<listEntry value="LOCALS:Locals:VALUE:D:/threadx/modules/txm58/5.8.2/tx58_cortex-r4ac6/tx/txm_module_manager_in_place_load.c::_txm_module_manager_in_place_load::module_name"/> -<listEntry value="1"/> -<listEntry value="formatter"/> -<listEntry value="Hexadecimal"/> -<listEntry value="LOCALS:Locals:VALUE:D:/threadx/modules/txm58/5.8.2/tx58_cortex-r4ac6/tx/txm_module_manager_in_place_load.c::_txm_module_manager_in_place_load::memory_ptr"/> -<listEntry value="2"/> -<listEntry value="formatter"/> -<listEntry value="Hexadecimal"/> -<listEntry value="element formatter"/> -<listEntry value="Character"/> -</listAttribute> <booleanAttribute key="VFS_ENABLED" value="true"/> <stringAttribute key="VFS_LOCAL_DIR" value="${workspace_loc}"/> <stringAttribute key="VFS_REMOTE_MOUNT" value="/writeable"/> -<stringAttribute key="breakpoints" value="<?xml version="1.0" encoding="UTF-8"?> <breakpoints> 	<breakpoint ignorecount="0" threadenabled="no" core_list="" continue="no" verboseBreakpoints="yes" kind="SOURCEPOSITION"> 		<master_location index="0" enabled="true" version="2" debugFile="D:/threadx/modules/txm58/5.8.2/tx58_cortex-r4ac6/v51ds5/tx/tx_thread_resume.c" hostFile="D:\threadx\modules\txm58\5.8.2\tx58_cortex-r4ac6\v51ds5\tx\tx_thread_resume.c" line="590"/> 		<location index="0" enabled="true" version="2" debugFile="D:/threadx/modules/txm58/5.8.2/tx58_cortex-r4ac6/v51ds5/tx/tx_thread_resume.c" hostFile="D:\threadx\modules\txm58\5.8.2\tx58_cortex-r4ac6\v51ds5\tx\tx_thread_resume.c" line="590"/> 	</breakpoint> 	<breakpoint ignorecount="0" threadenabled="no" core_list="" continue="no" verboseBreakpoints="yes" kind="SOURCEPOSITION"> 		<master_location index="0" enabled="true" version="2" debugFile="D:/threadx/modules/txm58/5.8.2/tx58_cortex-r4ac6/v51ds5/tx/tx_initialize_low_level.S" hostFile="D:\threadx\modules\txm58\5.8.2\tx58_cortex-r4ac6\v51ds5\tx\tx_initialize_low_level.S" line="176"/> 		<location index="0" enabled="true" version="2" debugFile="D:/threadx/modules/txm58/5.8.2/tx58_cortex-r4ac6/v51ds5/tx/tx_initialize_low_level.S" hostFile="D:\threadx\modules\txm58\5.8.2\tx58_cortex-r4ac6\v51ds5\tx\tx_initialize_low_level.S" line="176"/> 	</breakpoint> 	<breakpoint ignorecount="0" threadenabled="no" core_list="" continue="no" verboseBreakpoints="yes" kind="SOURCEPOSITION"> 		<master_location index="0" enabled="true" version="2" debugFile="D:/threadx/modules/txm58/5.8.2/tx58_cortex-r4ac6/v51ds5/tx/tx_initialize_low_level.S" hostFile="D:\threadx\modules\txm58\5.8.2\tx58_cortex-r4ac6\v51ds5\tx\tx_initialize_low_level.S" line="159"/> 		<location index="0" enabled="true" version="2" debugFile="D:/threadx/modules/txm58/5.8.2/tx58_cortex-r4ac6/v51ds5/tx/tx_initialize_low_level.S" hostFile="D:\threadx\modules\txm58\5.8.2\tx58_cortex-r4ac6\v51ds5\tx\tx_initialize_low_level.S" line="159"/> 	</breakpoint> 	<breakpoint ignorecount="0" threadenabled="no" core_list="" continue="no" verboseBreakpoints="yes" kind="SOURCEPOSITION"> 		<master_location index="0" enabled="true" version="2" debugFile="D:/threadx/modules/txm58/5.8.2/tx58_cortex-r4ac6/v51ds5/tx/tx_thread_context_restore.S" hostFile="D:\threadx\modules\txm58\5.8.2\tx58_cortex-r4ac6\v51ds5\tx\tx_thread_context_restore.S" line="151"/> 		<location index="0" enabled="true" version="2" debugFile="D:/threadx/modules/txm58/5.8.2/tx58_cortex-r4ac6/v51ds5/tx/tx_thread_context_restore.S" hostFile="D:\threadx\modules\txm58\5.8.2\tx58_cortex-r4ac6\v51ds5\tx\tx_thread_context_restore.S" line="151"/> 	</breakpoint> 	<breakpoint ignorecount="0" threadenabled="no" core_list="" continue="no" verboseBreakpoints="yes" kind="SOURCEPOSITION"> 		<master_location index="0" enabled="true" version="2" debugFile="D:/threadx/modules/txm58/5.8.2/tx58_cortex-r4ac6/v51ds5/tx/tx_thread_context_save.S" hostFile="D:\threadx\modules\txm58\5.8.2\tx58_cortex-r4ac6\v51ds5\tx\tx_thread_context_save.S" line="133"/> 		<location index="0" enabled="true" version="2" debugFile="D:/threadx/modules/txm58/5.8.2/tx58_cortex-r4ac6/v51ds5/tx/tx_thread_context_save.S" hostFile="D:\threadx\modules\txm58\5.8.2\tx58_cortex-r4ac6\v51ds5\tx\tx_thread_context_save.S" line="133"/> 	</breakpoint> 	<breakpoint ignorecount="0" threadenabled="no" core_list="" continue="no" verboseBreakpoints="yes" kind="SOURCEPOSITION"> 		<master_location index="0" enabled="true" version="2" debugFile="D:/threadx/modules/txm58/5.8.2/tx58_cortex-r4ac6/v51ds5/tx/tx_initialize_low_level.S" hostFile="D:\threadx\modules\txm58\5.8.2\tx58_cortex-r4ac6\v51ds5\tx\tx_initialize_low_level.S" line="401"/> 		<location index="0" enabled="true" version="2" debugFile="D:/threadx/modules/txm58/5.8.2/tx58_cortex-r4ac6/v51ds5/tx/tx_initialize_low_level.S" hostFile="D:\threadx\modules\txm58\5.8.2\tx58_cortex-r4ac6\v51ds5\tx\tx_initialize_low_level.S" line="401"/> 	</breakpoint> 	<breakpoint ignorecount="0" threadenabled="no" core_list="" continue="no" verboseBreakpoints="yes" kind="SOURCEPOSITION"> 		<master_location index="0" enabled="true" version="2" debugFile="D:/Documents/work/modules_testing/txmcortex-r4_mpu_arm_RC1-frombill_original/tx/tx_initialize_low_level.S" hostFile="D:\Documents\work\modules_testing\txmcortex-r4_mpu_arm_RC1-frombill_original\tx\tx_initialize_low_level.S" line="401"/> 		<location index="0" enabled="true" version="2" debugFile="D:/Documents/work/modules_testing/txmcortex-r4_mpu_arm_RC1-frombill_original/tx/tx_initialize_low_level.S" hostFile="D:\Documents\work\modules_testing\txmcortex-r4_mpu_arm_RC1-frombill_original\tx\tx_initialize_low_level.S" line="401"/> 	</breakpoint> 	<breakpoint ignorecount="0" threadenabled="no" core_list="" continue="no" verboseBreakpoints="yes" kind="SOURCEPOSITION"> 		<master_location index="0" enabled="true" version="2" debugFile="D:/Documents/work/modules_testing/txmcortex-r4_mpu_arm_RC1-frombill_original/sample_threadx_module_manager/sample_threadx_module_manager.c" hostFile="D:\Documents\work\modules_testing\txmcortex-r4_mpu_arm_RC1-frombill_original\sample_threadx_module_manager\sample_threadx_module_manager.c" line="94"/> 		<location index="0" enabled="true" version="2" debugFile="D:/Documents/work/modules_testing/txmcortex-r4_mpu_arm_RC1-frombill_original/sample_threadx_module_manager/sample_threadx_module_manager.c" hostFile="D:\Documents\work\modules_testing\txmcortex-r4_mpu_arm_RC1-frombill_original\sample_threadx_module_manager\sample_threadx_module_manager.c" line="94"/> 	</breakpoint> 	<breakpoint ignorecount="0" threadenabled="no" core_list="" continue="no" verboseBreakpoints="yes" kind="SOURCEPOSITION"> 		<master_location index="0" enabled="true" version="2" debugFile="D:/Documents/work/modules_testing/txmcortex-r4_mpu_arm_RC1-frombill_original/sample_threadx_module/sample_threadx_module.c" hostFile="D:\Documents\work\modules_testing\txmcortex-r4_mpu_arm_RC1-frombill_original\sample_threadx_module\sample_threadx_module.c" line="107"/> 		<location index="0" enabled="true" version="2" debugFile="D:/Documents/work/modules_testing/txmcortex-r4_mpu_arm_RC1-frombill_original/sample_threadx_module/sample_threadx_module.c" hostFile="D:\Documents\work\modules_testing\txmcortex-r4_mpu_arm_RC1-frombill_original\sample_threadx_module\sample_threadx_module.c" line="107"/> 	</breakpoint> 	<breakpoint ignorecount="0" threadenabled="no" core_list="" continue="no" verboseBreakpoints="yes" kind="SOURCEPOSITION"> 		<master_location index="0" enabled="true" version="2" debugFile="D:/Documents/work/modules_testing/txmcortex-r4_mpu_arm_RC1-frombill/tx/tx_initialize_low_level.S" hostFile="D:\Documents\work\modules_testing\txmcortex-r4_mpu_arm_RC1-frombill\tx\tx_initialize_low_level.S" line="401"/> 		<location index="0" enabled="true" version="2" debugFile="D:/Documents/work/modules_testing/txmcortex-r4_mpu_arm_RC1-frombill/tx/tx_initialize_low_level.S" hostFile="D:\Documents\work\modules_testing\txmcortex-r4_mpu_arm_RC1-frombill\tx\tx_initialize_low_level.S" line="401"/> 	</breakpoint> 	<breakpoint ignorecount="0" threadenabled="no" core_list="" continue="no" verboseBreakpoints="yes" kind="SOURCEPOSITION"> 		<master_location index="0" enabled="true" version="2" debugFile="D:/Documents/work/modules_testing/txmcortex-r4_mpu_arm_RC1-frombill/sample_threadx_module/sample_threadx_module.c" hostFile="D:\Documents\work\modules_testing\txmcortex-r4_mpu_arm_RC1-frombill\sample_threadx_module\sample_threadx_module.c" line="274"/> 		<location index="0" enabled="true" version="2" debugFile="D:/Documents/work/modules_testing/txmcortex-r4_mpu_arm_RC1-frombill/sample_threadx_module/sample_threadx_module.c" hostFile="D:\Documents\work\modules_testing\txmcortex-r4_mpu_arm_RC1-frombill\sample_threadx_module\sample_threadx_module.c" line="274"/> 	</breakpoint> </breakpoints> "/> +<stringAttribute key="breakpoints" value="<?xml version="1.0" encoding="UTF-8"?> <breakpoints> </breakpoints> "/> <listAttribute key="com.arm.debug.views.common.AddressTracker.debugger.view.DisassemblyView.addresses"> <listEntry value="<Next Instruction>"/> <listEntry value=""/> diff --git a/ports_module/cortex_r4/ac6/inc/tx_port.h b/ports_module/cortex_r4/ac6/inc/tx_port.h index 10f3f624..20368188 100644 --- a/ports_module/cortex_r4/ac6/inc/tx_port.h +++ b/ports_module/cortex_r4/ac6/inc/tx_port.h @@ -337,7 +337,7 @@ void tx_thread_vfp_disable(void); #ifdef TX_THREAD_INIT CHAR _tx_version_id[] = - "(c) 2024 Microsoft Corp. (c) 2026-present Eclipse ThreadX contributors. * ThreadX Cortex-R4/AC6 Version 6.5.1.202602a *"; + "(c) 2024 Microsoft Corp. (c) 2026-present Eclipse ThreadX contributors. * ThreadX Cortex-R4/AC6 Version 6.5.2.202603 *"; #else extern CHAR _tx_version_id[]; #endif diff --git a/ports_module/cortex_r4/ac6/module_manager/src/tx_thread_stack_build.S b/ports_module/cortex_r4/ac6/module_manager/src/tx_thread_stack_build.S index 8f122083..2e9049c0 100644 --- a/ports_module/cortex_r4/ac6/module_manager/src/tx_thread_stack_build.S +++ b/ports_module/cortex_r4/ac6/module_manager/src/tx_thread_stack_build.S @@ -8,6 +8,7 @@ * * SPDX-License-Identifier: MIT **************************************************************************/ +// Portions of this file were generated with AI assistance. /**************************************************************************/ @@ -143,7 +144,7 @@ _tx_thread_stack_build: BIC r3, r3, #CPSR_MASK // Mask mode bits of CPSR ORR r3, r3, #SYS_MODE // Build CPSR, SYS mode, interrupts enabled - TST r1, 1 // Test if Thumb bit is set in entry function address + TST r1, #1 // Test if Thumb bit is set in entry function address ITE NE ORRNE r3, r3, #THUMB_BIT // Yes, set the Thumb bit BICEQ r3, r3, #THUMB_BIT // No, clear the Thumb bit diff --git a/ports_module/cortex_r4/iar/example_build/tx.ewp b/ports_module/cortex_r4/iar/example_build/tx.ewp index 501e6435..a56a49ca 100644 --- a/ports_module/cortex_r4/iar/example_build/tx.ewp +++ b/ports_module/cortex_r4/iar/example_build/tx.ewp @@ -1049,7 +1049,7 @@ </option> <option> <name>IarchiveOutput</name> - <state>D:\threadx\modules\txm59\testbuilds\cr4\tx59iar\Debug\Exe\tx.a</state> + <state>###Unitialized###</state> </option> </data> </settings> diff --git a/ports_module/cortex_r4/iar/example_build/txm.ewp b/ports_module/cortex_r4/iar/example_build/txm.ewp index af145c0c..b7115c5b 100644 --- a/ports_module/cortex_r4/iar/example_build/txm.ewp +++ b/ports_module/cortex_r4/iar/example_build/txm.ewp @@ -1048,7 +1048,7 @@ </option> <option> <name>IarchiveOutput</name> - <state>C:\Users\nisohack\Documents\work\x-ware_libs\threadx\ports_module\cortex-r4\iar\example_build\Debug\Exe\txm.a</state> + <state>###Unitialized###</state> </option> </data> </settings> diff --git a/ports_module/cortex_r4/iar/inc/tx_port.h b/ports_module/cortex_r4/iar/inc/tx_port.h index 50968552..26db35d4 100644 --- a/ports_module/cortex_r4/iar/inc/tx_port.h +++ b/ports_module/cortex_r4/iar/inc/tx_port.h @@ -386,7 +386,7 @@ void tx_thread_vfp_disable(void); #ifdef TX_THREAD_INIT CHAR _tx_version_id[] = - "(c) 2024 Microsoft Corp. (c) 2026-present Eclipse ThreadX contributors. * ThreadX Cortex-R4/IAR Version 6.5.1.202602a *"; + "(c) 2024 Microsoft Corp. (c) 2026-present Eclipse ThreadX contributors. * ThreadX Cortex-R4/IAR Version 6.5.2.202603 *"; #else #ifdef TX_MISRA_ENABLE extern CHAR _tx_version_id[100]; diff --git a/ports_module/cortex_r4/iar/module_manager/src/tx_iar.c b/ports_module/cortex_r4/iar/module_manager/src/tx_iar.c index 238b485e..ab6c209c 100644 --- a/ports_module/cortex_r4/iar/module_manager/src/tx_iar.c +++ b/ports_module/cortex_r4/iar/module_manager/src/tx_iar.c @@ -9,6 +9,7 @@ * SPDX-License-Identifier: MIT **************************************************************************/ +// Portions of this file were generated with AI assistance. /**************************************************************************/ /**************************************************************************/ @@ -270,7 +271,7 @@ TX_MUTEX *mutex_ptr; mutex_ptr = &__tx_iar_file_lock_mutexes[__tx_iar_file_lock_next_free_mutex++]; /* Check for wrap-around on the next free mutex. */ - if (__tx_iar_file_lock_next_free_mutex >= _MAX_LOCK) + if (__tx_iar_file_lock_next_free_mutex >= _MAX_FLOCK) { /* Yes, set the free index back to 0. */ @@ -287,7 +288,7 @@ TX_MUTEX *mutex_ptr; } /* Determine if a free mutex was found. */ - if (i >= _MAX_LOCK) + if (i >= _MAX_FLOCK) { /* Error! No more free mutexes! */ @@ -678,7 +679,7 @@ TX_MUTEX *mutex_ptr; mutex_ptr = &__tx_iar_file_lock_mutexes[__tx_iar_file_lock_next_free_mutex++]; /* Check for wrap-around on the next free mutex. */ - if (__tx_iar_file_lock_next_free_mutex >= _MAX_LOCK) + if (__tx_iar_file_lock_next_free_mutex >= _MAX_FLOCK) { /* Yes, set the free index back to 0. */ @@ -695,7 +696,7 @@ TX_MUTEX *mutex_ptr; } /* Determine if a free mutex was found. */ - if (i >= _MAX_LOCK) + if (i >= _MAX_FLOCK) { /* Error! No more free mutexes! */ |