Changeset 9c1ecf9 in mainline for arch/ia32/src/proc/scheduler.c

Timestamp:

2006-04-13T18:27:09Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

f52e54da

Parents:

0ddeabc

Message:

Move updating I/O Permission bitmap to before_task_runs_arch().

File:

• arch/ia32/src/proc/scheduler.c (modified) (3 diffs)

arch/ia32/src/proc/scheduler.c

@@ -37 +37 @@
 #include <arch/asm.h>
 
-/** Perform ia32 specific tasks needed before the new task is run. */
+/** Perform ia32 specific tasks needed before the new task is run.
+ *
+ * Interrupts are disabled.
+ */
 void before_task_runs_arch(void)
-{
-}
-
-/** Perform ia32 specific tasks needed before the new thread is scheduled.
- *
- * THREAD is locked and interrupts are disabled.
- */
-void before_thread_runs_arch(void)
 {
         size_t iomap_size;
@@ -52 +47 @@
         descriptor_t *gdt_p;
 
-        CPU->arch.tss->esp0 = (__address) &THREAD->kstack[THREAD_STACK_SIZE-SP_DELTA];
-        CPU->arch.tss->ss0 = selector(KDATA_DES);
-
-        /* Set up TLS in GS register */
-        set_tls_desc(THREAD->arch.tls);
-
         /*
          * Switch the I/O Permission Bitmap, if necessary.
-         *
-         * First, copy the I/O Permission Bitmap.
-         * This needs to be changed so that the
-         * copying is avoided if the same task
-         * was already running and the iomap did
-         * not change.
          */
+
+        /* First, copy the I/O Permission Bitmap. */
         spinlock_lock(&TASK->lock);
         iomap_size = TASK->arch.iomap_size;
@@ -81 +66 @@
         gdt_setlimit(&gdt_p[TSS_DES], TSS_BASIC_SIZE + iomap_size - 1);
         gdtr_load(&cpugdtr);
+}
+
+/** Perform ia32 specific tasks needed before the new thread is scheduled.
+ *
+ * THREAD is locked and interrupts are disabled.
+ */
+void before_thread_runs_arch(void)
+{
+        CPU->arch.tss->esp0 = (__address) &THREAD->kstack[THREAD_STACK_SIZE-SP_DELTA];
+        CPU->arch.tss->ss0 = selector(KDATA_DES);
+
+        /* Set up TLS in GS register */
+        set_tls_desc(THREAD->arch.tls);
 
 #ifdef CONFIG_DEBUG_AS_WATCHPOINT