Changeset 89c57b6 in mainline for kernel/arch/amd64/src/boot/boot.S

Timestamp:

2011-04-13T14:45:41Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

88634420

Parents:

cefb126 (diff), 17279ead (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/boot.S (modified) (8 diffs)

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

@@ -85 +85 @@
         
         /* Kernel data + stack */
-        movw $gdtselector(KDATA_DES), %cx
+        movw $GDT_SELECTOR(KDATA_DES), %cx
         movw %cx, %es
         movw %cx, %ds
@@ -94 +94 @@
          * when _visible_ part of GS does not point to user-mode segment.
          */
-        movw $gdtselector(UDATA_DES), %cx
+        movw $GDT_SELECTOR(UDATA_DES), %cx
         movw %cx, %fs
         movw %cx, %gs
         
-        jmpl $gdtselector(KTEXT32_DES), $multiboot_meeting_point
+        jmpl $GDT_SELECTOR(KTEXT32_DES), $multiboot_meeting_point
         multiboot_meeting_point:
         
@@ -182 +182 @@
         
         /* At this point we are in compatibility mode */
-        jmpl $gdtselector(KTEXT_DES), $start64
+        jmpl $GDT_SELECTOR(KTEXT_DES), $start64
 
 /** Print string to EGA display (in light red) and halt.
@@ -247 +247 @@
                 movl $0xb80a0, %esi
                 movl $0xb8000, %edi
-                movl $1920, %ecx
-                rep movsw
+                movl $960, %ecx
+                rep movsl
                 
                 /* Clear the 24th row */
                 xorl %eax, %eax
-                movl $80, %ecx
-                rep stosw
+                movl $40, %ecx
+                rep stosl
                 
                 /* Go to row 24 */
@@ -357 +357 @@
                 movl $0xb80a0, %esi
                 movl $0xb8000, %edi
-                movl $1920, %ecx
-                rep movsw
+                movl $960, %ecx
+                rep movsl
                 
                 /* Clear the 24th row */
                 xorl %eax, %eax
-                movl $80, %ecx
-                rep stosw
+                movl $40, %ecx
+                rep stosl
                 
                 /* Go to row 24 */
@@ -516 +516 @@
                 movq $(PA2KA(0xb80a0)), %rsi
                 movq $(PA2KA(0xb8000)), %rdi
-                movq $1920, %rcx
-                rep movsw
+                movl $480, %ecx
+                rep movsq
                 
                 /* Clear the 24th row */
-                xorq %rax, %rax
-                movq $80, %rcx
-                rep stosw
+                xorl %eax, %eax
+                movl $20, %ecx
+                rep stosq
                 
                 /* Go to row 24 */
@@ -605 +605 @@
 .align 4096
 ptl_2_4g:
-        ptl2gen 512 3
+        ptl2gen 512 4
 
 /* Page table for pages in the 6th gigabyte. */
 .align 4096
 ptl_2_5g:
-        ptl2gen 512 3
+        ptl2gen 512 5
 
 /* Page table for pages in the 7th gigabyte. */
 .align 4096
 ptl_2_6g:
-        ptl2gen 512 3
+        ptl2gen 512 6
 
 /* Page table for pages in the 8th gigabyte. */
 .align 4096
 ptl_2_7g:
-        ptl2gen 512 3
+        ptl2gen 512 7
 
 .align 4096
@@ -645 +645 @@
 .section K_DATA_START, "aw", @progbits
 
-.global bootstrap_gdtr
 bootstrap_gdtr:
-        .word gdtselector(GDT_ITEMS)
+        .word GDT_SELECTOR(GDT_ITEMS)
         .long KA2PA(gdt)