Changeset 8565a42 in mainline for kernel/arch/amd64/src/boot/multiboot2.S

Timestamp:

2018-03-02T20:34:50Z (7 years ago)

Author:

GitHub <noreply@…>

Branches:

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

Children:

a1a81f69, d5e5fd1

Parents:

3061bc1 (diff), 34e1206 (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.

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-03-02 20:34:50)

git-committer:

GitHub <noreply@…> (2018-03-02 20:34:50)

Message:

Remove all trailing whitespace, everywhere.

See individual commit messages for details.

File:

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

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

@@ -47 +47 @@
         .long multiboot2_header_end - multiboot2_header_start
         .long -(MULTIBOOT2_HEADER_MAGIC + MULTIBOOT2_HEADER_ARCH_I386 + (multiboot2_header_end - multiboot2_header_start))
-        
+
         /* Information request tag */
         .align 8
@@ -61 +61 @@
 #endif
         tag_info_req_end:
-        
+
         /* Address tag */
         .align 8
@@ -73 +73 @@
                 .long 0
         tag_address_end:
-        
+
         /* Entry address tag */
         .align 8
@@ -82 +82 @@
                 .long multiboot2_image_start
         tag_entry_address_end:
-        
+
         /* Flags tag */
         .align 8
@@ -91 +91 @@
                 .long MULTIBOOT2_FLAGS_CONSOLE
         tag_flags_end:
-        
+
 #ifdef CONFIG_FB
         /* Framebuffer tag */
@@ -104 +104 @@
         tag_framebuffer_end:
 #endif
-        
+
         /* Module alignment tag */
         .align 8
@@ -113 +113 @@
                 .long 0
         tag_module_align_end:
-        
+
         /* Tag terminator */
         .align 8
@@ -126 +126 @@
         cli
         cld
-        
+
         /* Initialize stack pointer */
         movl $START_STACK, %esp
-        
+
         /*
          * Initialize Global Descriptor Table and
@@ -136 +136 @@
         lgdtl bootstrap_gdtr
         lidtl bootstrap_idtr
-        
+
         /* Kernel data + stack */
         movw $GDT_SELECTOR(KDATA_DES), %cx
@@ -142 +142 @@
         movw %cx, %ds
         movw %cx, %ss
-        
+
         /*
          * Simics seems to remove hidden part of GS on entering user mode
@@ -150 +150 @@
         movw %cx, %fs
         movw %cx, %gs
-        
+
         jmpl $GDT_SELECTOR(KTEXT32_DES), $multiboot2_meeting_point
         multiboot2_meeting_point:
-        
+
         /*
          * Protected 32-bit. We want to reuse the code-seg descriptor,
          * the Default operand size must not be 1 when entering long mode.
          */
-        
+
         /* Save multiboot arguments */
         movl %eax, multiboot_eax
         movl %ebx, multiboot_ebx
-        
+
         movl $(INTEL_CPUID_EXTENDED), %eax
         cpuid
         cmp $(INTEL_CPUID_EXTENDED), %eax
         ja extended_cpuid_supported
-        
-                jmp pm_error_halt
-        
+
+                jmp pm_error_halt
+
         extended_cpuid_supported:
-        
+
         movl $(AMD_CPUID_EXTENDED), %eax
         cpuid
         bt $(AMD_EXT_LONG_MODE), %edx
         jc long_mode_supported
-        
-                jmp pm_error_halt
-        
+
+                jmp pm_error_halt
+
         long_mode_supported:
-        
+
         bt $(AMD_EXT_NOEXECUTE), %edx
         jc noexecute_supported
-        
-                jmp pm_error_halt
-        
+
+                jmp pm_error_halt
+
         noexecute_supported:
-        
+
         movl $(INTEL_CPUID_STANDARD), %eax
         cpuid
         bt $(INTEL_FXSAVE), %edx
         jc fx_supported
-        
-                jmp pm_error_halt
-        
+
+                jmp pm_error_halt
+
         fx_supported:
-        
+
         bt $(INTEL_SSE2), %edx
         jc sse2_supported
-        
-                jmp pm_error_halt
-        
+
+                jmp pm_error_halt
+
         sse2_supported:
-        
+
         /*
          * Enable 64-bit page translation entries - CR4.PAE = 1.
          * Paging is not enabled until after long mode is enabled.
          */
-        
+
         movl %cr4, %eax
         orl $CR4_PAE, %eax
         movl %eax, %cr4
-        
+
         /* Set up paging tables */
         leal ptl_0, %eax
         movl %eax, %cr3
-        
+
         /* Enable long mode */
         movl $AMD_MSR_EFER, %ecx
@@ -222 +222 @@
         orl $AMD_LME, %eax        /* set LME = 1 */
         wrmsr
-        
+
         /* Enable paging to activate long mode (set CR0.PG = 1) */
         movl %cr0, %eax
         orl $CR0_PG, %eax
         movl %eax, %cr0
-        
+
         /* At this point we are in compatibility mode */
         jmpl $GDT_SELECTOR(KTEXT_DES), $start64
@@ -240 +240 @@
 
 start64:
-        
+
         /*
          * Long mode.
          */
-        
+
         movq $(PA2KA(START_STACK)), %rsp
-        
+
         /* Create the first stack frame */
         pushq $0
         movq %rsp, %rbp
-        
+
         /* Call amd64_pre_main(multiboot_eax, multiboot_ebx) */
         movl multiboot_eax, %edi
         movl multiboot_ebx, %esi
-        
+
 #ifdef MEMORY_MODEL_large
         movabsq $amd64_pre_main, %rax
@@ -261 +261 @@
         callq amd64_pre_main
 #endif
-        
+
         /* Call main_bsp() */
 #ifdef MEMORY_MODEL_large
@@ -269 +269 @@
         callq main_bsp
 #endif
-        
+
         /* Not reached */
         cli