Stil in progress, not bootable boot.asm

Author: Retr0-code

boot.asm

@@ -1,4 +1,4 @@
-bits 16         ; Defines architecture of bootloader
+[bits 16]       ; Defines architecture of bootloader
 org 0x7c00      ; Defines general offset
 
 

bootloader/disk_mng.asm

@@ -12,22 +12,24 @@ section .text:
         mov dh, 0x00        ; Head that read
 
         int 0x13            ; BIOS interupt to read data
-        jc _disk_error       ; If carry is set raise an error
+        jc _disk_error      ; If carry is set raise an error
 
         pop dx              ; Recover DX from stack
         cmp al, dh          ; Check amount of readen sectors
-        jne _sectors_error   ; If they are not equal raise an error
+        jne _sectors_error  ; If they are not equal raise an error
         popa                ; Recover registers
         ret                 ; Exit the function
 
 
     _disk_error:
         push disk_error_text
         call _printformat
+        jmp $
 
     _sectors_error:
         push sectors_error_text
         call _printformat
+        jmp $
 
     disk_error_text: db "Disk read error\0"
     sectors_error_text: db "Incorrect number of sectors read\0",

bootloader/gets.asm

@@ -1,6 +1,5 @@
 global _gets
 
-
 section .text:
     ; Get string function
     _gets:

bootloader/io.asm

@@ -1,3 +1,3 @@
 ; Includes headers
-%include "functions/printf.asm"     ; Loads printf function
-%include "functions/gets.asm"       ; Loads gets function
+%include "bootloader/printf.asm"     ; Loads printf function
+%include "bootloader/gets.asm"       ; Loads gets function

bootloader/kernel_entry.asm

@@ -0,0 +1,9 @@
+[bits 32]
+
+extern main
+global _load_kernel
+
+section .text:
+    _load_kernel:
+        call main
+        jmp $

kernel/kernel.cpp

@@ -0,0 +1,4 @@
+extern "C" void main(){
+    *(char*)0xb8000 = 'Q';
+    return;
+}

run.sh

@@ -1,4 +1,13 @@
 #!/bin/bash
 
-nasm -f bin -o boot.bin boot.asm
-qemu-system-x86_64 -fda boot.bin
+nasm -f bin -o build/boot.bin boot.asm
+nasm -f elf -o build/kernel_entry.o bootloader/kernel_entry.asm
+i386-elf-gcc -ffreestanding -m32 -g -c kernel/kernel.cpp -o build/kernel.o
+
+i386-elf-ld -o build/full_kernel.bin -Ttext 0x1000 build/kernel_entry.o build/kernel.o --oformat binary
+
+cat build/boot.bin build/full_kernel.bin  > build/OS.bin
+
+# qemu-system-x86_64 -fda boot.bin
+
+qemu-system-x86_64 -drive format=raw,file="build/OS.bin",index=0,if=flash,  -m 128M