Changeset cefb126 in mainline for kernel/arch/amd64/src/boot/vesa_ret.inc

Timestamp:

2010-07-02T14:19:30Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

89c57b6

Parents:

fe7abd0 (diff), e3ee9b9 (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/vesa_ret.inc (modified) (2 diffs)

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

@@ -1 +1 @@
 .code32
 vesa_init_protected:
+        cld
+        
+        /* Initialize stack pointer */
+        movl $START_STACK, %esp
+        
+        /* Kernel data + stack */
         movw $gdtselector(KDATA_DES), %cx
         movw %cx, %es
-        movw %cx, %ds                       # kernel data + stack
+        movw %cx, %ds
         movw %cx, %ss
         
-        #
-        # Simics seems to remove hidden part of GS on entering user mode
-        # when _visible_ part of GS does not point to user-mode segment.
-        #
+        /*
+         * Simics seems to remove hidden part of GS on entering user mode
+         * when _visible_ part of GS does not point to user-mode segment.
+         */
         
         movw $gdtselector(UDATA_DES), %cx
@@ -15 +21 @@
         movw %cx, %gs
         
-        movl $START_STACK, %esp             # initialize stack pointer
-        
         jmpl $gdtselector(KTEXT32_DES), $vesa_meeting_point