threads_schedule: thread in a supervisor mode is always able to finis…

…h work PD-313
phoenix-rtos · Nov 22, 2022 · 81bf68d · 81bf68d
1 parent 22a9bb2
commit 81bf68d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/hal/armv7m/arch/cpu.h b/hal/armv7m/arch/cpu.h
@@ -252,7 +252,7 @@ static inline void *hal_cpuGetUserSP(cpu_context_t *ctx)
 
 static inline int hal_cpuSupervisorMode(cpu_context_t *ctx)
 {
-	return 0;
+	return ((ctx->irq_ret & (1 << 2)) == 0) ? 1 : 0;
 }
 
 

diff --git a/proc/threads.c b/proc/threads.c
@@ -581,7 +581,7 @@ int threads_schedule(unsigned int n, cpu_context_t *context, void *arg)
 
 		LIST_REMOVE(&threads_common.ready[i], selected);
 
-		if (!selected->exit)
+		if (!selected->exit || hal_cpuSupervisorMode(selected->context))
 			break;
 
 		selected->state = GHOST;
-Original file line number
+Diff line change
@@ Expand Up / @@ -252,7 +252,7 @@ static inline void *hal_cpuGetUserSP(cpu_context_t *ctx) @@
     static inline int hal_cpuSupervisorMode(cpu_context_t *ctx)
     {
-    	return 0;
+    	return ((ctx->irq_ret & (1 << 2)) == 0) ? 1 : 0;
     }
@@ Expand Down @@