@@ -95,18 +95,18 @@ struct pbl_kernel_debug_layout {
9595};
9696
9797const struct pbl_kernel_debug_layout pbl_kernel_debug_layout __attribute__((used )) = {
98- .version = 1 ,
99- .thread_sp = offsetof(struct pbl_thread , backend .sp ),
100- .thread_all_next = offsetof(struct pbl_thread , backend .all_next ),
101- .thread_state = offsetof(struct pbl_thread , backend .state ),
102- .thread_id = offsetof(struct pbl_thread , id ),
103- .thread_name = offsetof(struct pbl_thread , name ),
104- .thread_name_len = PBL_THREAD_NAME_LEN ,
105- .ctx_control = offsetof(struct saved_context , control ),
106- .ctx_r4 = offsetof(struct saved_context , r4_r11 ),
107- .ctx_exc_return = offsetof(struct saved_context , exc_return ),
108- .ctx_hw = offsetof(struct saved_context , r0 ),
109- .ctx_fp_extra = NUM_EXTRA_FP_REGS * sizeof (uint32_t ),
98+ .version = 1 ,
99+ .thread_sp = offsetof(struct pbl_thread , backend .sp ),
100+ .thread_all_next = offsetof(struct pbl_thread , backend .all_next ),
101+ .thread_state = offsetof(struct pbl_thread , backend .state ),
102+ .thread_id = offsetof(struct pbl_thread , id ),
103+ .thread_name = offsetof(struct pbl_thread , name ),
104+ .thread_name_len = PBL_THREAD_NAME_LEN ,
105+ .ctx_control = offsetof(struct saved_context , control ),
106+ .ctx_r4 = offsetof(struct saved_context , r4_r11 ),
107+ .ctx_exc_return = offsetof(struct saved_context , exc_return ),
108+ .ctx_hw = offsetof(struct saved_context , r0 ),
109+ .ctx_fp_extra = NUM_EXTRA_FP_REGS * sizeof (uint32_t ),
110110};
111111
112112_Static_assert (offsetof (struct pbl_thread , backend .sp ) == 0 , "saved SP must be first" );
@@ -119,7 +119,9 @@ static inline bool prv_fp_active(uint32_t exc_return) {
119119
120120// ---- threads ----------------------------------------------------------------
121121
122- static void prv_thread_return (void ) { pbl_thread_abort (NULL ); }
122+ static void prv_thread_return (void ) {
123+ pbl_thread_abort (NULL );
124+ }
123125
124126void arch_thread_init (struct pbl_thread * t , void (* entry )(void * ), void * arg ) {
125127 uintptr_t top = ((uintptr_t )t -> stack + t -> stack_size ) & ~7u ;
@@ -164,7 +166,9 @@ void arch_thread_regions_set(struct pbl_thread *t, const MpuRegion *const *regio
164166#endif
165167}
166168
167- void arch_thread_aborted (struct pbl_thread * t ) { (void )t ; }
169+ void arch_thread_aborted (struct pbl_thread * t ) {
170+ (void )t ;
171+ }
168172
169173void arch_thread_exit (void ) {
170174 // The switch requested by the abort takes over as soon as we get here.
@@ -175,15 +179,19 @@ void arch_thread_exit(void) {
175179
176180// ---- interrupts -------------------------------------------------------------
177181
178- bool arch_in_isr (void ) { return mcu_state_is_isr (); }
182+ bool arch_in_isr (void ) {
183+ return mcu_state_is_isr ();
184+ }
179185
180186void arch_irq_disable (void ) {
181187 __set_BASEPRI (PBL_IRQ_PRIO_MAX_SYSCALL );
182188 __DSB ();
183189 __ISB ();
184190}
185191
186- void arch_irq_enable (void ) { __set_BASEPRI (0 ); }
192+ void arch_irq_enable (void ) {
193+ __set_BASEPRI (0 );
194+ }
187195
188196void arch_switch_request (void ) {
189197 SCB -> ICSR = SCB_ICSR_PENDSVSET_Msk ;
@@ -213,7 +221,7 @@ void arch_switch_request(void) {
213221#endif
214222
215223// r1 -> thread's MPU words; clobbers r2, r4-r11.
216- #define RESTORE_MPU \
224+ #define RESTORE_MPU \
217225 " ldr r2, =0xe000ed98 \n" /* MPU_RNR */ \
218226 " mov r4, #" STR(FIRST_MPU_REGION) " \n" \
219227 " str r4, [r2] \n" \
@@ -226,45 +234,38 @@ __attribute__((naked)) void PendSV_Handler(void) {
226234 " mrs r0, psp \n"
227235 " isb \n"
228236 " ldr r3, =pbl_cur \n"
229- " ldr r2, [r3] \n"
230- SAVE_FP
231- SAVE_REGS
232- " str r0, [r2] \n" /* pbl_cur->backend.sp */
237+ " ldr r2, [r3] \n" SAVE_FP SAVE_REGS
238+ " str r0, [r2] \n" /* pbl_cur->backend.sp */
233239 " stmdb sp!, {r3, r14} \n"
234240 " mov r0, %0 \n"
235241 " msr basepri, r0 \n"
236242 " dsb \n"
237243 " isb \n"
238- " bl sched_switch_in \n" /* returns the next thread */
244+ " bl sched_switch_in \n" /* returns the next thread */
239245 " mov r4, r0 \n"
240246 " mov r0, #0 \n"
241247 " msr basepri, r0 \n"
242248 " ldmia sp!, {r3, r14} \n"
243- " ldr r0, [r4] \n" /* next->backend.sp */
244- " add r1, r4, #4 \n" /* next->backend.arch.mpu */
245- RESTORE_MPU
246- RESTORE_REGS
247- RESTORE_FP
249+ " ldr r0, [r4] \n" /* next->backend.sp */
250+ " add r1, r4, #4 \n" /* next->backend.arch.mpu */
251+ RESTORE_MPU RESTORE_REGS RESTORE_FP
248252 " msr psp, r0 \n"
249253 " isb \n"
250254 " bx r14 \n"
251- " .ltorg \n"
252- ::"i" (PBL_IRQ_PRIO_MAX_SYSCALL ));
255+ " .ltorg \n" ::"i" (PBL_IRQ_PRIO_MAX_SYSCALL ));
253256}
254257
255258// Loads the first thread's context. MSP is reset to the top of the ISR stack.
256259__attribute__((naked )) static void prv_restore_first_thread (void ) {
257260 __asm volatile (
258- " ldr r0, =0xE000ED08 \n" /* VTOR: initial MSP is the first vector */
261+ " ldr r0, =0xE000ED08 \n" /* VTOR: initial MSP is the first vector */
259262 " ldr r0, [r0] \n"
260263 " ldr r0, [r0] \n"
261264 " msr msp, r0 \n"
262265 " ldr r3, =pbl_cur \n"
263266 " ldr r4, [r3] \n"
264267 " ldr r0, [r4] \n"
265- " add r1, r4, #4 \n"
266- RESTORE_MPU
267- RESTORE_REGS
268+ " add r1, r4, #4 \n" RESTORE_MPU RESTORE_REGS
268269 " msr psp, r0 \n"
269270 " mov r0, #0 \n"
270271 " msr basepri, r0 \n"
@@ -367,7 +368,8 @@ __attribute__((naked)) void SVC_Handler(void) {
367368
368369// ---- start and tick ---------------------------------------------------------
369370
370- void arch_init (void ) {}
371+ void arch_init (void ) {
372+ }
371373
372374void arch_start (void ) {
373375 // PendSV and SysTick at the lowest priority; SVC follows once started.
@@ -392,7 +394,9 @@ void arch_start(void) {
392394}
393395
394396#ifndef CONFIG_SOC_SF32LB52
395- void SysTick_Handler (void ) { pbl_kernel_tick_isr (); }
397+ void SysTick_Handler (void ) {
398+ pbl_kernel_tick_isr ();
399+ }
396400#endif
397401
398402void arch_idle (pbl_tick_t max_ticks ) {
@@ -408,16 +412,16 @@ void arch_thread_saved_regs(const struct pbl_thread *t, struct pbl_thread_saved_
408412 if (t == pbl_cur && arch_in_isr ()) {
409413 // The running thread's registers are live on its stack, not saved.
410414 const uint32_t * frame = (const uint32_t * )__get_PSP ();
411- * regs = ( struct pbl_thread_saved_regs ){
412- .pc = frame [6 ], .lr = frame [5 ], .control = __get_CONTROL () };
415+ * regs =
416+ ( struct pbl_thread_saved_regs ){ .pc = frame [6 ], .lr = frame [5 ], .control = __get_CONTROL ()};
413417 return ;
414418 }
415419 const struct saved_context * ctx = t -> backend .sp ;
416420 const uint32_t * hw = & ctx -> r0 ;
417421 if (prv_fp_active (ctx -> exc_return )) {
418422 hw += NUM_EXTRA_FP_REGS ;
419423 }
420- * regs = (struct pbl_thread_saved_regs ){ .pc = hw [6 ], .lr = hw [5 ], .control = ctx -> control };
424+ * regs = (struct pbl_thread_saved_regs ){.pc = hw [6 ], .lr = hw [5 ], .control = ctx -> control };
421425}
422426
423427void arch_thread_info_regs (const struct pbl_thread * t , uint32_t regs [PBL_THREAD_REG_COUNT ]) {
0 commit comments