Changeset 89c57b6 in mainline for kernel/arch/ia32/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/ia32/src/boot/boot.S (modified) (6 diffs)

kernel/arch/ia32/src/boot/boot.S

@@ -78 +78 @@
         
         /* Initialize Global Descriptor Table register */
-        lgdtl KA2PA(bootstrap_gdtr)
+        lgdtl bootstrap_gdtr
         
         /* Kernel data + stack */
-        movw $gdtselector(KDATA_DES), %cx
+        movw $GDT_SELECTOR(KDATA_DES), %cx
         movw %cx, %es
         movw %cx, %fs
@@ -88 +88 @@
         movw %cx, %ss
         
-        jmpl $gdtselector(KTEXT_DES), $multiboot_meeting_point
+        jmpl $GDT_SELECTOR(KTEXT_DES), $multiboot_meeting_point
         multiboot_meeting_point:
         
@@ -240 +240 @@
                 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 */
@@ -348 +348 @@
                 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 */
@@ -463 +463 @@
                 movl $(PA2KA(0xb80a0)), %esi
                 movl $(PA2KA(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 */
@@ -514 +514 @@
 page_directory:
         .space 4096, 0
+
+bootstrap_gdtr:
+        .word GDT_SELECTOR(GDT_ITEMS)
+        .long KA2PA(gdt)
 
 grub_eax: