Changeset 04803bf in mainline for kernel/arch/ia32/src/boot/vesa_ret.inc

Timestamp:

2011-03-21T22:00:17Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

143932e3

Parents:

b50b5af2 (diff), 7308e84 (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 (needs fixes).

File:

• kernel/arch/ia32/src/boot/vesa_ret.inc (modified) (1 diff)

kernel/arch/ia32/src/boot/vesa_ret.inc

@@ -1 +1 @@
 .code32
 vesa_init_protected:
-        movw $gdtselector(KDATA_DES), %cx
+        cld
+        
+        /* Initialize stack pointer */
+        movl $START_STACK, %esp
+        
+        /* Kernel data + stack */
+        movw $GDT_SELECTOR(KDATA_DES), %cx
         movw %cx, %es
         movw %cx, %fs
         movw %cx, %gs
-        movw %cx, %ds               # kernel data + stack
+        movw %cx, %ds
         movw %cx, %ss
         
-        movl $START_STACK, %esp     # initialize stack pointer
-        
-        jmpl $gdtselector(KTEXT_DES), $vesa_meeting_point
+        jmpl $GDT_SELECTOR(KTEXT_DES), $vesa_meeting_point