diff options
Diffstat (limited to 'src/kernel')
| -rw-r--r-- | src/kernel/boot.asm | 65 | ||||
| -rw-r--r-- | src/kernel/graphics/vesa.c | 4 | ||||
| -rw-r--r-- | src/kernel/kernel.c | 4 | ||||
| -rw-r--r-- | src/kernel/linker.ld | 52 | ||||
| -rw-r--r-- | src/kernel/paging/paging.c | 2 | ||||
| -rw-r--r-- | src/kernel/system.h | 2 |
6 files changed, 62 insertions, 67 deletions
diff --git a/src/kernel/boot.asm b/src/kernel/boot.asm index 2501ed9..0f967b7 100644 --- a/src/kernel/boot.asm +++ b/src/kernel/boot.asm @@ -1,44 +1,33 @@ -[bits 32] -global start +; The first section of the ELF will be used to locate the entry point. +section .ezlocation +dd _start -start: - mov esp, _sys_stack ; Points stack to stack area - jmp stublet +; Set stack +section .bss +align 16 +global STACK_BOTTOM +global STACK_TOP -; Align with 4 Bytes -ALIGN 4 -mboot: - ; Multiboot macros - MULTIBOOT_PAGE_ALIGN equ 1<<0 - MULTIBOOT_MEMORY_INFO equ 1<<1 - MULTIBOOT_AOUT_KLUDGE equ 1<<16 - MULTIBOOT_HEADER_MAGIC equ 0x1BADB002 - MULTIBOOT_HEADER_FLAGS equ MULTIBOOT_PAGE_ALIGN | MULTIBOOT_MEMORY_INFO | MULTIBOOT_AOUT_KLUDGE - MULTIBOOT_CHECKSUM equ -(MULTIBOOT_HEADER_MAGIC + MULTIBOOT_HEADER_FLAGS) - EXTERN code, bss, end +STACK_BOTTOM: +resb 0x4000 +STACK_TOP: - ; GRUB Multiboot header - dd MULTIBOOT_HEADER_MAGIC - dd MULTIBOOT_HEADER_FLAGS - dd MULTIBOOT_CHECKSUM - ; AOUT kludge - dd mboot - dd code - dd bss - dd end - dd start +section .text -; Endless loop +global _start extern kernel_main -stublet: - ; Load multiboot information - push esp - push ebx +_start: + mov esp, STACK_TOP + push ebx + push eax - cli - call kernel_main - jmp $ + call kernel_main + cli + +hlt_L: + hlt + jmp hlt_L %include "src/kernel/gdt/gdt.asm" @@ -68,7 +57,7 @@ switch_to_user: push test_user iret -; Store the stack -SECTION .bss - resb 0x2000 ; Reserve 8KiB -_sys_stack:
\ No newline at end of file +section .sizedetect +global ASM_KERNEL_END +ASM_KERNEL_END: + ; Kernel size detection diff --git a/src/kernel/graphics/vesa.c b/src/kernel/graphics/vesa.c index a43d486..447c447 100644 --- a/src/kernel/graphics/vesa.c +++ b/src/kernel/graphics/vesa.c @@ -98,7 +98,7 @@ void set_optimal_resolution() { uint16_t highest = 0; - for (uint16_t *mode = video_modes; *mode != 0xFFFF; mode++) { + /*for (uint16_t *mode = video_modes; *mode != 0xFFFF; mode++) { struct vbe_mode_info *mode_info = vbe_get_mode_info(*mode); if (mode_info == 0 || (mode_info->attributes & 0x90) != 0x90 || @@ -125,7 +125,7 @@ void set_optimal_resolution() { vbe_bpl = mode_info->bpp >> 3; fb = (unsigned char *) mode_info->framebuffer; } - } + }*/ if (highest == 0) { serial_write("Mode detection failed!\nTrying common modes...\n"); diff --git a/src/kernel/kernel.c b/src/kernel/kernel.c index c2ab13e..214ecf0 100644 --- a/src/kernel/kernel.c +++ b/src/kernel/kernel.c @@ -36,12 +36,12 @@ void kernel_main(struct multiboot *mboot_ptr) { get_smbios(); // Setup initial ramdisk - assert(mboot_ptr->mods_count > 0); + /*assert(mboot_ptr->mods_count > 0); uint32_t initrd_location = *((uint32_t *) mboot_ptr->mods_addr); uint32_t initrd_end = *(uint32_t *) (mboot_ptr->mods_addr + 4); paging_set_used(0, (initrd_end >> 12) + 1); fs_root = initialise_initrd(initrd_location); - initrd_test(); + initrd_test();*/ // User mode! /* COMMENTED FOR DEVELOPMENT OF KERNEL diff --git a/src/kernel/linker.ld b/src/kernel/linker.ld index 2abbaeb..9062b27 100644 --- a/src/kernel/linker.ld +++ b/src/kernel/linker.ld @@ -1,27 +1,33 @@ -ENTRY(start) -SECTIONS -{ - .text 0x100000 : - { - code = .; _code = .; __code = .; - *(.text) - . = ALIGN(4096); - } +ENTRY(_start) - .data : - { - data = .; _data = .; __data = .; - *(.data) - *(.rodata) - . = ALIGN(4096); - } +/* Where the sections of the object files will be put in the final image */ +SECTIONS { + /* Begin @ 1 MB */ + . = 1M; - .bss : - { - bss = .; _bss = .; __bss = .; - *(.bss) - . = ALIGN(4096); - } + /* Put the multiboot header. Next, the .text section. */ + .text BLOCK(4K) : ALIGN(4K) { + *(.ezlocation) + *(.text) + } - end = .; _end = .; __end = .; + /* 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) + } + + .sizedetect BLOCK(4K) : ALIGN(4K) { + *(.sizedetect) + } } diff --git a/src/kernel/paging/paging.c b/src/kernel/paging/paging.c index bb3b1df..a6bf5cc 100644 --- a/src/kernel/paging/paging.c +++ b/src/kernel/paging/paging.c @@ -19,7 +19,7 @@ void paging_install() { // TODO: Calculate max memory paging_set_present(0, 0x1000000); - paging_set_used(0, ((uint32_t) end >> 12) + 1); + paging_set_used(0, ((uint32_t) ASM_KERNEL_END >> 12) + 1); paging_enable(); vga_log("Installed paging", 4); diff --git a/src/kernel/system.h b/src/kernel/system.h index f87a8d5..18a013b 100644 --- a/src/kernel/system.h +++ b/src/kernel/system.h @@ -4,7 +4,7 @@ /** * The kernel end */ -extern void *end; +extern void *ASM_KERNEL_END; /** * Initialize the basic features of the OS |