summaryrefslogtreecommitdiff
path: root/src/as
diff options
context:
space:
mode:
Diffstat (limited to 'src/as')
-rw-r--r--src/as/boot.s32
-rw-r--r--src/as/crti.s12
-rw-r--r--src/as/crtn.s12
-rw-r--r--src/as/paging.s4
4 files changed, 30 insertions, 30 deletions
diff --git a/src/as/boot.s b/src/as/boot.s
index 68e5947..907cd3c 100644
--- a/src/as/boot.s
+++ b/src/as/boot.s
@@ -3,7 +3,7 @@
.set FLAGS, ALIGN | MEMINFO
.set MAGIC, 0x1BADB002
.set CHECKSUM, -(MAGIC + FLAGS)
-
+
.section .multiboot
.align 4
.long MAGIC
@@ -51,20 +51,20 @@ stack_top:
.section .text
.type _start, @function
_start:
- call init_gdt_table
- ljmp $CODE_SEGMENT, $code
-
+ call init_gdt_table
+ ljmp $CODE_SEGMENT, $code
+
code:
- movw $DATA_SEGMENT, %ax
- movw %ax, %ds
- movw %ax, %es
- movw %ax, %fs
- movw %ax, %gs
- movw %ax, %ss
- movl $stack_top, %esp
- cli
- call _init
- call kernel_main
- hlt
-
+ movw $DATA_SEGMENT, %ax
+ movw %ax, %ds
+ movw %ax, %es
+ movw %ax, %fs
+ movw %ax, %gs
+ movw %ax, %ss
+ movl $stack_top, %esp
+ cli
+ call _init
+ call kernel_main
+ hlt
+
.size _start, . - _start
diff --git a/src/as/crti.s b/src/as/crti.s
index 30dd4ea..5894e2d 100644
--- a/src/as/crti.s
+++ b/src/as/crti.s
@@ -3,14 +3,14 @@
.global _init
.type _init, @function
_init:
- push %ebp
- movl %esp, %ebp
- /* gcc will nicely put the contents of crtbegin.o's .init section here. */
+ push %ebp
+ movl %esp, %ebp
+ /* gcc will nicely put the contents of crtbegin.o's .init section here. */
.section .fini
.global _fini
.type _fini, @function
_fini:
- push %ebp
- movl %esp, %ebp
- /* gcc will nicely put the contents of crtbegin.o's .fini section here. */
+ push %ebp
+ movl %esp, %ebp
+ /* gcc will nicely put the contents of crtbegin.o's .fini section here. */
diff --git a/src/as/crtn.s b/src/as/crtn.s
index 1da795d..0e1c314 100644
--- a/src/as/crtn.s
+++ b/src/as/crtn.s
@@ -1,10 +1,10 @@
/* x86 crtn.s */
.section .init
- /* gcc will nicely put the contents of crtend.o's .init section here. */
- popl %ebp
- ret
+ /* gcc will nicely put the contents of crtend.o's .init section here. */
+ popl %ebp
+ ret
.section .fini
- /* gcc will nicely put the contents of crtend.o's .fini section here. */
- popl %ebp
- ret
+ /* gcc will nicely put the contents of crtend.o's .fini section here. */
+ popl %ebp
+ ret
diff --git a/src/as/paging.s b/src/as/paging.s
index 2dd52d3..e1cf42a 100644
--- a/src/as/paging.s
+++ b/src/as/paging.s
@@ -1,4 +1,4 @@
-.globl loadPageDirectory
+.global loadPageDirectory
loadPageDirectory:
push %ebp
mov %esp, %ebp
@@ -9,7 +9,7 @@ loadPageDirectory:
ret
.text
-.globl enablePaging
+.global enablePaging
enablePaging:
push %ebp
mov %esp, %ebp