From b75e39a2e30ed1cd88e7ac456dc83053158250d7 Mon Sep 17 00:00:00 2001 From: the lemons Date: Wed, 31 Mar 2021 01:28:28 -0500 Subject: stop doing bad thing --- asm_obj/boot.o | Bin 18332 -> 18332 bytes isodir/boot/kernel.bin | Bin 86632 -> 86616 bytes kernel.bin | Bin 86632 -> 86616 bytes os.iso | Bin 19890176 -> 19890176 bytes src/boot.s | 20 ++++++++------------ 5 files changed, 8 insertions(+), 12 deletions(-) diff --git a/asm_obj/boot.o b/asm_obj/boot.o index 884c973..91d113a 100644 Binary files a/asm_obj/boot.o and b/asm_obj/boot.o differ diff --git a/isodir/boot/kernel.bin b/isodir/boot/kernel.bin index c0362ec..8102ba9 100755 Binary files a/isodir/boot/kernel.bin and b/isodir/boot/kernel.bin differ diff --git a/kernel.bin b/kernel.bin index c0362ec..8102ba9 100755 Binary files a/kernel.bin and b/kernel.bin differ diff --git a/os.iso b/os.iso index db860d2..f78bfdd 100644 Binary files a/os.iso and b/os.iso differ diff --git a/src/boot.s b/src/boot.s index 71017ff..dd43460 100644 --- a/src/boot.s +++ b/src/boot.s @@ -21,7 +21,6 @@ stack_top: .section .data -.intel_syntax noprefix gdt: null_gdt: /* null descriptor */ .quad 0x00 @@ -48,7 +47,6 @@ gdt: .word end_gdt - gdt - 1 .int gdt -.att_syntax .section .text .global _start @@ -58,16 +56,14 @@ _start: cli -.intel_syntax noprefix - lgdt [gdt_desc] /* load GDT */ - mov ax, 0x10 - mov ds, ax - mov ss, ax - mov es, ax - mov fs, ax - mov gs, ax - jmp 0x08:continue -.att_syntax + lgdt (gdt_desc) /* load GDT */ + mov $0x10, %ax + mov %ax, %ds + mov %ax, %ss + mov %ax, %es + mov %ax, %fs + mov %ax, %gs + ljmp $0x08,$continue continue: call kernel_main -- cgit v1.2.3