Changeset 328f2934 in mainline for arch/ia32/src/mm

Timestamp:

2005-12-04T19:37:13Z (20 years ago)

Author:

Sergey Bondari <bondari@…>

Branches:

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

Children:

cf585c9

Parents:

d7ac642

Message:

Buddy allocator for physical memory complete implementation.
Tested on IA32, AMD64, MIPS32. RWLock Test #5 is not passed.
NOTE: Other architectures could be broken (but should not be)

Location:

arch/ia32/src/mm

Files:

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

arch/ia32/src/mm/frame.c

@@ -34 +34 @@
 #include <arch/boot/memmap.h>
 #include <panic.h>
+#include <debug.h>
 
 size_t hardcoded_unmapped_ktext_size = 0;
@@ -41 +42 @@
 {
         zone_t *z;
+        __address start, stop;
+        size_t size;
         __u8 i;
         
         if (config.cpu_active == 1) {
+
+                /* Reserve frame 0 (BIOS data) */
+                frame_region_not_free(0, FRAME_SIZE);
+                
+                /* Reserve real mode bootstrap memory */
+                frame_region_not_free(BOOTSTRAP_OFFSET, hardcoded_unmapped_ktext_size + hardcoded_unmapped_kdata_size);
+                
                 for (i=0;i<e820counter;i++) {
                         if (e820table[i].type==MEMMAP_MEMORY_AVAILABLE) {
-                                z = zone_create(e820table[i].base_address, e820table[i].size & ~(FRAME_SIZE-1), 0);
-                                if (!z) {
-                                        panic("Cannot allocate zone (%dB).\n", e820table[i].size & ~(FRAME_SIZE-1));
-                                }
-                                zone_attach(z);
+                                zone_create_in_region(e820table[i].base_address,  e820table[i].size & ~(FRAME_SIZE-1));
                         }
                 }
-                
-                frame_not_free(0);
-
-                /* Reserve real mode bootstrap memory */
-                frame_region_not_free(BOOTSTRAP_OFFSET, BOOTSTRAP_OFFSET + hardcoded_unmapped_ktext_size + hardcoded_unmapped_kdata_size);
         }
 }

arch/ia32/src/mm/page.c

@@ -48 +48 @@
 
         if (config.cpu_active == 1) {
-                dba = frame_alloc(FRAME_KA | FRAME_PANIC);
+                dba = frame_alloc(FRAME_KA | FRAME_PANIC, 0);
                 memsetb(dba, PAGE_SIZE, 0);
 
@@ -70 +70 @@
                  */
 
-                dba = frame_alloc(FRAME_KA | FRAME_PANIC);
+                dba = frame_alloc(FRAME_KA | FRAME_PANIC, 0);
                 memcpy((void *)dba, (void *)bootstrap_dba , PAGE_SIZE);
                 write_cr3(KA2PA(dba));