Changeset ac5d02b in mainline for arch/ia32/src/mm/page.c

Timestamp:

2005-06-03T13:17:05Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

70527f1

Parents:

dcbc8be

Message:

IA-32 fixes.
Use kernel addresses instead of physical addresses in map_page_to_frame().
Physical addresses are supposed to only be exported to mm hardware.
Because of this fix, userspace is functional again.

Remap EGA videoram to (0x80000000 + videoram) and change the ega driver to work with the new address.

Minor cosmetics through out the code.
Changes in linker scripts.

File:

• arch/ia32/src/mm/page.c (modified) (6 diffs)

arch/ia32/src/mm/page.c

@@ -36 +36 @@
 #include <arch/asm.h>
 #include <synch/spinlock.h>
+#include <debug.h>
 
 /*
@@ -54 +55 @@
 
         if (config.cpu_active == 1) {
-                dba = KA2PA(frame_alloc(FRAME_KA | FRAME_PANIC));
+                dba = frame_alloc(FRAME_KA | FRAME_PANIC);
                 memsetb(dba, PAGE_SIZE, 0);
             
@@ -69 +70 @@
 
                 trap_register(14, page_fault);
-                cpu_write_dba(dba);             
+                cpu_write_dba(KA2PA(dba));
         }
         else {
@@ -82 +83 @@
                 dba = frame_alloc(FRAME_KA | FRAME_PANIC);
                 memcopy(bootstrap_dba, dba, PAGE_SIZE);
-                cpu_write_dba(dba);
+                cpu_write_dba(KA2PA(dba));
         }
 
@@ -122 +123 @@
                  * frame for the page table and clean it.
                  */
-                newpt = KA2PA(frame_alloc(FRAME_KA));
-                pd[pde].frame_address = newpt >> 12;
+                newpt = frame_alloc(FRAME_KA);
+                pd[pde].frame_address = KA2PA(newpt) >> 12;
                 memsetb(newpt, PAGE_SIZE, 0);
                 pd[pde].present = 1;
@@ -129 +130 @@
         }
         if (copy) {
-                newpt = KA2PA(frame_alloc(FRAME_KA));
+                newpt = frame_alloc(FRAME_KA);
                 memcopy(pd[pde].frame_address << 12, newpt, PAGE_SIZE);
-                pd[pde].frame_address = newpt >> 12;
+                pd[pde].frame_address = KA2PA(newpt) >> 12;
         }