Changeset 39cea6a in mainline for arch/ia32/src/pm.c

Timestamp:

2006-04-13T17:38:03Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

e185136

Parents:

897ad60

Message:

Cleanup pm.c and pm.h code on ia32 and amd64.
Add before_task_runs() and before_task_runs_arch() for each architecture.
Add ia32 and amd64 code to ensure I/O Permission Bitmap update.

File:

• arch/ia32/src/pm.c (modified) (12 diffs)

arch/ia32/src/pm.c

@@ -53 +53 @@
  * structure in it's base.
  */
-struct descriptor gdt[GDT_ITEMS] = {
+descriptor_t gdt[GDT_ITEMS] = {
         /* NULL descriptor */
         { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
@@ -69 +69 @@
 };
 
-static struct idescriptor idt[IDT_ITEMS];
-
-static struct tss tss;
-
-struct tss *tss_p = NULL;
+static idescriptor_t idt[IDT_ITEMS];
+
+static tss_t tss;
+
+tss_t *tss_p = NULL;
 
 /* gdtr is changed by kmp before next CPU is initialized */
-struct ptr_16_32 bootstrap_gdtr = { .limit = sizeof(gdt), .base = KA2PA((__address) gdt) };
-struct ptr_16_32 gdtr = { .limit = sizeof(gdt), .base = (__address) gdt };
-
-void gdt_setbase(struct descriptor *d, __address base)
+ptr_16_32_t bootstrap_gdtr = { .limit = sizeof(gdt), .base = KA2PA((__address) gdt) };
+ptr_16_32_t gdtr = { .limit = sizeof(gdt), .base = (__address) gdt };
+
+void gdt_setbase(descriptor_t *d, __address base)
 {
         d->base_0_15 = base & 0xffff;
@@ -86 +86 @@
 }
 
-void gdt_setlimit(struct descriptor *d, __u32 limit)
+void gdt_setlimit(descriptor_t *d, __u32 limit)
 {
         d->limit_0_15 = limit & 0xffff;
@@ -92 +92 @@
 }
 
-void idt_setoffset(struct idescriptor *d, __address offset)
+void idt_setoffset(idescriptor_t *d, __address offset)
 {
         /*
@@ -101 +101 @@
 }
 
-void tss_initialize(struct tss *t)
+void tss_initialize(tss_t *t)
 {
         memsetb((__address) t, sizeof(struct tss), 0);
@@ -111 +111 @@
 void idt_init(void)
 {
-        struct idescriptor *d;
+        idescriptor_t *d;
         int i;
 
@@ -142 +142 @@
 static void clean_IOPL_NT_flags(void)
 {
-        asm
-        (
-                "pushfl;"
-                "pop %%eax;"
-                "and $0xffff8fff,%%eax;"
-                "push %%eax;"
-                "popfl;"
-                :
-                :
-                :"%eax"
+        __asm__ volatile (
+                "pushfl\n"
+                "pop %%eax\n"
+                "and $0xffff8fff, %%eax\n"
+                "push %%eax\n"
+                "popfl\n"
+                : : : "eax"
         );
 }
@@ -158 +155 @@
 static void clean_AM_flag(void)
 {
-        asm
-        (
-                "mov %%cr0,%%eax;"
-                "and $0xFFFBFFFF,%%eax;"
-                "mov %%eax,%%cr0;"
-                :
-                :
-                :"%eax"
+        __asm__ volatile (
+                "mov %%cr0, %%eax\n"
+                "and $0xfffbffff, %%eax\n"
+                "mov %%eax, %%cr0\n"
+                : : : "eax"
         );
 }
@@ -171 +165 @@
 void pm_init(void)
 {
-        struct descriptor *gdt_p = (struct descriptor *) gdtr.base;
-        struct ptr_16_32 idtr;
+        descriptor_t *gdt_p = (descriptor_t *) gdtr.base;
+        ptr_16_32_t idtr;
 
         /*
@@ -196 +190 @@
         }
         else {
-                tss_p = (struct tss *) malloc(sizeof(struct tss),FRAME_ATOMIC);
+                tss_p = (tss_t *) malloc(sizeof(tss_t), FRAME_ATOMIC);
                 if (!tss_p)
                         panic("could not allocate TSS\n");
@@ -208 +202 @@
         
         gdt_setbase(&gdt_p[TSS_DES], (__address) tss_p);
-        gdt_setlimit(&gdt_p[TSS_DES], sizeof(struct tss) - 1);
+        gdt_setlimit(&gdt_p[TSS_DES], sizeof(tss_t) - 1);
 
         /*
@@ -222 +216 @@
 void set_tls_desc(__address tls)
 {
-        struct ptr_16_32 cpugdtr;
-        struct descriptor *gdt_p = (struct descriptor *) cpugdtr.base;
+        ptr_16_32_t cpugdtr;
+        descriptor_t *gdt_p = (descriptor_t *) cpugdtr.base;
 
         gdtr_store(&cpugdtr);