src/scheduler: Fix msp stack overflow from isr_systick.

xBogas · Dec 22, 2023 · a7d8519 · a7d8519
1 parent d0af7b0
commit a7d8519
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/src/scheduler.c b/src/scheduler.c
@@ -137,21 +137,25 @@ static uint32_t systick_counter = 0;
 
 void isr_systick(void)
 {
-	__asm ("push {lr}\n");
-
 	systick_counter++;
 	if (systick_counter > 10) {
 		systick_counter = 0;
 
+		__asm ("push {lr}\n");
+
 		sched_status.run = mythread();
 		sched_status.next = sched.first->th;
 		sched.first = sched.first->next;
 		printk("isr %s -> %s\n", sched_status.run->name, sched_status.next->name);
+
+		__asm ("pop {r1}\n");
+
 		if (sched_status.run->id != sched_status.next->id)
 			context_switch(&sched_status);
+		else
+			__asm ("bx r1\n");
 	}
-
-	__asm ("pop {pc}\n");
+	__asm ("bx lr\n");
 }