From 0ee22520f50b4f006a554c79dd0e5f1d5d780d4d Mon Sep 17 00:00:00 2001 From: "Anna (navi) Figueiredo Gomes" Date: Sun, 7 Jan 2024 20:19:20 +0100 Subject: replace make with meson Signed-off-by: Anna (navi) Figueiredo Gomes --- Makefile | 29 --------- asm/boot.asm | 161 -------------------------------------------------- asm/long.asm | 171 ------------------------------------------------------ linker.ld | 62 -------------------- meson.build | 45 ++++++++++++++ src/asm/boot.asm | 161 ++++++++++++++++++++++++++++++++++++++++++++++++++ src/asm/long.asm | 171 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/nrvn.c | 10 ++-- toolchain.txt | 13 +++++ util/build_iso.sh | 6 ++ util/grub.cfg | 3 + util/linker.ld | 62 ++++++++++++++++++++ 12 files changed, 465 insertions(+), 429 deletions(-) delete mode 100644 Makefile delete mode 100644 asm/boot.asm delete mode 100644 asm/long.asm delete mode 100644 linker.ld create mode 100644 meson.build create mode 100644 src/asm/boot.asm create mode 100644 src/asm/long.asm create mode 100644 toolchain.txt create mode 100755 util/build_iso.sh create mode 100644 util/grub.cfg create mode 100644 util/linker.ld diff --git a/Makefile b/Makefile deleted file mode 100644 index b6abe96..0000000 --- a/Makefile +++ /dev/null @@ -1,29 +0,0 @@ -all: outdir out/nrvn.bin - -out/nrvn.bin: out/boot.o out/nrvn.o out/long.o out/vga.o out/idt.o out/mem.o out/acpi.o out/ps2.o out/pic.o out/memory.o - x86_64-pc-elf-gcc -T linker.ld -o $@ -ffreestanding -nostdlib -lgcc $^ -g - -out/boot.o: asm/boot.asm - nasm -felf64 $^ -o $@ - -out/long.o: asm/long.asm - nasm -felf64 $^ -o $@ - -out/%.o: src/%.c - x86_64-pc-elf-gcc -c $^ -o $@ -I include -ffreestanding -Wall -Wextra -g - -iso: all - cp out/nrvn.bin grub/boot/nrvn.bin - grub-mkrescue -o out/nrvn.iso grub - -run: iso - qemu-system-x86_64 -cdrom out/nrvn.iso - -debug: all - qemu-system-x86_64 -kernel out/nrvn.bin -s -S - -outdir: - mkdir -p out - -clean: - rm -rf out diff --git a/asm/boot.asm b/asm/boot.asm deleted file mode 100644 index ae68761..0000000 --- a/asm/boot.asm +++ /dev/null @@ -1,161 +0,0 @@ -[BITS 32] - -; Declare constants for the multiboot header. -MBALIGN equ 1 << 0 ; align loaded modules on page boundaries -MEMINFO equ 1 << 1 ; provide memory map -MBFLAGS equ MBALIGN | MEMINFO ; this is the Multiboot 'flag' field -MAGIC equ 0x1BADB002 ; 'magic number' lets bootloader find the header -CHECKSUM equ -(MAGIC + MBFLAGS) ; checksum of above, to prove we are multiboot - -; Declare a multiboot header that marks the program as a kernel. These are magic -; values that are documented in the multiboot standard. The bootloader will -; search for this signature in the first 8 KiB of the kernel file, aligned at a -; 32-bit boundary. The signature is in its own section so the header can be -; forced to be within the first 8 KiB of the kernel file. -section .multiboot -align 4 - dd MAGIC - dd MBFLAGS - dd CHECKSUM - -section .bootstrap - -present equ 1 << 7 -not_sys equ 1 << 4 -exec equ 1 << 3 -cd equ 1 << 2 -rw equ 1 << 1 -access equ 1 << 0 - -gran_4k equ 1 << 7 -sz_32 equ 1 << 6 -long_m equ 1 << 5 - -global gdt.ptr -gdt: -.null: equ $ - gdt - dq 0 -.code: equ $ - gdt - dd 0xffff - db 0 - db present | not_sys | exec | rw - db gran_4k | long_m | 0xf - db 0 -.data: equ $ - gdt - dd 0xffff - db 0 - db present | not_sys | rw - db gran_4k | sz_32 | 0xf - db 0 -.ptr: - dw $ - gdt - 1 - dq gdt - -global bootstrap -bootstrap: - - mov dword [multiboot_magic], eax - mov dword [multiboot_header], ebx - - mov eax, cr0 - and eax, ~(1 << 31) - mov cr0, eax - - mov edi, pml4 ;0x1000 - mov cr3, edi - xor eax, eax - mov ecx, 1024 - rep stosd - - mov edi, 0x2000 - mov ecx, 4096 - rep stosd - - mov edi, cr3 - - mov dword [edi], 0x2003 - mov edi, 0x2000 - mov dword [edi], 0x3003 - add edi, 0x1000 - mov dword [edi], 0x4003 - mov dword [edi + 8], 0x5003 - add edi, 0x1000 - - mov ebx, 0x00000003 - mov ecx, 512 - -.set_entry: - mov dword [edi], ebx - add ebx, 0x1000 - add edi, 8 - loop .set_entry - - mov edi, 0x5000 - mov ecx, 512 - -.set_entry_2: - mov dword [edi], ebx - add ebx, 0x1000 - add edi, 8 - loop .set_entry_2 - - mov eax, cr4 - or eax, 1 << 5 - mov cr4, eax - - mov ecx, 0xc0000080 - rdmsr - or eax, 1 << 8 | 1 << 0 - wrmsr - - mov eax, cr0 - or eax, 1 << 31 - mov cr0, eax - - lgdt [gdt.ptr] - - mov ax, gdt.data - mov ds, ax - mov es, ax - mov fs, ax - mov gs, ax - mov ss, ax - - extern start - jmp gdt.code:start - -global set_pml4 -set_pml4: - mov ecx, 0xC000080 - rdmsr - and eax, ~(1 << 8) - wrmsr - - mov eax, cr0 - and eax, ~(1 << 31) - mov cr0, eax - - mov cr3, edi - - mov ecx, 0xC000080 - rdmsr - or eax, 1 << 8 - wrmsr - - mov eax, cr0 - or eax, 1 << 31 - mov cr0, eax - - retf - -section .data -align 16 -global multiboot_header -multiboot_header: dq 0 -global multiboot_magic -multiboot_magic: dq 0 - -section .bss -global pml4 -align 4096 -pml4: resq 512 diff --git a/asm/long.asm b/asm/long.asm deleted file mode 100644 index 829d582..0000000 --- a/asm/long.asm +++ /dev/null @@ -1,171 +0,0 @@ -; The multiboot standard does not define the value of the stack pointer register -; (esp) and it is up to the kernel to provide a stack. This allocates room for a -; small stack by creating a symbol at the bottom of it, then allocating 16384 -; bytes for it, and finally creating a symbol at the top. The stack grows -; downwards on x86. The stack is in its own section so it can be marked nobits, -; which means the kernel file is smaller because it does not contain an -; uninitialized stack. The stack on x86 must be 16-byte aligned according to the -; System V ABI standard and de-facto extensions. The compiler will assume the -; stack is properly aligned and failure to align the stack will result in -; undefined behavior. -section .bss - align 16 -stack_bottom: - resb 16384 ; 16 KiB -stack_top: - -; The linker script specifies _start as the entry point to the kernel and the -; bootloader will jump to this position once the kernel has been loaded. It -; doesn't make sense to return from this function as the bootloader is gone. -; Declare _start as a function symbol with the given symbol size. -section .text - -global idt_load -extern idt_ptr -idt_load: - lidt [idt_ptr] - ret - -%macro isr 1-* - %rep %0 - isr_%+%1: - cli - push qword 0 - push qword %1 - jmp isr_common - %rotate 1 - %endrep -%endmacro - -%macro isr_err 1-* - %rep %0 - isr_%+%1: - cli - push qword %1 - jmp isr_common - %rotate 1 - %endrep -%endmacro - -isr 0, 1, 2, 3, 4, 5, 6, 7, 9, 15, 16, 18, 19, 20, 22, 23, 24, 25, 26, 27, 28, 31 -isr_err 8, 10, 11, 12, 13, 14, 17, 21, 29, 30 -isr 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47 - -extern interrupt_handler -isr_common: - push rdi - mov rdi, [rsp + 8] - push rsi - mov rsi, [rsp + 24] - push rax - push rdx - push rcx - push r8 - push r9 - push r10 - push r11 - - call interrupt_handler - - pop r11 - pop r10 - pop r9 - pop r8 - pop rcx - pop rdx - pop rax - pop rsi - pop rdi - - add rsp, 16 - iretq - -global isr_table -isr_table: - %assign i 0 - %rep 48 - dq isr_%+i - %assign i i+1 - %endrep - -global toggle_interrupts -toggle_interrupts: - cmp rdi, 0x0 - je .disable - sti - ret -.disable - cli - ret - -global start:function (start.end - start) -start: - ; The bootloader has loaded us into 32-bit protected mode on a x86 - ; machine. Interrupts are disabled. Paging is disabled. The processor - ; state is as defined in the multiboot standard. The kernel has full - ; control of the CPU. The kernel can only make use of hardware features - ; and any code it provides as part of itself. There's no printf - ; function, unless the kernel provides its own header and a - ; printf implementation. There are no security restrictions, no - ; safeguards, no debugging mechanisms, only what the kernel provides - ; itself. It has absolute and complete power over the - ; machine. - mov rsp, stack_top - - ; To set up a stack, we set the esp register to point to the top of our - ; stack (as it grows downwards on x86 systems). This is necessarily done - ; in assembly as languages such as C cannot function without a stack. - ;mov rsp, stack_top - - ; This is a good place to initialize crucial processor state before the - ; high-level kernel is entered. It's best to minimize the early - ; environment where crucial features are offline. Note that the - ; processor is not fully initialized yet: Features such as floating - ; point instructions and instruction set extensions are not initialized - ; yet. The GDT should be loaded here. Paging should be enabled here. - ; C++ features such as global constructors and exceptions will require - ; runtime support to work as well. - - ; Enter the high-level kernel. The ABI requires the stack is 16-byte - ; aligned at the time of the call instruction (which afterwards pushes - ; the return pointer of size 4 bytes). The stack was originally 16-byte - ; aligned above and we've since pushed a multiple of 16 bytes to the - ; stack since (pushed 0 bytes so far) and the alignment is thus - ; preserved and the call is well defined. - ; note, that if you are building on Windows, C functions may have "_" prefix in assembly: _kernel_main - - mov rax, 0x1 - cpuid - test edx, 1 << 25 - jz .no_sse - - mov rax, cr0 - and ax, 0xfffb - or ax, 0x2 - mov cr0, rax - mov rax, cr4 - or ax, 3 << 9 - mov cr4, rax - -.no_sse: - extern kernel_main - call kernel_main - - ; If the system has nothing more to do, put the computer into an - ; infinite loop. To do that: - ; 1) Disable interrupts with cli (clear interrupt enable in eflags). - ; They are already disabled by the bootloader, so this is not needed. - ; Mind that you might later enable interrupts and return from - ; kernel_main (which is sort of nonsensical to do). - ; 2) Wait for the next interrupt to arrive with hlt (halt instruction). - ; Since they are disabled, this will lock up the computer. - ; 3) Jump to the hlt instruction if it ever wakes up due to a - ; non-maskable interrupt occurring or due to system management mode. - int 0 -.hang: hlt - jmp .hang -.end: - -section .end -global kernel_end -kernel_end: diff --git a/linker.ld b/linker.ld deleted file mode 100644 index 87fb6c4..0000000 --- a/linker.ld +++ /dev/null @@ -1,62 +0,0 @@ -/* The bootloader will look at this image and start execution at the symbol - designated as the entry point. */ -ENTRY(bootstrap) - -/* Tell where the various sections of the object files will be put in the final - kernel image. */ -SECTIONS -{ - /* It used to be universally recommended to use 1MiB as a start offset, - as it was effectively guaranteed to be available under BIOS systems. - However, UEFI has made things more complicated, and experimental data - strongly suggests that 2M is a safer place to load. In 2016, a new - feature was introduced to the multiboot2 spec to inform bootloaders - that a kernel can be loaded anywhere within a range of addresses and - will be able to relocations to itself to run from such a loader-selected - address, in order to give the loader freedom in selecting a span of - memory which is verified to be available by the firmware, in order to - work around this issue. This does not use that feature, so 2M was - chosen as a safer option than the traditional 1M. */ - . = 2M; - - .bootstrap BLOCK(4K) : ALIGN(4K) - { - *(.multiboot) - *(.bootstrap) - } - - /* First put the multiboot header, as it is required to be put very early - early in the image or the bootloader won't recognize the file format. - Next we'll put the .text section. */ - .text BLOCK(4K) : ALIGN(4K) - { - *(.text) - } - - /* Read-only data. */ - .rodata BLOCK(4K) : ALIGN(4K) - { - *(.rodata) - } - - /* Read-write data (initialized) */ - .data BLOCK(4K) : ALIGN(4K) - { - *(.data) - } - - /* Read-write data (uninitialized) and stack */ - .bss BLOCK(4K) : ALIGN(4K) - { - *(COMMON) - *(.bss) - } - - .end BLOCK(4K) : ALIGN(4K) - { - *(.end) - } - - /* The compiler may produce other sections, by default it will put them in - a segment with the same name. Simply add stuff here as needed. */ -} diff --git a/meson.build b/meson.build new file mode 100644 index 0000000..76539ce --- /dev/null +++ b/meson.build @@ -0,0 +1,45 @@ +project('nrvn', ['c', 'nasm'], + version : '0.1', + default_options : [ + 'warning_level=3', + 'b_pie=false', + 'b_staticpic=false' + ]) + +if not meson.is_cross_build() + error('must be invoked with "meson setup --cross-file=toolchain.txt"') +endif + +files = [ + 'src/asm/boot.asm', + 'src/asm/long.asm', + 'src/nrvn.c', + 'src/vga.c', + 'src/idt.c', + 'src/mem.c', + 'src/acpi.c', + 'src/ps2.c', + 'src/pic.c', + 'src/memory.c' +] + +ld_args = [ + '-ffreestanding', + '-nostdlib', + '-T', + join_paths(meson.current_source_dir(), 'util', 'linker.ld') +] + +kernel = executable('nrvn', files, + c_args: ['-ffreestanding'], + nasm_args: ['-felf64'], + link_args: ld_args, + include_directories: 'include/') + + +iso = custom_target('iso', + input: [import('fs').copyfile('util/grub.cfg'), kernel], + output: 'nrvn.iso', + command: ['util/build_iso.sh', '@PRIVATE_DIR@', '@INPUT@', '@OUTPUT@']) + +run_target('run', command: [find_program('qemu'), '-cdrom', iso, '-m', '2G']) diff --git a/src/asm/boot.asm b/src/asm/boot.asm new file mode 100644 index 0000000..ae68761 --- /dev/null +++ b/src/asm/boot.asm @@ -0,0 +1,161 @@ +[BITS 32] + +; Declare constants for the multiboot header. +MBALIGN equ 1 << 0 ; align loaded modules on page boundaries +MEMINFO equ 1 << 1 ; provide memory map +MBFLAGS equ MBALIGN | MEMINFO ; this is the Multiboot 'flag' field +MAGIC equ 0x1BADB002 ; 'magic number' lets bootloader find the header +CHECKSUM equ -(MAGIC + MBFLAGS) ; checksum of above, to prove we are multiboot + +; Declare a multiboot header that marks the program as a kernel. These are magic +; values that are documented in the multiboot standard. The bootloader will +; search for this signature in the first 8 KiB of the kernel file, aligned at a +; 32-bit boundary. The signature is in its own section so the header can be +; forced to be within the first 8 KiB of the kernel file. +section .multiboot +align 4 + dd MAGIC + dd MBFLAGS + dd CHECKSUM + +section .bootstrap + +present equ 1 << 7 +not_sys equ 1 << 4 +exec equ 1 << 3 +cd equ 1 << 2 +rw equ 1 << 1 +access equ 1 << 0 + +gran_4k equ 1 << 7 +sz_32 equ 1 << 6 +long_m equ 1 << 5 + +global gdt.ptr +gdt: +.null: equ $ - gdt + dq 0 +.code: equ $ - gdt + dd 0xffff + db 0 + db present | not_sys | exec | rw + db gran_4k | long_m | 0xf + db 0 +.data: equ $ - gdt + dd 0xffff + db 0 + db present | not_sys | rw + db gran_4k | sz_32 | 0xf + db 0 +.ptr: + dw $ - gdt - 1 + dq gdt + +global bootstrap +bootstrap: + + mov dword [multiboot_magic], eax + mov dword [multiboot_header], ebx + + mov eax, cr0 + and eax, ~(1 << 31) + mov cr0, eax + + mov edi, pml4 ;0x1000 + mov cr3, edi + xor eax, eax + mov ecx, 1024 + rep stosd + + mov edi, 0x2000 + mov ecx, 4096 + rep stosd + + mov edi, cr3 + + mov dword [edi], 0x2003 + mov edi, 0x2000 + mov dword [edi], 0x3003 + add edi, 0x1000 + mov dword [edi], 0x4003 + mov dword [edi + 8], 0x5003 + add edi, 0x1000 + + mov ebx, 0x00000003 + mov ecx, 512 + +.set_entry: + mov dword [edi], ebx + add ebx, 0x1000 + add edi, 8 + loop .set_entry + + mov edi, 0x5000 + mov ecx, 512 + +.set_entry_2: + mov dword [edi], ebx + add ebx, 0x1000 + add edi, 8 + loop .set_entry_2 + + mov eax, cr4 + or eax, 1 << 5 + mov cr4, eax + + mov ecx, 0xc0000080 + rdmsr + or eax, 1 << 8 | 1 << 0 + wrmsr + + mov eax, cr0 + or eax, 1 << 31 + mov cr0, eax + + lgdt [gdt.ptr] + + mov ax, gdt.data + mov ds, ax + mov es, ax + mov fs, ax + mov gs, ax + mov ss, ax + + extern start + jmp gdt.code:start + +global set_pml4 +set_pml4: + mov ecx, 0xC000080 + rdmsr + and eax, ~(1 << 8) + wrmsr + + mov eax, cr0 + and eax, ~(1 << 31) + mov cr0, eax + + mov cr3, edi + + mov ecx, 0xC000080 + rdmsr + or eax, 1 << 8 + wrmsr + + mov eax, cr0 + or eax, 1 << 31 + mov cr0, eax + + retf + +section .data +align 16 +global multiboot_header +multiboot_header: dq 0 +global multiboot_magic +multiboot_magic: dq 0 + +section .bss +global pml4 +align 4096 +pml4: resq 512 diff --git a/src/asm/long.asm b/src/asm/long.asm new file mode 100644 index 0000000..829d582 --- /dev/null +++ b/src/asm/long.asm @@ -0,0 +1,171 @@ +; The multiboot standard does not define the value of the stack pointer register +; (esp) and it is up to the kernel to provide a stack. This allocates room for a +; small stack by creating a symbol at the bottom of it, then allocating 16384 +; bytes for it, and finally creating a symbol at the top. The stack grows +; downwards on x86. The stack is in its own section so it can be marked nobits, +; which means the kernel file is smaller because it does not contain an +; uninitialized stack. The stack on x86 must be 16-byte aligned according to the +; System V ABI standard and de-facto extensions. The compiler will assume the +; stack is properly aligned and failure to align the stack will result in +; undefined behavior. +section .bss + align 16 +stack_bottom: + resb 16384 ; 16 KiB +stack_top: + +; The linker script specifies _start as the entry point to the kernel and the +; bootloader will jump to this position once the kernel has been loaded. It +; doesn't make sense to return from this function as the bootloader is gone. +; Declare _start as a function symbol with the given symbol size. +section .text + +global idt_load +extern idt_ptr +idt_load: + lidt [idt_ptr] + ret + +%macro isr 1-* + %rep %0 + isr_%+%1: + cli + push qword 0 + push qword %1 + jmp isr_common + %rotate 1 + %endrep +%endmacro + +%macro isr_err 1-* + %rep %0 + isr_%+%1: + cli + push qword %1 + jmp isr_common + %rotate 1 + %endrep +%endmacro + +isr 0, 1, 2, 3, 4, 5, 6, 7, 9, 15, 16, 18, 19, 20, 22, 23, 24, 25, 26, 27, 28, 31 +isr_err 8, 10, 11, 12, 13, 14, 17, 21, 29, 30 +isr 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47 + +extern interrupt_handler +isr_common: + push rdi + mov rdi, [rsp + 8] + push rsi + mov rsi, [rsp + 24] + push rax + push rdx + push rcx + push r8 + push r9 + push r10 + push r11 + + call interrupt_handler + + pop r11 + pop r10 + pop r9 + pop r8 + pop rcx + pop rdx + pop rax + pop rsi + pop rdi + + add rsp, 16 + iretq + +global isr_table +isr_table: + %assign i 0 + %rep 48 + dq isr_%+i + %assign i i+1 + %endrep + +global toggle_interrupts +toggle_interrupts: + cmp rdi, 0x0 + je .disable + sti + ret +.disable + cli + ret + +global start:function (start.end - start) +start: + ; The bootloader has loaded us into 32-bit protected mode on a x86 + ; machine. Interrupts are disabled. Paging is disabled. The processor + ; state is as defined in the multiboot standard. The kernel has full + ; control of the CPU. The kernel can only make use of hardware features + ; and any code it provides as part of itself. There's no printf + ; function, unless the kernel provides its own header and a + ; printf implementation. There are no security restrictions, no + ; safeguards, no debugging mechanisms, only what the kernel provides + ; itself. It has absolute and complete power over the + ; machine. + mov rsp, stack_top + + ; To set up a stack, we set the esp register to point to the top of our + ; stack (as it grows downwards on x86 systems). This is necessarily done + ; in assembly as languages such as C cannot function without a stack. + ;mov rsp, stack_top + + ; This is a good place to initialize crucial processor state before the + ; high-level kernel is entered. It's best to minimize the early + ; environment where crucial features are offline. Note that the + ; processor is not fully initialized yet: Features such as floating + ; point instructions and instruction set extensions are not initialized + ; yet. The GDT should be loaded here. Paging should be enabled here. + ; C++ features such as global constructors and exceptions will require + ; runtime support to work as well. + + ; Enter the high-level kernel. The ABI requires the stack is 16-byte + ; aligned at the time of the call instruction (which afterwards pushes + ; the return pointer of size 4 bytes). The stack was originally 16-byte + ; aligned above and we've since pushed a multiple of 16 bytes to the + ; stack since (pushed 0 bytes so far) and the alignment is thus + ; preserved and the call is well defined. + ; note, that if you are building on Windows, C functions may have "_" prefix in assembly: _kernel_main + + mov rax, 0x1 + cpuid + test edx, 1 << 25 + jz .no_sse + + mov rax, cr0 + and ax, 0xfffb + or ax, 0x2 + mov cr0, rax + mov rax, cr4 + or ax, 3 << 9 + mov cr4, rax + +.no_sse: + extern kernel_main + call kernel_main + + ; If the system has nothing more to do, put the computer into an + ; infinite loop. To do that: + ; 1) Disable interrupts with cli (clear interrupt enable in eflags). + ; They are already disabled by the bootloader, so this is not needed. + ; Mind that you might later enable interrupts and return from + ; kernel_main (which is sort of nonsensical to do). + ; 2) Wait for the next interrupt to arrive with hlt (halt instruction). + ; Since they are disabled, this will lock up the computer. + ; 3) Jump to the hlt instruction if it ever wakes up due to a + ; non-maskable interrupt occurring or due to system management mode. + int 0 +.hang: hlt + jmp .hang +.end: + +section .end +global kernel_end +kernel_end: diff --git a/src/nrvn.c b/src/nrvn.c index 84b297f..042ffd0 100644 --- a/src/nrvn.c +++ b/src/nrvn.c @@ -14,13 +14,13 @@ /* Check if the compiler thinks you are targeting the wrong operating system. */ #if defined(__linux__) -#error "You are not using a cross-compiler, you will most certainly run into trouble" +# error "You are not using a cross-compiler, you will most certainly run into trouble" #endif /* This tutorial will only work for the 32-bit ix86 targets. */ -//#if !defined(__i386__) | !defined(__x86_64__) -//#error "This tutorial needs to be compiled with a ix86-elf compiler" -//#endif +#if !defined(__x86_64__) +# error "This tutorial needs to be compiled with a ix86-elf compiler" +#endif void kernel_main(void) { vga_init(); @@ -45,8 +45,6 @@ void kernel_main(void) { asm volatile ("hlt"); } - // TODO -- fix acpi - vga_puts("initializing ps/2...\n"); if (ps2_init(NULL)) vga_puts("ps/2 initialized.\n"); diff --git a/toolchain.txt b/toolchain.txt new file mode 100644 index 0000000..a1dc80a --- /dev/null +++ b/toolchain.txt @@ -0,0 +1,13 @@ +[binaries] +c = 'x86_64-pc-elf-gcc' +cpp = 'x86_64-pc-elf-g++' +ar = 'x86_64-pc-elf-ar' +strip = 'x86_64-pc-elf-strip' +nasm = 'nasm' +qemu = 'qemu-system-x86_64' + +[host_machine] +system = 'linux' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' diff --git a/util/build_iso.sh b/util/build_iso.sh new file mode 100755 index 0000000..0ca346f --- /dev/null +++ b/util/build_iso.sh @@ -0,0 +1,6 @@ +#!/bin/sh + +mkdir -p "${1}/iso/boot/grub" +cp "$2" "${1}/iso/boot/grub" +cp "$3" "${1}/iso/boot/nrvn.bin" +grub-mkrescue -o "$4" "${1}/iso" diff --git a/util/grub.cfg b/util/grub.cfg new file mode 100644 index 0000000..e1d7e5c --- /dev/null +++ b/util/grub.cfg @@ -0,0 +1,3 @@ +menuentry "nrvn" { + multiboot /boot/nrvn.bin +} diff --git a/util/linker.ld b/util/linker.ld new file mode 100644 index 0000000..87fb6c4 --- /dev/null +++ b/util/linker.ld @@ -0,0 +1,62 @@ +/* The bootloader will look at this image and start execution at the symbol + designated as the entry point. */ +ENTRY(bootstrap) + +/* Tell where the various sections of the object files will be put in the final + kernel image. */ +SECTIONS +{ + /* It used to be universally recommended to use 1MiB as a start offset, + as it was effectively guaranteed to be available under BIOS systems. + However, UEFI has made things more complicated, and experimental data + strongly suggests that 2M is a safer place to load. In 2016, a new + feature was introduced to the multiboot2 spec to inform bootloaders + that a kernel can be loaded anywhere within a range of addresses and + will be able to relocations to itself to run from such a loader-selected + address, in order to give the loader freedom in selecting a span of + memory which is verified to be available by the firmware, in order to + work around this issue. This does not use that feature, so 2M was + chosen as a safer option than the traditional 1M. */ + . = 2M; + + .bootstrap BLOCK(4K) : ALIGN(4K) + { + *(.multiboot) + *(.bootstrap) + } + + /* First put the multiboot header, as it is required to be put very early + early in the image or the bootloader won't recognize the file format. + Next we'll put the .text section. */ + .text BLOCK(4K) : ALIGN(4K) + { + *(.text) + } + + /* Read-only data. */ + .rodata BLOCK(4K) : ALIGN(4K) + { + *(.rodata) + } + + /* Read-write data (initialized) */ + .data BLOCK(4K) : ALIGN(4K) + { + *(.data) + } + + /* Read-write data (uninitialized) and stack */ + .bss BLOCK(4K) : ALIGN(4K) + { + *(COMMON) + *(.bss) + } + + .end BLOCK(4K) : ALIGN(4K) + { + *(.end) + } + + /* The compiler may produce other sections, by default it will put them in + a segment with the same name. Simply add stuff here as needed. */ +} -- cgit v1.2.3