diff options
author | the lemons <citrons@mondecitronne.com> | 2021-03-31 01:28:28 -0500 |
---|---|---|
committer | the lemons <citrons@mondecitronne.com> | 2021-03-31 01:28:28 -0500 |
commit | b75e39a2e30ed1cd88e7ac456dc83053158250d7 (patch) | |
tree | 7d41669c13538d646c16afabb64a3abcb355f655 | |
parent | dad752609ef1396c07345f169d468bd60c555240 (diff) |
stop doing bad thing
-rw-r--r-- | asm_obj/boot.o | bin | 18332 -> 18332 bytes | |||
-rwxr-xr-x | isodir/boot/kernel.bin | bin | 86632 -> 86616 bytes | |||
-rwxr-xr-x | kernel.bin | bin | 86632 -> 86616 bytes | |||
-rw-r--r-- | os.iso | bin | 19890176 -> 19890176 bytes | |||
-rw-r--r-- | src/boot.s | 20 |
5 files changed, 8 insertions, 12 deletions
diff --git a/asm_obj/boot.o b/asm_obj/boot.o Binary files differindex 884c973..91d113a 100644 --- a/asm_obj/boot.o +++ b/asm_obj/boot.o diff --git a/isodir/boot/kernel.bin b/isodir/boot/kernel.bin Binary files differBinary files differBinary files differindex c0362ec..8102ba9 100755 --- a/isodir/boot/kernel.bin +++ b/isodir/boot/kernel.bin @@ -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 |