[Minor] Adds VGA support and jumps corectly to 64 bit operating

.github/pull_request_template.md

@@ -1,17 +1,17 @@
-**Referenced issue**
+## Referenced issue
 Resolves _GITHUB_ISSUE_NUMBER_
 
-**Description**
+## Description
 A clear and concise description of what changes you have made.
 
-**Root Cause (if fixing a bug)**
+## Root Cause (if fixing a bug)
 What was the cause of the bug?
 
-**Breaking change?**
+## Breaking change?
 Is the change you are introducing going to affect already other existing resources? 
 
 - [ ] No, this code change does not affect other project resources.
 - [ ] Yes, the code changes modify already existing project resources.
 
-**Additional context**
+## Additional context
 Add any other context about the pull request, if applicable.

.github/workflows/release.yaml

@@ -96,8 +96,10 @@ jobs:
       - name: Install additional dependencies
         run: |
           sudo apt update
-          sudo apt install -y nasm grub-pc-bin grub-common make mtools
-          rustup target add x86_64-unknown-none
+          sudo apt install -y nasm grub-pc-bin grub-common make mtools xorriso
+          rustup update nightly
+          rustup target add x86_64-unknown-none --toolchain nightly
+          rustup component add rust-src --toolchain nightly-x86_64-unknown-linux-gnu
 
       - name: Build project
         run: make no-run

.github/workflows/test.yaml

@@ -17,8 +17,10 @@ jobs:
     - name: Install additional dependencies
       run: |
         sudo apt update
-        sudo apt install -y nasm grub-pc-bin grub-common make mtools
-        rustup target add x86_64-unknown-none
+        sudo apt install -y nasm grub-pc-bin grub-common make mtools xorriso
+        rustup update nightly
+        rustup target add x86_64-unknown-none --toolchain nightly
+        rustup component add rust-src --toolchain nightly-x86_64-unknown-linux-gnu
 
     - name: Run Tests
       run: make test

.gitignore

@@ -1,8 +1,9 @@
+target/
+AnasOS/boot/kernel
+.vscode/
+
 *.bin
 *.out
 *.o
 *.elf
-*.iso
-out/
-
-AnasOS/boot/kernel
+*.iso

AnasOS/boot/grub/grub.cfg

@@ -1,4 +1,6 @@
+set timeout=5
+
 menuentry "AnasOS"{
-    multiboot /boot/kernel
+    multiboot2 /boot/kernel
     boot
 }

Makefile

@@ -1,29 +1,28 @@
 .PHONY: run clean
 
-all: clean out-folder bootload kernel-rust image run
+all: clean kernel-rust image run
 
-no-run: clean out-folder bootload kernel-rust image
+vnc: clean kernel-rust image run-vnc
 
-test:
-	echo "No tests for now"
+no-run: clean kernel-rust image
 
-out-folder:
-	-@mkdir out
+test: no-run
+	echo "Compiled the OS successfully"
 
 kernel-rust:
-	@cd ./anasos-kernel &&  cargo rustc --release --target x86_64-unknown-none -- --emit obj
-	@cp `ls -1 ./anasos-kernel/target/x86_64-unknown-none/release/deps/*.o | head -n 1` ./out/kernel.o
-
-bootload:
-	@nasm -f elf64 bootloader/boot.asm -o ./out/boot.o
+	@cd ./anasos-kernel && cargo build --release
 
 image:
-	ld -m elf_x86_64 -T bootloader/linker.ld -o AnasOS/boot/kernel out/boot.o out/kernel.o
+	@cp  ./anasos-kernel/target/x86_64-unknown-none/release/anasos-kernel AnasOS/boot/kernel
 	grub-mkrescue -o AnasOS.iso AnasOS/
 
 run:
 	qemu-system-x86_64 AnasOS.iso
 
+run-vnc:
+	qemu-system-x86_64 AnasOS.iso -vnc :0
+
 clean:
-	-@rm -r out
-	-@rm -r anasos-kernel/target
+	-@cd ./anasos-kernel && cargo clean > /dev/null 2>&1
+	-@rm AnasOS/boot/kernel > /dev/null 2>&1
+	-@rm AnasOS.iso > /dev/null 2>&1

anasos-kernel/.cargo/config.toml

@@ -1,11 +1,11 @@
 [build]
 target = ["x86_64-unknown-none"]
 
-[target.x86_64-unknown-none]  
+[target.x86_64-unknown-none]
 rustflags = [
     "-C", "code-model=kernel",
     "-C", "relocation-model=static",
-    "-C", "panic=abort"   
+    "-C", "panic=abort",
 ]
 
 [unstable]

anasos-kernel/Cargo.toml

@@ -1,9 +1,11 @@
 [package]
 name = "anasos-kernel"
-version = "0.1.0"
+version = "1.1.0"
 authors = ["Emil Momchev <[email protected]>"]
 edition = "2021"
 
+build = "build.rs"
+
 [dependencies]
 volatile = "0.2.6"
 spin = "0.9.8"

anasos-kernel/bootloader/Makefile

@@ -0,0 +1,8 @@
+all:
+	nasm -f elf64 header.asm -o header.o
+	nasm -f elf64 boot-64.asm -o boot-64.o
+	nasm -f elf64 boot.asm -o boot.o
+
+	ld -m elf_x86_64 -T ../linker.ld -o ../../AnasOS/boot/kernel boot.o boot-64.o header.o
+	grub-mkrescue -o AnasOS.iso ../../AnasOS/
+	qemu-system-x86_64 AnasOS.iso

anasos-kernel/bootloader/boot-64.asm

@@ -0,0 +1,18 @@
+GLOBAL long_mode_start 
+EXTERN _start
+
+SECTION .text
+BITS 64
+long_mode_start:
+    ; load null to all data segmant registers (needed for the cpu to work as intended)
+    MOV ax, 0
+    MOV ss, ax
+    MOV ds, ax
+    MOV es, ax
+    MOV fs, ax
+    MOV gs, ax
+
+    CALL _start
+
+    HLT
+

anasos-kernel/bootloader/boot.asm

@@ -0,0 +1,138 @@
+GLOBAL start
+EXTERN long_mode_start
+
+SECTION .text
+BITS 32
+
+start:
+    MOV esp, stack_top
+    CALL check_multiboot
+    call check_cpuid
+    CALL check_long_mode
+
+    CALL setup_page_tables
+    CALL enable_paging
+
+    LGDT [gdt64.pointer]
+    JMP gdt64.code_segment:long_mode_start
+
+    HLT
+
+check_multiboot:
+    CMP eax, 0x36d76289
+    JNE .no_multiboot
+    RET
+.no_multiboot:
+    MOV al, "M"
+    JMP error
+
+check_cpuid:
+    PUSHFD
+    POP eax
+    MOV ecx, eax
+    XOR eax, 1 << 21
+    PUSH eax
+    POPFD
+    PUSHFD
+    POP eax
+    PUSH ecx
+    POPFD
+    CMP eax, ecx
+    JE .no_cpuid
+    RET
+.no_cpuid:
+    MOV al, "C"
+    JMP error
+
+check_long_mode:
+    MOV eax, 0x80000000
+    CPUID
+    CMP eax, 0x80000001
+    JB .no_long_mode
+
+    MOV eax, 0x80000001
+    CPUID
+    TEST edx, 1 << 29
+    JZ .no_long_mode
+
+    RET
+.no_long_mode:
+    MOV al, "L"
+    JMP error
+
+setup_page_tables:
+    ; identity maping (a phisical addres is linked to the same virtual addres)
+
+    MOV eax, page_table_l3
+    OR eax, 0b11 ; present, writable
+    MOV [page_table_l4], eax
+
+    MOV eax, page_table_l2
+    OR eax, 0b11 ; present, writable
+    MOV [page_table_l3], eax
+
+    MOV ecx, 0 ; counter
+.loop_setup_page_tables:
+
+    MOV eax, 0x200000  ; 2MiB
+    MUL ecx
+    OR eax, 0b10000011 ; huge-page, present, writable
+    MOV [page_table_l2 + ecx * 8], eax
+
+    INC ecx
+    CMP ecx, 512 ; checks if the whole table is mapped
+    JNE .loop_setup_page_tables
+
+    RET
+
+enable_paging:
+    ; pass the page table location to the cpu
+    MOV eax, page_table_l4
+    MOV cr3, eax
+
+    ; enable Phisical Address Extension (PAE)
+    MOV eax, cr4
+    OR eax, 1 << 5
+    MOV cr4, eax
+
+    ; enable long mode
+    MOV ecx, 0xC0000080
+    RDMSR ; Read Model Specific Register instruction
+    OR eax, 1 << 8
+    WRMSR ; Write Model Specific Register instruction
+
+    ; enable paging
+    MOV eax, cr0
+    OR eax, 1 << 31
+    MOV cr0, eax
+
+    RET
+
+error:
+    ; print "ERR: X", where X is the error code
+    MOV dword [0xB8000], 0x4F524F45
+    MOV dword [0xB8004], 0x4F3A4F52
+    MOV dword [0xB8008], 0x4F204F20
+    MOV byte  [0xB800C], al
+    HLT
+
+SECTION .bss
+ALIGN 4096
+page_table_l4:
+    RESB 4096
+page_table_l3:
+    RESB 4096
+page_table_l2:
+    RESB 4096
+stack_bottom:
+    RESB 4096 * 4 ; bytes reserved for stack
+stack_top:
+
+SECTION .rodata
+gdt64:
+    dq 0 ; zero entry
+.code_segment: EQU $ - gdt64
+    dq (1 << 43) | (1 << 44) | (1 << 47) | (1 << 53) ; code segment 
+.pointer:
+    dw $ - gdt64 - 1
+    dq gdt64

anasos-kernel/bootloader/header.asm

@@ -0,0 +1,16 @@
+SECTION .multiboot_header
+header_start:
+	; magic number
+	DD 0xe85250d6 ; multiboot2
+	; architecture
+	DD 0 ; protected mode i386
+	; header length
+	DD header_end - header_start
+	; checksum
+	DD 0x100000000 - (0xe85250d6 + 0 + (header_end - header_start))
+
+	; end tag
+	DW 0
+	DW 0
+	DD 8
+header_end:

anasos-kernel/build.rs

@@ -0,0 +1,45 @@
+use std::env;
+use std::process::Command;
+
+fn main() {
+    let target_dir: String = env::var("OUT_DIR").unwrap(); 
+
+    let boot_o_path: String = format!("{}/boot.o", target_dir);
+    let boot_64_o_path: String = format!("{}/boot-64.o", target_dir);
+    let header_o_path = format!("{}/header.o", target_dir);
+
+
+    let status_boot = Command::new("nasm")
+        .args(&["-f", "elf64", "bootloader/boot.asm", "-o", &boot_o_path])
+        .status()
+        .expect("Failed to assemble boot.asm");
+
+    if !status_boot.success() {
+        panic!("Assembly of boot.asm failed with status: {}", status_boot);
+    }
+
+    let status_boot_64 = Command::new("nasm")
+        .args(&["-f", "elf64", "bootloader/boot-64.asm", "-o", &boot_64_o_path])
+        .status()
+        .expect("Failed to assemble boot-64.asm");
+
+    if !status_boot_64.success() {
+        panic!("Assembly of boot.asm failed with status: {}", status_boot_64);
+    }
+
+    let status_header = Command::new("nasm")
+        .args(&["-f", "elf64", "bootloader/header.asm", "-o", &header_o_path])
+        .status()
+        .expect("Failed to assemble header.asm");
+
+    if !status_header.success() {
+        panic!("Assembly of header.asm failed with status: {}", status_header);
+    }
+
+
+    // Custom linker arguments
+    println!("cargo:rustc-link-arg=-Tlinker.ld");
+    println!("cargo:rustc-link-arg={}", boot_o_path);
+    println!("cargo:rustc-link-arg={}", boot_64_o_path);
+    println!("cargo:rustc-link-arg={}", header_o_path);
+}