Changeset a35b458 in mainline for kernel/arch/ia32/src/boot/multiboot2.S

Timestamp:

2018-03-02T20:10:49Z (7 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

f1380b7

Parents:

3061bc1

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-02-28 17:38:31)

git-committer:

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

Message:

style: Remove trailing whitespace on _all_ lines, including empty ones, for particular file types.

Command used: tools/srepl '\s\+$' '' -- *.c *.h *.py *.sh *.s *.S *.ag

Currently, whitespace on empty lines is very inconsistent.
There are two basic choices: Either remove the whitespace, or keep empty lines
indented to the level of surrounding code. The former is AFAICT more common,
and also much easier to do automatically.

Alternatively, we could write script for automatic indentation, and use that
instead. However, if such a script exists, it's possible to use the indented
style locally, by having the editor apply relevant conversions on load/save,
without affecting remote repository. IMO, it makes more sense to adopt
the simpler rule.

File:

• kernel/arch/ia32/src/boot/multiboot2.S (modified) (10 diffs)

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

@@ -45 +45 @@
         .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
@@ -59 +59 @@
 #endif
         tag_info_req_end:
-        
+
         /* Address tag */
         .align 8
@@ -71 +71 @@
                 .long 0
         tag_address_end:
-        
+
         /* Entry address tag */
         .align 8
@@ -80 +80 @@
                 .long multiboot2_image_start
         tag_entry_address_end:
-        
+
         /* Flags tag */
         .align 8
@@ -89 +89 @@
                 .long MULTIBOOT2_FLAGS_CONSOLE
         tag_flags_end:
-        
+
 #ifdef CONFIG_FB
         /* Framebuffer tag */
@@ -102 +102 @@
         tag_framebuffer_end:
 #endif
-        
+
         /* Module alignment tag */
         .align 8
@@ -111 +111 @@
                 .long 0
         tag_module_align_end:
-        
+
         /* Tag terminator */
         .align 8
@@ -124 +124 @@
         cli
         cld
-        
+
         /* Initialize stack pointer */
         movl $START_STACK, %esp
-        
+
         /*
          * Initialize Global Descriptor Table and
@@ -134 +134 @@
         lgdtl bootstrap_gdtr
         lidtl bootstrap_idtr
-        
+
         /* Kernel data + stack */
         movw $GDT_SELECTOR(KDATA_DES), %cx
@@ -142 +142 @@
         movw %cx, %ds
         movw %cx, %ss
-        
+
         jmpl $GDT_SELECTOR(KTEXT_DES), $multiboot2_meeting_point
         multiboot2_meeting_point:
-        
+
         /* Save multiboot arguments */
         movl %eax, multiboot_eax
         movl %ebx, multiboot_ebx
-        
+
 #ifndef PROCESSOR_i486
-        
+
         movl $(INTEL_CPUID_LEVEL), %eax
         cpuid
         cmp $0x0, %eax  /* any function > 0? */
         jbe pse_unsupported
-        
+
         movl $(INTEL_CPUID_STANDARD), %eax
         cpuid
         bt $(INTEL_PSE), %edx
         jnc pse_unsupported
-                
+
                 /* Map kernel and turn paging on */
                 call map_kernel_pse
                 jmp stack_init
-        
+
 #endif /* PROCESSOR_i486 */
-        
+
         pse_unsupported:
-                
+
                 /* Map kernel and turn paging on */
                 call map_kernel_non_pse
-        
+
         stack_init:
-        
+
         /* Create the first stack frame */
         pushl $0
         movl %esp, %ebp
-        
+
         /* Call ia32_pre_main(multiboot_eax, multiboot_ebx) */
         pushl multiboot_ebx
         pushl multiboot_eax
         call ia32_pre_main
-        
+
         /* Call main_bsp() */
         call main_bsp
-        
+
         /* Not reached */
         cli