Changeset 4533601 in mainline

Timestamp:

2005-09-03T17:24:17Z (19 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

5e2455a

Parents:

b6d20a7

Message:

yet another GDT/IDT fix/cleanup

Location:

arch/ia32/src

Files:

• boot/boot.S (modified) (1 diff)
• pm.c (modified) (2 diffs)

arch/ia32/src/boot/boot.S

@@ -108 +108 @@
         movw %ax, %ss
         
+        jmpl $KTEXT, $multiboot_meeting_point
+        multiboot_meeting_point:
+        
         call map_kernel                                                 # map kernel and turn paging on
         

arch/ia32/src/pm.c

@@ -73 +73 @@
 struct ptr_16_32 bsp_bootstrap_gdtr __attribute__ ((section ("K_DATA_START"))) = { .limit = sizeof(gdt), .base = KA2PA((__address) gdt - BOOT_OFFSET) };
 struct ptr_16_32 ap_bootstrap_gdtr __attribute__ ((section ("K_DATA_START"))) = { .limit = sizeof(gdt), .base = KA2PA((__address) gdt) };
-struct ptr_16_32 gdtr = { .limit = sizeof(gdt), .base = KA2PA((__address) gdt) };
-struct ptr_16_32 idtr __attribute__ ((section ("K_DATA_START"))) = { .limit = sizeof(idt), .base = KA2PA((__address) idt) };
+struct ptr_16_32 gdtr = { .limit = sizeof(gdt), .base = (__address) gdt };
 
 void gdt_setbase(struct descriptor *d, __address base)
@@ -167 +166 @@
 void pm_init(void)
 {
-        struct descriptor *gdt_p = (struct descriptor *) PA2KA(gdtr.base);
-
+        struct descriptor *gdt_p = (struct descriptor *) gdtr.base;
+        struct ptr_16_32 idtr;
 
         /*
          * Update addresses in GDT and IDT to their virtual counterparts.
          */
-        if (config.cpu_active == 1)
-                gdtr.base = (__address) gdt;
+        idtr.limit = sizeof(idt);
         idtr.base = (__address) idt;
         __asm__ volatile ("lgdt %0\n" : : "m" (gdtr));