Changeset 961b5f0 in mainline

Timestamp:

2005-12-15T19:35:17Z (19 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

49b6d32

Parents:

6c68b97

Message:

init task loading (yet buggy)

Files:

• arch/ia32/boot/grub.img.gz (modified) ( previous)
• arch/ia32/src/boot/boot.S (modified) (1 diff)
• generic/include/mm/frame.h (modified) (1 diff)
• generic/src/main/kinit.c (modified) (1 diff)
• generic/src/mm/frame.c (modified) (1 diff)

arch/ia32/src/boot/boot.S

@@ -173 +173 @@
                 movl 4(%esi), %ecx                                              # mods->mod_end
                 subl %edx, %ecx
+                addl $0x80000000, %edx
                 
                 mods_invalid:

generic/include/mm/frame.h

@@ -50 +50 @@
 #define IS_BUDDY_RIGHT_BLOCK(zone, frame)       (((FRAME_INDEX((zone), (frame)) >> (frame)->buddy_order) & 0x1) == 1)
 
-#define ZONE_BLACKLIST_SIZE     3
+#define ZONE_BLACKLIST_SIZE     4
 
 struct zone {

generic/src/main/kinit.c

@@ -163 +163 @@
                 panic("vm_area_create: vm_text\n");
         vm_area_map(a, m);
-        memcpy((void *) PA2KA(a->mapping[0]), (void *) utext, utext_size < PAGE_SIZE ? utext_size : PAGE_SIZE);
+        if (config.init_size > 0)
+                memcpy((void *) PA2KA(a->mapping[0]), (void *) config.init_addr, config.init_size < PAGE_SIZE ? config.init_size : PAGE_SIZE);
+        else
+                memcpy((void *) PA2KA(a->mapping[0]), (void *) utext, utext_size < PAGE_SIZE ? utext_size : PAGE_SIZE);
 
         /*

generic/src/mm/frame.c

@@ -70 +70 @@
         if (config.cpu_active == 1) {
                 frame_region_not_free(KA2PA(config.base), config.kernel_size);
+                if (config.init_size > 0)
+                        frame_region_not_free(KA2PA(config.init_addr), config.init_size);
         }