Skip to content

Commit 9245b4a

Browse files
larochelaroche
authored
Cortex M3 MPS2: fix alignment warning from assembler (#1266)
* Cortex M3 MPS2: fix alignment warning from assembler Fix assembler alignment warnings for Cortex M3 MPS2: Warning: section does not have enough alignment to ensure safe PC-relative loads Signed-off-by: Florian La Roche <Florian.LaRoche@gmail.com>
1 parent b0c9468 commit 9245b4a

File tree

5 files changed

+13
-20
lines changed

5 files changed

+13
-20
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ jobs:
9494
if: success() && ( github.ref == 'refs/heads/main' || github.ref == 'refs/heads/release-candidate' )
9595
env:
9696
GIT_SHA:
97-
uses: actions/upload-artifact@v2
97+
uses: actions/upload-artifact@v4
9898
with:
9999
name: doxygen.zip-${{ github.sha }}
100100
path: ./freertos/doxygen.zip
@@ -144,7 +144,7 @@ jobs:
144144
Upload memory size report as artifact (for main and
145145
release-candidate ONLY)
146146
if: success() && ( github.ref == 'refs/heads/main' || github.ref == 'refs/heads/release-candidate' )
147-
uses: actions/upload-artifact@v2
147+
uses: actions/upload-artifact@v4
148148
with:
149149
name: freertos-memory-estimates
150150
path: ./freertos_lts_memory_estimates.json

‎.github/workflows/kernel-unit-tests.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@ jobs:
2828
make -C FreeRTOS/Test/CMock lcovhtml
2929
lcov --config-file FreeRTOS/Test/CMock/lcovrc --summary FreeRTOS/Test/CMock/build/cmock_test.info > FreeRTOS/Test/CMock/build/cmock_test_summary.txt
3030
- name: Archive code coverage data
31-
uses: actions/upload-artifact@v2
31+
uses: actions/upload-artifact@v4
3232
with:
3333
name: coverage-data
3434
path: FreeRTOS/Test/CMock/build/cmock_test*
3535
- name: Archive code coverage html report
36-
uses: actions/upload-artifact@v2
36+
uses: actions/upload-artifact@v4
3737
with:
3838
name: coverage-report
3939
path: FreeRTOS/Test/CMock/build/coverage
@@ -69,12 +69,12 @@ jobs:
6969
make -C FreeRTOS/Test/CMock lcovhtml
7070
lcov --config-file FreeRTOS/Test/CMock/lcovrc --summary FreeRTOS/Test/CMock/build/cmock_test.info > FreeRTOS/Test/CMock/build/cmock_test_summary.txt
7171
- name: Archive code coverage data
72-
uses: actions/upload-artifact@v2
72+
uses: actions/upload-artifact@v4
7373
with:
7474
name: coverage-data
7575
path: FreeRTOS/Test/CMock/build/cmock_test*
7676
- name: Archive code coverage html report
77-
uses: actions/upload-artifact@v2
77+
uses: actions/upload-artifact@v4
7878
with:
7979
name: coverage-report
8080
path: FreeRTOS/Test/CMock/build/coverage

‎FreeRTOS-Plus/Demo/FreeRTOS_Plus_TCP_Echo_Qemu_mps2/startup.c‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,9 +133,8 @@ void Default_Handler2( void )
133133
" mrseq r0, msp \n"
134134
" mrsne r0, psp \n"
135135
" ldr r1, [r0, #24] \n"
136-
" ldr r2, handler2_address_const \n"
136+
" ldr r2, =prvGetRegistersFromStack \n"
137137
" bx r2 \n"
138-
" handler2_address_const: .word prvGetRegistersFromStack \n"
139138
);
140139
}
141140

‎FreeRTOS/Demo/CORTEX_MPS2_QEMU_IAR_GCC/build/gcc/startup_gcc.c‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,9 +142,8 @@ void HardFault_Handler( void )
142142
" mrseq r0, msp \n"
143143
" mrsne r0, psp \n"
144144
" ldr r1, [r0, #24] \n"
145-
" ldr r2, handler2_address_const \n"
145+
" ldr r2, =prvGetRegistersFromStack \n"
146146
" bx r2 \n"
147-
" handler2_address_const: .word prvGetRegistersFromStack \n"
148147
);
149148
}
150149

‎FreeRTOS/Demo/CORTEX_MPU_M3_MPS2_QEMU_GCC/init/startup.c‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -134,9 +134,8 @@ void HardFault_Handler( void )
134134
" mrseq r0, msp \n"
135135
" mrsne r0, psp \n"
136136
" ldr r1, [r0, #24] \n"
137-
" ldr r2, handler2_address_const \n"
137+
" ldr r2, =prvGetRegistersFromStack \n"
138138
" bx r2 \n"
139-
" handler2_address_const: .word prvGetRegistersFromStack \n"
140139
);
141140
}
142141

@@ -149,9 +148,8 @@ void MemMang_Handler( void )
149148
" ite eq \n"
150149
" mrseq r0, msp \n"
151150
" mrsne r0, psp \n"
152-
" ldr r1, handler3_address_const \n"
151+
" ldr r1, =vHandleMemoryFault \n"
153152
" bx r1 \n"
154-
" handler3_address_const: .word vHandleMemoryFault \n"
155153
);
156154
}
157155

@@ -163,9 +161,8 @@ void BusFault_Handler( void )
163161
" ite eq \n"
164162
" mrseq r0, msp \n"
165163
" mrsne r0, psp \n"
166-
" ldr r1, handler4_address_const \n"
164+
" ldr r1, =vHandleMemoryFault \n"
167165
" bx r1 \n"
168-
" handler4_address_const: .word vHandleMemoryFault \n"
169166
);
170167
}
171168

@@ -177,9 +174,8 @@ void UsageFault_Handler( void )
177174
" ite eq \n"
178175
" mrseq r0, msp \n"
179176
" mrsne r0, psp \n"
180-
" ldr r1, handler5_address_const \n"
177+
" ldr r1, =vHandleMemoryFault \n"
181178
" bx r1 \n"
182-
" handler5_address_const: .word vHandleMemoryFault \n"
183179
);
184180
}
185181

@@ -191,9 +187,8 @@ void Debug_Handler( void )
191187
" ite eq \n"
192188
" mrseq r0, msp \n"
193189
" mrsne r0, psp \n"
194-
" ldr r1, handler6_address_const \n"
190+
" ldr r1, =vHandleMemoryFault \n"
195191
" bx r1 \n"
196-
" handler6_address_const: .word vHandleMemoryFault \n"
197192
);
198193
}
199194

0 commit comments

Comments
 (0)