From 7c3e9aa33cdba8669ef83c66b2ac19d4baca8389 Mon Sep 17 00:00:00 2001 From: rami Date: Thu, 27 Jun 2024 14:49:11 -0400 Subject: [PATCH] fix formatting --- kernel/init.asm | 22 ++++++++++---------- q | 55 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+), 11 deletions(-) create mode 100644 q diff --git a/kernel/init.asm b/kernel/init.asm index ee88f16..798f6c2 100644 --- 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: diff --git a/q b/q new file mode 100644 index 0000000..b685805 --- /dev/null +++ b/q @@ -0,0 +1,55 @@ +diff --git a/kernel/init.asm b/kernel/init.asm +index ee88f16..798f6c2 100644 +--- 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: