Changeset 15d0046 in mainline for kernel/arch/amd64/src/boot/multiboot.S

Timestamp:

2014-09-12T13:22:33Z (10 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

9b20126

Parents:

8db09e4 (diff), 105d8d6 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

File:

• kernel/arch/amd64/src/boot/multiboot.S (modified) (3 diffs)

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