A new beginning

[nameless-os.git] / boot.s

diff --git a/boot.s b/boot.s
index 51be5d92dd8ee19426be4092d2aaed2c1e96f46d..a40b7508781e9dbc59b82587e003f2ccca6a21f8 100644 (file)
--- a/boot.s
+++ b/boot.s
@@ -1,71 +1,135 @@
-       bits 16 ; boot sectors run in real mode
-       org 7c00h ; boot sector is loaded at 0x7c00
+       bits 16
+       org 7C00h
 
-_start
-       mov di, printing_numbers
-       call print
+KERNEL_OFFSET equ 1000h
 
-       or bl, 1
-       mov dx, 0DEADh ; number to print
-       call print_word
+       mov [BOOT_DRIVE], dl
+
+       mov bp, 9000h
+       mov sp, bp
+
+       mov di, 0
+
+       xor ax, ax
+       int 13h
+       jc reset_error
+
+       mov ah, 2
+       mov al, 10
+       xor ch, ch
+       mov cl, 2
+       xor dh, dh
+       xor bx, bx
+       mov es, bx
+       mov bx, KERNEL_OFFSET
+       int 13h
+       jc read_error
+       cmp al, 10
+       jl read_error
+       jmp switch_to_pm
+
+reset_error
+       mov bx, 0B800h
+       mov es, bx
+       mov byte [es:di], '1'
+       jmp halt
+
+read_error
+       mov bx, 0B800h
+       mov es, bx
+       mov byte [es:di], '2'
+       jmp halt
+
+       call switch_to_pm
+
+halt
+       jmp $
+
+switch_to_pm
+       mov bx, 0B800h
+       mov es, bx
+       mov byte [es:0], 'L'
+
+       cli
+       xor ax, ax
+       mov ds, ax
+       lgdt [gdt_desc]
        
-       mov di, space
-       call print
+       mov eax, cr0
+       or eax, 1
+       mov cr0, eax
+       jmp CODE_SEG:protected
+
+       bits 32
+protected
+       mov ax, DATA_SEG
+       mov ds, ax
+       mov ss, ax
+       mov es, ax
+       mov fs, ax
+       mov gs, ax
        
-       xor bl, bl
-       mov dx, 0BEEFh
-       call print_word
+       mov ebp, 090000h
+       mov esp, ebp
 
-       mov di, waiting
-       call print
+       mov ebx, pm_success
+       call pmprint
 
-       mov di, keystroke
-       mov bl, 1
+       call KERNEL_OFFSET
 
-.loop
-       mov ah, 0
-       int 16h
-       cmp ah, 1Ch
-       je .enterpressed
-       jmp .continue
-       cmp ah, 0Eh
-       je .backspace
-       jmp .continue
-.enterpressed
+       jmp $
+
+pmprint
        pusha
-       mov ah, 0Eh
-       mov al, 0Dh
-       int 10h
-       mov al, 0Ah
-       int 10h
-       popa
+       mov edx, video_memory
+
+.loop
+       mov al, [ebx]
+       mov ah, 0Fh
+
+       cmp al, 0
+       je .done
+
+       mov [edx], al
+       mov [edx+1], ah
+
+       inc ebx
+       add edx, 2
+
        jmp .loop
-.backspace
-       pusha
-       mov ah, 03h
-       mov bh, 0
-       int 10h
-       dec dl
-       mov ah, 02h
-       int 10h
-       mov ah, 0Eh
-       mov al, ' '
-       int 10h
-       mov ah, 02h
-       int 10h
+
+.done
        popa
-       jmp .loop
-.continue
-       mov [keystroke], al
-       call print
-       jmp .loop
+       ret
+
+pm_success db "Now in protected mode", 0
+video_memory equ 0B8000h
 
-printing_numbers db "Printing some random hex numbers", 0
-waiting db "I await keystrokes", 0
-keystroke db "$", 0
-space db " ", 0
+gdt_start
+null_seg
+       dq 0
+code_seg
+       dw 0FFFFh
+       dw 0
+       db 0
+       db 10011010b
+       db 11001111b
+       db 0
+data_seg
+       dw 0FFFFh
+       dw 0
+       db 0
+       db 10010010b
+       db 11001111b
+       db 0
+gdt_end
+gdt_desc
+       dw gdt_end - gdt_start - 1
+       dd gdt_start
+CODE_SEG equ code_seg - gdt_start
+DATA_SEG equ data_seg - gdt_start
 
-%include "print.s"
+BOOT_DRIVE db 0
 
-       times 510-($-$$) db 0 ; fill with 0 until 0x1fc is reached
-       dw 0AA55h ; BIOS MBR signature
+       times 510-($-$$) db 0
+       dw 0AA55h