Changeset dcbc8be in mainline for arch/ia32/src/pm.c

Timestamp:

2005-06-02T23:56:26Z (20 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

ac5d02b

Parents:

7dcbc0a1

Message:

Big changes in IA-32 address space map.
Now the kernel is mapped above 0x80000000. Finally!
Userspace address space starts at 0x00000000.
Changes in many places.
This improvement temporarily breaks SMP and most likely also other stuff.
Supported size of memory is now only 4M as it is the biggest size that can be mapped at once on IA-32.

Changes in linker script.
Changes required because of the above.
Do not patch hardcoded_* variables but assign to them instead.

Cosmetic changes here and there.

File:

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

arch/ia32/src/pm.c

@@ -67 +67 @@
 
 /* gdtr is changed by kmp before next CPU is initialized */
-struct ptr_16_32 gdtr __attribute__ ((section ("K_DATA_START"))) = { .limit = sizeof(gdt), .base = (__address) gdt };
-struct ptr_16_32 idtr __attribute__ ((section ("K_DATA_START")))= { .limit = sizeof(idt), .base = (__address) idt };
+struct ptr_16_32 gdtr __attribute__ ((section ("K_DATA_START"))) = { .limit = sizeof(gdt), .base = KA2PA((__address) gdt) };
+struct ptr_16_32 idtr __attribute__ ((section ("K_DATA_START"))) = { .limit = sizeof(idt), .base = KA2PA((__address) idt) };
 
 void gdt_setbase(struct descriptor *d, __address base)
 {
-        d->base_0_15 = base & 0xffff;
-        d->base_16_23 = (base >> 16) & 0xff;
-        d->base_24_31 = (base >> 24) & 0xff;
+        d->base_0_15 = KA2PA(base) & 0xffff;
+        d->base_16_23 = (KA2PA(base) >> 16) & 0xff;
+        d->base_24_31 = (KA2PA(base) >> 24) & 0xff;
 }
 
-void gdt_setlimit(struct descriptor *d, __address limit)
+void gdt_setlimit(struct descriptor *d, __u32 limit)
 {
         d->limit_0_15 = limit & 0xffff;
@@ -85 +85 @@
 void idt_setoffset(struct idescriptor *d, __address offset)
 {
-        d->offset_0_15 = offset & 0xffff;
-        d->offset_16_31 = offset >> 16;
+        d->offset_0_15 = KA2PA(offset) & 0xffff;
+        d->offset_16_31 = KA2PA(offset) >> 16;
 }