Changeset cf27a6cb in mainline

Timestamp:

2005-09-21T22:34:54Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

23443b2

Parents:

74b2f5bf

Message:

Complete map_kernel() in boot.S to map the entire 4G space.

Change IA-32 frame_arch_init() to add zone with lower base addresses first.

Location:

arch/ia32/src

Files:

• boot/boot.S (modified) (2 diffs)
• mm/frame.c (modified) (1 diff)

arch/ia32/src/boot/boot.S

@@ -214 +214 @@
         #
         # Here we setup mapping for both the unmapped and mapped sections of the kernel.
-        # For simplicity, we set only one 4M page for 0x00000000 and one for 0x80000000.
+        # For simplicity, we map the entire 4G space.
         #
         movl %cr4, %ecx
@@ -220 +220 @@
         movl %ecx, %cr4                                                 # turn PSE on
         
+        movl $(page_directory+0), %esi
+        movl $(page_directory+2048), %edi
+        xorl %ecx, %ecx
+        xorl %ebx, %ebx
+0:
         movl $((1<<7)|(1<<0)), %eax
-        movl %eax, page_directory                                       # mapping 0x00000000 => 0x00000000
-
-        movl $(page_directory+2048), %edx
-        movl %eax, (%edx)                                               # mapping 0x80000000 => 0x00000000
-
-        leal page_directory, %eax
-        movl %eax, %cr3
+        orl %ebx, %eax
+        movl %eax, (%esi,%ecx,4)                                        # mapping 0x00000000+%ecx*4M => 0x00000000+%ecx*4M
+        movl %eax, (%edi,%ecx,4)                                        # mapping 0x80000000+%ecx*4M => 0x00000000+%ecx*4M
+        addl $(4*1024*1024), %ebx
+
+        incl %ecx
+        cmpl $512, %ecx
+        jl 0b
+
+        movl %esi, %cr3
         
         # turn paging on

arch/ia32/src/mm/frame.c

@@ -44 +44 @@
         
         if (config.cpu_active == 1) {
-                for (i=e820counter;i>0;i--) {
-                        if (e820table[i-1].type==MEMMAP_MEMORY_AVAILABLE) {
-                                z = zone_create(e820table[i-1].base_address, e820table[i-1].size & ~(FRAME_SIZE-1), 0);
+                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-1].size & ~(FRAME_SIZE-1));
+                                        panic("Cannot allocate zone (%dB).\n", e820table[i].size & ~(FRAME_SIZE-1));
                                 }
                                 zone_attach(z);