diff options
| -rw-r--r-- | src/Makefile | 2 | ||||
| -rw-r--r-- | src/data/boot/limine.conf | 2 | ||||
| -rw-r--r-- | src/sys/arch/amd64/conf/sys.ld | 59 | ||||
| -rw-r--r-- | src/sys/arch/amd64/locore.S | 70 | ||||
| -rw-r--r-- | src/sys/include/arch/amd64/uart.h | 6 | ||||
| -rw-r--r-- | src/sys/kern/kern_init.c | 2 |
6 files changed, 69 insertions, 72 deletions
diff --git a/src/Makefile b/src/Makefile index 0c763af..a8c56b2 100644 --- a/src/Makefile +++ b/src/Makefile @@ -46,7 +46,7 @@ image: .PHONY: qemu-amd64 run: - qemu-system-$(TARGET) $(QEMU_FLAGS) + qemu-system-x86_64 $(QEMU_FLAGS) .PHONY: clean clean: diff --git a/src/data/boot/limine.conf b/src/data/boot/limine.conf index ed29e4b..8f89753 100644 --- a/src/data/boot/limine.conf +++ b/src/data/boot/limine.conf @@ -6,6 +6,6 @@ term_background: 40000000 resolution: 1280x720 /e0 - protocol: multiboot2 + protocol: limine kernel_path: boot():/boot/l5 module_path: boot():/boot/initrd.omar diff --git a/src/sys/arch/amd64/conf/sys.ld b/src/sys/arch/amd64/conf/sys.ld index b5d1cf0..5b7c7fc 100644 --- a/src/sys/arch/amd64/conf/sys.ld +++ b/src/sys/arch/amd64/conf/sys.ld @@ -1,35 +1,46 @@ -ENTRY(_start) +OUTPUT_FORMAT(elf64-x86-64) +OUTPUT_ARCH(i386:x86-64) +ENTRY(__bsp_entry) -SECTIONS { - . = 1M; +PHDRS +{ + text PT_LOAD FLAGS((1 << 0) | (1 << 2)) ; + rodata PT_LOAD FLAGS((1 << 2)) ; + data PT_LOAD FLAGS((1 << 1) | (1 << 2)) ; +} - .boot : - { - *(.multiboot_header) - } +SECTIONS +{ + . = 0xFFFFFFFF80000000; - . = ALIGN(4K); - .text : - { + .text : { *(.text .text.*) - } + } :text - . = ALIGN(4K); - .rodata : - { + . += CONSTANT(MAXPAGESIZE); + + .rodata : { *(.rodata .rodata.*) - } + } :rodata - . = ALIGN(4K); - .data : - { - *(.data .data.*) - } + . += CONSTANT(MAXPAGESIZE); - . = ALIGN(4K); - .bss : - { + .data : { + *(.data) + } :data + + .bss : { + *(COMMON) *(.bss .bss.*) + } :data + + . = ALIGN(64); + .data.cacheline_aligned : { + *(.data.cacheline_aligned) } -} + /DISCARD/ : { + *(.eh_frame .eh_frame.*) + *(.note .note.*) + } +} diff --git a/src/sys/arch/amd64/locore.S b/src/sys/arch/amd64/locore.S index 5f7c3df..3b29733 100644 --- a/src/sys/arch/amd64/locore.S +++ b/src/sys/arch/amd64/locore.S @@ -1,42 +1,32 @@ - .set MAGIC, 0xe85250d6 - .set ARCH, 0x00 // i386, protected mode - .set LEN, hdr_end - hdr_start - .set CHECKSUM, 0x100000000 - (0xe85250d6 + 0 + (hdr_end - hdr_start)) +/* + * Copyright (c) 2025 Ian Marco Moffett and L5 engineers + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the project nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ - .section .multiboot - .align 4 -hdr_start: - .long MAGIC - .long ARCH - .long LEN - .long CHECKSUM -hdr_end: - -fbtag_start: - .word 5 // Type - .word 1 // Flags - .long fbtag_end - fbtag_start // Length - .long 800 // Width - .long 600 // Height - .long 32 // Depth -fbtag_end: - - .align 8 -endtag: - .word 0 - .word 0 - .word 8 - - .text - .code32 - .globl _start -_start: - cli - mov stack_bottom, %esp - push %ebx - push %eax + .globl __bsp_entry +__bsp_entry: jmp main - - .section .bss -stack_bottom: - .fill 4096 * 16, 0 diff --git a/src/sys/include/arch/amd64/uart.h b/src/sys/include/arch/amd64/uart.h deleted file mode 100644 index 8c3356a..0000000 --- a/src/sys/include/arch/amd64/uart.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef _MACHINE_UART_H_ -#define _MACHINE_UART_H_ 1 - -#include <stdint.h> - -#endif /* !_MACHINE_UART_H_ */ diff --git a/src/sys/kern/kern_init.c b/src/sys/kern/kern_init.c index 10ffeae..6cf35f0 100644 --- a/src/sys/kern/kern_init.c +++ b/src/sys/kern/kern_init.c @@ -1,3 +1,5 @@ +#include <sys/cdefs.h> + /* * Kernel entrypoint */ |