Changeset 23f36a3 in mainline

Timestamp:

2024-01-14T18:24:05Z (4 months ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

master

Children:

6e49dab

Parents:

5663872

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2023-03-04 20:11:55)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2024-01-14 18:24:05)

Message:

Wrap fpu handling code in named functions

File:

• kernel/generic/src/proc/scheduler.c (modified) (4 diffs)

kernel/generic/src/proc/scheduler.c

@@ -67 +67 @@
 
 static void scheduler_separated_stack(void);
+static void fpu_restore(void);
 
 atomic_size_t nrdy;  /**< Number of ready threads in the system. */
@@ -83 +84 @@
         before_thread_runs_arch();
 
-#ifdef CONFIG_FPU_LAZY
-        /*
-         * The only concurrent modification possible for fpu_owner here is
-         * another thread changing it from itself to NULL in its destructor.
-         */
-        thread_t *owner = atomic_load_explicit(&CPU->fpu_owner,
-            memory_order_relaxed);
-
-        if (THREAD == owner)
-                fpu_enable();
-        else
-                fpu_disable();
-#elif defined CONFIG_FPU
-        fpu_enable();
-        if (THREAD->fpu_context_exists)
-                fpu_context_restore(&THREAD->fpu_context);
-        else {
-                fpu_init();
-                THREAD->fpu_context_exists = true;
-        }
-#endif
+        fpu_restore();
 
 #ifdef CONFIG_UDEBUG
@@ -341 +322 @@
 }
 
+/**
+ * Do whatever needs to be done with current FPU state before we switch to
+ * another thread.
+ */
+static void fpu_cleanup(void)
+{
+#if (defined CONFIG_FPU) && (!defined CONFIG_FPU_LAZY)
+        fpu_context_save(&THREAD->fpu_context);
+#endif
+}
+
+/**
+ * Set correct FPU state for this thread after switch from another thread.
+ */
+static void fpu_restore(void)
+{
+#ifdef CONFIG_FPU_LAZY
+        /*
+         * The only concurrent modification possible for fpu_owner here is
+         * another thread changing it from itself to NULL in its destructor.
+         */
+        thread_t *owner = atomic_load_explicit(&CPU->fpu_owner,
+            memory_order_relaxed);
+
+        if (THREAD == owner)
+                fpu_enable();
+        else
+                fpu_disable();
+
+#elif defined CONFIG_FPU
+        fpu_enable();
+        if (THREAD->fpu_context_exists)
+                fpu_context_restore(&THREAD->fpu_context);
+        else {
+                fpu_init();
+                THREAD->fpu_context_exists = true;
+        }
+#endif
+}
+
 void scheduler(void)
 {
@@ -370 +391 @@
                 THREAD->kcycles += get_cycle() - THREAD->last_cycle;
 
-#if (defined CONFIG_FPU) && (!defined CONFIG_FPU_LAZY)
-                fpu_context_save(&THREAD->fpu_context);
-#endif
+                fpu_cleanup();
+
                 if (!context_save(&THREAD->saved_context)) {
                         /*