Changeset ea199e5 in mainline

Timestamp:

2006-05-01T11:55:10Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

cf26ba9

Parents:

4fd61ba

Message:

When seting TSS limit, take the mandatory extra ending byte with all bits set into account.
Align this group of eight bits on byte boundary.

Location:

arch

Files:

• amd64/src/ddi/ddi.c (modified) (2 diffs)
• ia32/src/ddi/ddi.c (modified) (2 diffs)

arch/amd64/src/ddi/ddi.c

@@ -38 +38 @@
 #include <arch/cpu.h>
 #include <arch.h>
+#include <align.h>
 
 /** Enable I/O space range for task.
@@ -142 +143 @@
                  * convenience byte in TSS_IOMAP_SIZE.
                  */
-                bitmap_set_range(&iomap, TASK->arch.iomap.bits, 8);
+                bitmap_set_range(&iomap, ALIGN_UP(TASK->arch.iomap.bits, 8), 8);
         }
         spinlock_unlock(&TASK->lock);
 
-        /* Second, adjust TSS segment limit. */
+        /*
+         * Second, adjust TSS segment limit.
+         * Take the extra ending byte will all bits set into account. 
+         */
         gdtr_store(&cpugdtr);
         gdt_p = (descriptor_t *) cpugdtr.base;
-        gdt_tss_setlimit(&gdt_p[TSS_DES], TSS_BASIC_SIZE + BITS2BYTES(bits) - 1);
+        gdt_tss_setlimit(&gdt_p[TSS_DES], TSS_BASIC_SIZE + BITS2BYTES(bits));
         gdtr_load(&cpugdtr);
         

arch/ia32/src/ddi/ddi.c

@@ -39 +39 @@
 #include <cpu.h>
 #include <arch.h>
+#include <align.h>
 
 /** Enable I/O space range for task.
@@ -142 +143 @@
                  * convenience byte in TSS_IOMAP_SIZE.
                  */
-                bitmap_set_range(&iomap, TASK->arch.iomap.bits, 8);
+                bitmap_set_range(&iomap, ALIGN_UP(TASK->arch.iomap.bits, 8), 8);
         }
         spinlock_unlock(&TASK->lock);
 
-        /* Second, adjust TSS segment limit. */
+        /*
+         * Second, adjust TSS segment limit.
+         * Take the extra ending byte with all bits set into account.
+         */
         gdtr_store(&cpugdtr);
         gdt_p = (descriptor_t *) cpugdtr.base;
-        gdt_setlimit(&gdt_p[TSS_DES], TSS_BASIC_SIZE + BITS2BYTES(bits) - 1);
+        gdt_setlimit(&gdt_p[TSS_DES], TSS_BASIC_SIZE + BITS2BYTES(bits));
         gdtr_load(&cpugdtr);