Changes in kernel/arch/amd64/src/boot/boot.S [e80329d6:22c3444] in mainline

File:

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

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

@@ -85 +85 @@
         
         /* Kernel data + stack */
-        movw $GDT_SELECTOR(KDATA_DES), %cx
+        movw $gdtselector(KDATA_DES), %cx
         movw %cx, %es
         movw %cx, %ds
@@ -94 +94 @@
          * when _visible_ part of GS does not point to user-mode segment.
          */
-        movw $GDT_SELECTOR(UDATA_DES), %cx
+        movw $gdtselector(UDATA_DES), %cx
         movw %cx, %fs
         movw %cx, %gs
         
-        jmpl $GDT_SELECTOR(KTEXT32_DES), $multiboot_meeting_point
+        jmpl $gdtselector(KTEXT32_DES), $multiboot_meeting_point
         multiboot_meeting_point:
         
@@ -182 +182 @@
         
         /* At this point we are in compatibility mode */
-        jmpl $GDT_SELECTOR(KTEXT_DES), $start64
+        jmpl $gdtselector(KTEXT_DES), $start64
 
 /** Print string to EGA display (in light red) and halt.
@@ -516 +516 @@
                 movq $(PA2KA(0xb80a0)), %rsi
                 movq $(PA2KA(0xb8000)), %rdi
-                movl $480, %ecx
+                movq $480, %rcx
                 rep movsq
                 
                 /* Clear the 24th row */
-                xorl %eax, %eax
-                movl $20, %ecx
+                xorq %rax, %rax
+                movq $20, %rcx
                 rep stosq
                 
@@ -645 +645 @@
 .section K_DATA_START, "aw", @progbits
 
+.global bootstrap_gdtr
 bootstrap_gdtr:
-        .word GDT_SELECTOR(GDT_ITEMS)
+        .word gdtselector(GDT_ITEMS)
         .long KA2PA(gdt)