Changeset 17af882 in mainline for kernel/arch/amd64/src

Timestamp:

2014-06-16T11:32:05Z (11 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

2cb32f9

Parents:

334bf28

Message:

Switch the amd64 kernel (back) from 'large' to 'kernel' memory model.

• This makes the amd64 kernel 6% smaller and more comfortable to debug.
• Unlike in the original 'kernel' memory model implementation, KA2PA(PA2KA(x)) == x; for x from kernel identity.
• Memory outside of the kernel identity region continues to be available by the standard means.

Location:

kernel/arch/amd64/src

Files:

• boot/multiboot.S (modified) (3 diffs)
• boot/multiboot2.S (modified) (1 diff)
• mm/km.c (modified) (1 diff)

kernel/arch/amd64/src/boot/multiboot.S

@@ -428 +428 @@
         
         /* Call arch_pre_main(multiboot_eax, multiboot_ebx) */
-        xorq %rdi, %rdi
         movl multiboot_eax, %edi
-        xorq %rsi, %rsi
         movl multiboot_ebx, %esi
-        
-        movabsq $arch_pre_main, %rax
-        callq *%rax
-        
+        callq arch_pre_main
+
         long_status $status_main
         
         /* Call main_bsp() */
-        movabsq $main_bsp, %rax
-        call *%rax
+        callq main_bsp 
         
         /* Not reached */
@@ -638 +633 @@
         .quad ptl_2_6g + (PTL_WRITABLE | PTL_PRESENT)
         .quad ptl_2_7g + (PTL_WRITABLE | PTL_PRESENT)
-        .fill 504, 8, 0
+        .fill 502, 8, 0
+        /* Mapping of [0; 2G) at -2G */
+        .quad ptl_2_0g + (PTL_WRITABLE | PTL_PRESENT)
+        .quad ptl_2_1g + (PTL_WRITABLE | PTL_PRESENT)
+
 
 .align 4096
@@ -644 +643 @@
 ptl_0:
         .quad ptl_1 + (PTL_WRITABLE | PTL_PRESENT)
-        .fill 255, 8, 0
+        .fill 510, 8, 0
         .quad ptl_1 + (PTL_WRITABLE | PTL_PRESENT)
-        .fill 255, 8, 0
 
 .section K_DATA_START, "aw", @progbits

kernel/arch/amd64/src/boot/multiboot2.S

@@ -244 +244 @@
         
         /* Call arch_pre_main(multiboot_eax, multiboot_ebx) */
-        xorq %rdi, %rdi
         movl multiboot_eax, %edi
-        xorq %rsi, %rsi
         movl multiboot_ebx, %esi
-        
-        movabsq $arch_pre_main, %rax
-        callq *%rax
+        callq arch_pre_main 
         
         /* Call main_bsp() */
-        movabsq $main_bsp, %rax
-        call *%rax
+        callq main_bsp 
         
         /* Not reached */

kernel/arch/amd64/src/mm/km.c

@@ -40 +40 @@
 {
         config.identity_base = KM_AMD64_IDENTITY_START;
-        config.identity_size = KM_AMD64_IDENTITY_SIZE;  
+        config.identity_size = KM_AMD64_IDENTITY_SIZE;
 }