fix formatting

2024-06-27 14:49:11 -04:00 · 2024-06-27 14:49:11 -04:00 · 7c3e9aa33c
commit 7c3e9aa33c
parent 2b1b7568b0
2 changed files with 66 additions and 11 deletions
--- a/kernel/init.asm
+++ b/kernel/init.asm
@ -9,13 +9,13 @@ dd -(MAGIC + FLAGS)
 section .text
 global _start
 _start:
-	cli
+    cli

-	; Check if EAX contains this magic value that our bootloader should've set
-	cmp eax, 0x2BADB002
-	jne halt
+    ; Check if EAX contains this magic value that our bootloader should've set
+    cmp eax, 0x2BADB002
+    jne halt

-	; Load GDT
+    ; Load GDT
    lgdt [gdtp]
 	; Offset to kernel data descriptor
    mov ax, 0x10 
@ -24,19 +24,19 @@ _start:
    mov fs, ax
    mov gs, ax
    mov ss, ax
-	; Offset to kernel code descriptor
+    ; Offset to kernel code descriptor
    jmp 0x8:.use_code_seg
 .use_code_seg:
    mov esp, stack_bottom
    mov ebp, esp
    push ebx 
-	and esp, 0xfffffff0
+    and esp, 0xfffffff0
    extern kernel
    call kernel
-	cli
+    cli
 halt:
-	hlt
-	jmp halt
+    hlt
+    jmp halt

 section .data
 ; GDT for a flat memory layout
@ -68,5 +68,5 @@ gdtp:
 section .bss
 align 16
 stack_top:
-	resb 16384
+    resb 16384
 stack_bottom:
--- a/55
+++ b/55
@ -0,0 +1,55 @@
+[1mdiff --git a/kernel/init.asm b/kernel/init.asm[m
+[1mindex ee88f16..798f6c2 100644[m
+[1m--- a/kernel/init.asm[m
+[1m+++ b/kernel/init.asm[m
+[36m@@ -9,13 +9,13 @@[m [mdd -(MAGIC + FLAGS)[m
+ section .text[m
+ global _start[m
+ _start:[m
+[31m-	cli[m
+[32m+[m[32m    cli[m
+ [m
+[31m-	; Check if EAX contains this magic value that our bootloader should've set[m
+[31m-	cmp eax, 0x2BADB002[m
+[31m-	jne halt[m
+[32m+[m[32m    ; Check if EAX contains this magic value that our bootloader should've set[m
+[32m+[m[32m    cmp eax, 0x2BADB002[m
+[32m+[m[32m    jne halt[m
+ [m
+[31m-	; Load GDT[m
+[32m+[m[32m    ; Load GDT[m
+     lgdt [gdtp][m
+ 	; Offset to kernel data descriptor[m
+     mov ax, 0x10 [m
+[36m@@ -24,19 +24,19 @@[m [m_start:[m
+     mov fs, ax[m
+     mov gs, ax[m
+     mov ss, ax[m
+[31m-	; Offset to kernel code descriptor[m
+[32m+[m[32m    ; Offset to kernel code descriptor[m
+     jmp 0x8:.use_code_seg[m
+ .use_code_seg:[m
+     mov esp, stack_bottom[m
+     mov ebp, esp[m
+     push ebx [m
+[31m-	and esp, 0xfffffff0[m
+[32m+[m[32m    and esp, 0xfffffff0[m
+     extern kernel[m
+     call kernel[m
+[31m-	cli[m
+[32m+[m[32m    cli[m
+ halt:[m
+[31m-	hlt[m
+[31m-	jmp halt[m
+[32m+[m[32m    hlt[m
+[32m+[m[32m    jmp halt[m
+ [m
+ section .data[m
+ ; GDT for a flat memory layout[m
+[36m@@ -68,5 +68,5 @@[m [mgdtp:[m
+ section .bss[m
+ align 16[m
+ stack_top:[m
+[31m-	resb 16384[m
+[32m+[m[32m    resb 16384[m
+ stack_bottom:[m