Changeset 95498e5 in mainline for arch/ia32/src

Timestamp:

2005-12-05T23:18:18Z (20 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

59b6a70

Parents:

eef75f6

Message:

Map all available frames of memory on ia32 and amd64 (ticket #10).

Location:

arch/ia32/src/mm

Files:

• frame.c (modified) (2 diffs)
• page.c (modified) (3 diffs)

arch/ia32/src/mm/frame.c

@@ -35 +35 @@
 #include <panic.h>
 #include <debug.h>
+#include <align.h>
 
 size_t hardcoded_unmapped_ktext_size = 0;
 size_t hardcoded_unmapped_kdata_size = 0;
+
+__address last_frame = 0;
 
 void frame_arch_init(void)
@@ -54 +57 @@
                 for (i = 0; i < e820counter; i++) {
                         if (e820table[i].type == MEMMAP_MEMORY_AVAILABLE) {
-                                zone_create_in_region(e820table[i].base_address,  e820table[i].size & ~(FRAME_SIZE-1));
-                        }
+                                zone_create_in_region(e820table[i].base_address, e820table[i].size & ~(FRAME_SIZE-1));
+                                if (last_frame < ALIGN(e820table[i].base_address + e820table[i].size, FRAME_SIZE))
+                                        last_frame = ALIGN(e820table[i].base_address + e820table[i].size, FRAME_SIZE);
+                        }                       
                 }
         }

arch/ia32/src/mm/page.c

@@ -27 +27 @@
  */
 
+#include <arch/mm/page.h>
+#include <arch/mm/frame.h>
+#include <mm/frame.h>
+#include <mm/page.h>
 #include <arch/types.h>
 #include <config.h>
 #include <func.h>
-#include <mm/frame.h>
-#include <mm/page.h>
-#include <arch/mm/page.h>
 #include <arch/interrupt.h>
 #include <arch/asm.h>
@@ -45 +46 @@
 {
         __address dba;
-        __u32 i;
+        __address cur;
 
         if (config.cpu_active == 1) {
@@ -54 +55 @@
                 
                 /*
-                 * PA2KA(identity) mapping for all frames.
+                 * PA2KA(identity) mapping for all frames until last_frame.
                  */
-                for (i = 0; i < config.memory_size/PAGE_SIZE; i++)
-                        page_mapping_insert(PA2KA(i * PAGE_SIZE), i * PAGE_SIZE, PAGE_CACHEABLE, KA2PA(dba));
+                for (cur = 0; cur < last_frame; cur += FRAME_SIZE)
+                        page_mapping_insert(PA2KA(cur), cur, PAGE_CACHEABLE, KA2PA(dba));
 
                 trap_register(14, page_fault);