Changeset 8844e70 in mainline for kernel/arch/ia32/src/boot/multiboot.S

Timestamp:

2016-04-11T17:03:47Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

3b0f1b9a

Parents:

3a34852

Message:

ia32: use asmtool.h macros for defining symbols

File:

• kernel/arch/ia32/src/boot/multiboot.S (modified) (8 diffs)

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

@@ -29 +29 @@
  */
 
+#include <abi/asmtool.h>
 #include <arch/boot/boot.h>
 #include <arch/mm/page.h>
@@ -61 +62 @@
 
 .align 4
-.global multiboot_image_start
 multiboot_header:
         .long MULTIBOOT_HEADER_MAGIC
@@ -72 +72 @@
         .long multiboot_image_start
 
-multiboot_image_start:
+SYMBOL(multiboot_image_start)
         cli
         cld
@@ -162 +162 @@
  *
  */
-.global map_kernel_pse
+FUNCTION_BEGIN(map_kernel_pse)
 map_kernel_pse:
         /* Paging features */
@@ -194 +194 @@
         movl %ebx, %cr0
         ret
+FUNCTION_END(map_kernel_pse)
 
 /** Setup mapping for the kernel (non-PSE variant).
@@ -201 +202 @@
  *
  */
-.global map_kernel_non_pse
-map_kernel_non_pse:
+FUNCTION_BEGIN(map_kernel_non_pse)
         /* Paging features */
         movl %cr4, %ecx
@@ -281 +281 @@
                 
                 ret
+FUNCTION_END(map_kernel_non_pse)
 
 /** Calculate unmapped address of the end of the kernel. */
@@ -707 +708 @@
         .space 4096, 0
 
-.global bootstrap_idtr
-bootstrap_idtr:
+SYMBOL(bootstrap_idtr)
         .word 0
         .long 0
 
-.global bootstrap_gdtr
-bootstrap_gdtr:
+SYMBOL(bootstrap_gdtr)
         .word GDT_SELECTOR(GDT_ITEMS)
         .long KA2PA(gdt)
 
-.global multiboot_eax
-multiboot_eax:
+SYMBOL(multiboot_eax)
         .long 0
 
-.global multiboot_ebx
-multiboot_ebx:
+SYMBOL(multiboot_ebx)
         .long 0