Changeset dcbc8be in mainline for arch/ia32/src/mm/page.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/mm/page.c (modified) (5 diffs)

arch/ia32/src/mm/page.c

@@ -54 +54 @@
 
         if (config.cpu_active == 1) {
-                dba = frame_alloc(FRAME_KA | FRAME_PANIC);
+                dba = KA2PA(frame_alloc(FRAME_KA | FRAME_PANIC));
                 memsetb(dba, PAGE_SIZE, 0);
-                cpu_write_dba(dba);
             
                 bootstrap_dba = dba;
@@ -62 +61 @@
                 /*
                  * Identity mapping for all but 0th page.
+                 * PA2KA(identity) mapping for all but 0th page.
                  */
-                for (i = 1; i < frames; i++)
+                for (i = 1; i < frames; i++) {
                         map_page_to_frame(i * PAGE_SIZE, i * PAGE_SIZE, PAGE_CACHEABLE, 0);
+                        map_page_to_frame(PA2KA(i * PAGE_SIZE), i * PAGE_SIZE, PAGE_CACHEABLE, 0);                      
+                }
 
                 trap_register(14, page_fault);
+                cpu_write_dba(dba);             
         }
         else {
@@ -105 +108 @@
         int pde, pte;
 
-        dba = cpu_read_dba();
+//      TODO: map_page_to_frame should take dba as a parameter
+//      dba = cpu_read_dba();
+        dba = bootstrap_dba;
 
         pde = page >> 22;               /* page directory entry */
@@ -117 +122 @@
                  * frame for the page table and clean it.
                  */
-                newpt = frame_alloc(FRAME_KA);
+                newpt = KA2PA(frame_alloc(FRAME_KA));
                 pd[pde].frame_address = newpt >> 12;
                 memsetb(newpt, PAGE_SIZE, 0);
@@ -124 +129 @@
         }
         if (copy) {
-                newpt = frame_alloc(FRAME_KA);
+                newpt = KA2PA(frame_alloc(FRAME_KA));
                 memcopy(pd[pde].frame_address << 12, newpt, PAGE_SIZE);
                 pd[pde].frame_address = newpt >> 12;