Changeset 2382d09 in mainline for arch/amd64/src/proc/scheduler.c

Timestamp:

2006-04-29T15:01:41Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

407862e

Parents:

69a5600

Message:

Improve SYS_IOSPACE_ENABLE support.
The general protection fault handler now contains
code to service early I/O Permission bitmap faults.

File:

• arch/amd64/src/proc/scheduler.c (modified) (2 diffs)

arch/amd64/src/proc/scheduler.c

@@ -37 +37 @@
 #include <print.h>
 #include <arch/pm.h>
-#include <adt/bitmap.h>
+#include <arch/ddi/ddi.h>
 
 /** Perform amd64 specific tasks needed before the new task is run.
@@ -45 +45 @@
 void before_task_runs_arch(void)
 {
-        count_t bits;
-        ptr_16_64_t cpugdtr;
-        descriptor_t *gdt_p;
-        tss_descriptor_t *tss_desc;
-
-        /*
-         * Switch the I/O Permission Bitmap, if necessary.
-         */
-         
-        /* First, copy the I/O Permission Bitmap. */
-        spinlock_lock(&TASK->lock);
-        if ((bits = TASK->arch.iomap.bits)) {
-                bitmap_t iomap;
-        
-                ASSERT(TASK->arch.iomap.map);
-                bitmap_initialize(&iomap, CPU->arch.tss->iomap, TSS_IOMAP_SIZE * 8);
-                bitmap_copy(&iomap, &TASK->arch.iomap, TASK->arch.iomap.bits);
-                /*
-                 * It is safe to set the trailing eight bits because of the extra
-                 * convenience byte in TSS_IOMAP_SIZE.
-                 */
-                bitmap_set_range(&iomap, TASK->arch.iomap.bits, 8);
-        }
-        spinlock_unlock(&TASK->lock);
-
-        /* Second, adjust TSS segment limit. */
-        gdtr_store(&cpugdtr);
-        gdt_p = (descriptor_t *) cpugdtr.base;
-        gdt_tss_setlimit(&gdt_p[TSS_DES], TSS_BASIC_SIZE + BITS2BYTES(bits) - 1);
-        gdtr_load(&cpugdtr);
-        
-        /*
-         * Before we load new TSS limit, the current TSS descriptor
-         * type must be changed to describe inactive TSS.
-         */
-        tss_desc = (tss_descriptor_t *) &gdt_p[TSS_DES];
-        tss_desc->type = AR_TSS;
-        tr_load(gdtselector(TSS_DES));
+        io_perm_bitmap_install();
 }