espressif/FreeRTOS
1
0
Fork 0
mirror of https://github.com/FreeRTOS/FreeRTOS.git synced 2025-07-04 16:13:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Cortex M3 MPS2: modernize assembler syntax and also add .ltorg (#1268)

Browse Source 
Cortex M3 MPS2: modernize assembler syntax and also add .ltorg

Signed-off-by: Florian La Roche <Florian.LaRoche@gmail.com>
This commit is contained in:
Florian La Roche
2024-09-25 12:39:47 +02:00
committed by GitHub
parent 2067506cc1
commit d80937d050
3 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
FreeRTOS-Plus/Demo/FreeRTOS_Plus_TCP_Echo_Qemu_mps2/startup.c
View File

@ -112,14 +112,13 @@ void Default_Handler( void )
__asm volatile __asm volatile
( (
"Default_Handler:\n" "Default_Handler:\n"
" ldr r3, NVIC_INT_CTRL_CONST \n" " ldr r3, =0xe000ed04\n"
" ldr r2, [r3, #0]\n" " ldr r2, [r3, #0]\n"
" uxtb r2, r2\n" " uxtb r2, r2\n"
"Infinite_Loop:\n" "Infinite_Loop:\n"
" b Infinite_Loop\n" " b Infinite_Loop\n"
".size Default_Handler, .-Default_Handler\n" ".size Default_Handler, .-Default_Handler\n"
".align 4\n" ".ltorg\n"
"NVIC_INT_CTRL_CONST: .word 0xe000ed04\n"
); );
} }
@ -135,6 +134,7 @@ void Default_Handler2( void )
" ldr r1, [r0, #24] \n" " ldr r1, [r0, #24] \n"
" ldr r2, =prvGetRegistersFromStack \n" " ldr r2, =prvGetRegistersFromStack \n"
" bx r2 \n" " bx r2 \n"
" .ltorg \n"
); );
} }
@ -219,6 +219,7 @@ __attribute__( ( naked ) ) void exit( int status )
"movs r0, #0x18\n" /* SYS_EXIT */ "movs r0, #0x18\n" /* SYS_EXIT */
"bkpt 0xab\n" "bkpt 0xab\n"
"end: b end\n" "end: b end\n"
".ltorg"
); );
( void ) status; ( void ) status;

6
FreeRTOS/Demo/CORTEX_MPS2_QEMU_IAR_GCC/build/gcc/startup_gcc.c
View File

@ -122,13 +122,12 @@ void Default_Handler( void )
__asm volatile __asm volatile
( (
".align 8 \n" ".align 8 \n"
" ldr r3, NVIC_INT_CTRL_CONST \n" /* Load the address of the interrupt control register into r3. */ " ldr r3, =0xe000ed04 \n" /* Load the address of the interrupt control register into r3. */
" ldr r2, [r3, #0] \n" /* Load the value of the interrupt control register into r2. */ " ldr r2, [r3, #0] \n" /* Load the value of the interrupt control register into r2. */
" uxtb r2, r2 \n" /* The interrupt number is in the least significant byte - clear all other bits. */ " uxtb r2, r2 \n" /* The interrupt number is in the least significant byte - clear all other bits. */
"Infinite_Loop: \n" /* Sit in an infinite loop - the number of the executing interrupt is held in r2. */ "Infinite_Loop: \n" /* Sit in an infinite loop - the number of the executing interrupt is held in r2. */
" b Infinite_Loop \n" " b Infinite_Loop \n"
".align 4 \n" " .ltorg \n"
"NVIC_INT_CTRL_CONST: .word 0xe000ed04 \n"
); );
} }
@ -144,6 +143,7 @@ void HardFault_Handler( void )
" ldr r1, [r0, #24] \n" " ldr r1, [r0, #24] \n"
" ldr r2, =prvGetRegistersFromStack \n" " ldr r2, =prvGetRegistersFromStack \n"
" bx r2 \n" " bx r2 \n"
" .ltorg \n"
); );
} }

11
FreeRTOS/Demo/CORTEX_MPU_M3_MPS2_QEMU_GCC/init/startup.c
View File

@ -113,14 +113,13 @@ void Default_Handler( void )
__asm volatile __asm volatile
( (
"Default_Handler:\n" "Default_Handler:\n"
" ldr r3, NVIC_INT_CTRL_CONST \n" " ldr r3, =0xe000ed04\n"
" ldr r2, [r3, #0]\n" " ldr r2, [r3, #0]\n"
" uxtb r2, r2\n" " uxtb r2, r2\n"
"Infinite_Loop:\n" "Infinite_Loop:\n"
" b Infinite_Loop\n" " b Infinite_Loop\n"
".size Default_Handler, .-Default_Handler\n" ".size Default_Handler, .-Default_Handler\n"
".align 4\n" ".ltorg\n"
"NVIC_INT_CTRL_CONST: .word 0xe000ed04\n"
); );
} }
@ -136,6 +135,7 @@ void HardFault_Handler( void )
" ldr r1, [r0, #24] \n" " ldr r1, [r0, #24] \n"
" ldr r2, =prvGetRegistersFromStack \n" " ldr r2, =prvGetRegistersFromStack \n"
" bx r2 \n" " bx r2 \n"
" .ltorg \n"
); );
} }
@ -150,6 +150,7 @@ void MemMang_Handler( void )
" mrsne r0, psp \n" " mrsne r0, psp \n"
" ldr r1, =vHandleMemoryFault \n" " ldr r1, =vHandleMemoryFault \n"
" bx r1 \n" " bx r1 \n"
" .ltorg \n"
); );
} }
@ -163,6 +164,7 @@ void BusFault_Handler( void )
" mrsne r0, psp \n" " mrsne r0, psp \n"
" ldr r1, =vHandleMemoryFault \n" " ldr r1, =vHandleMemoryFault \n"
" bx r1 \n" " bx r1 \n"
" .ltorg \n"
); );
} }
@ -176,6 +178,7 @@ void UsageFault_Handler( void )
" mrsne r0, psp \n" " mrsne r0, psp \n"
" ldr r1, =vHandleMemoryFault \n" " ldr r1, =vHandleMemoryFault \n"
" bx r1 \n" " bx r1 \n"
" .ltorg \n"
); );
} }
@ -189,6 +192,7 @@ void Debug_Handler( void )
" mrsne r0, psp \n" " mrsne r0, psp \n"
" ldr r1, =vHandleMemoryFault \n" " ldr r1, =vHandleMemoryFault \n"
" bx r1 \n" " bx r1 \n"
" .ltorg \n"
); );
} }
@ -246,6 +250,7 @@ void exit( int status )
"movs r0, #0x18\n" /* SYS_EXIT */ "movs r0, #0x18\n" /* SYS_EXIT */
"bkpt 0xab\n" "bkpt 0xab\n"
"end: b end\n" "end: b end\n"
".ltorg\n"
); );
( void ) status; ( void ) status;