From 43d92e30ad3743b8d0ce6593c17892fe1a78a1e8 Mon Sep 17 00:00:00 2001 From: EmulatedSeasons <89668582+EmulatedSeasons@users.noreply.github.com> Date: Mon, 20 Jan 2025 18:23:02 -0500 Subject: moved limine.cpp stuff to kernel.cpp (and fixed framebuffer pixel drawing) --- kernel/arch/x86_64/arch_init.cpp | 19 +++++ kernel/arch/x86_64/limine.cpp | 146 --------------------------------------- kernel/framebuffer.cpp | 2 +- kernel/include/arch/arch_init.h | 6 ++ kernel/kernel.cpp | 135 +++++++++++++++++++++++++++++++----- 5 files changed, 143 insertions(+), 165 deletions(-) create mode 100644 kernel/arch/x86_64/arch_init.cpp delete mode 100644 kernel/arch/x86_64/limine.cpp create mode 100644 kernel/include/arch/arch_init.h diff --git a/kernel/arch/x86_64/arch_init.cpp b/kernel/arch/x86_64/arch_init.cpp new file mode 100644 index 0000000..eb0e442 --- /dev/null +++ b/kernel/arch/x86_64/arch_init.cpp @@ -0,0 +1,19 @@ +#include "gdt.h" +#include "idt.h" + +void arch_init() { + // setup gdt + SegDesc segs[5]; + GDTR gdtr{sizeof(struct SegDesc) * 5 - 1, (uint64_t)&segs}; + + gdt_entry(&segs[0], 0, 0, 0, 0); // null desc + gdt_entry(&segs[1], 0, 0xFFFFF, 0x9A, 0xA); // kcode + gdt_entry(&segs[2], 0, 0xFFFFF, 0x92, 0xA); // kdata + gdt_entry(&segs[3], 0, 0xFFFFF, 0xFA, 0xA); // ucode + gdt_entry(&segs[4], 0, 0xFFFFF, 0xF2, 0xA); // udata + + load_gdt(&gdtr); + reload_segments(); + + setup_idt(); +} \ No newline at end of file diff --git a/kernel/arch/x86_64/limine.cpp b/kernel/arch/x86_64/limine.cpp deleted file mode 100644 index 2fd518b..0000000 --- a/kernel/arch/x86_64/limine.cpp +++ /dev/null @@ -1,146 +0,0 @@ -#include -#include -#include -#include -#include -#include "gdt.h" -#include "idt.h" -#include -#include - -namespace { -__attribute__((used, section(".requests"))) -volatile LIMINE_BASE_REVISION(2); -} - -namespace { -__attribute__((used, section(".requests"))) -volatile limine_framebuffer_request framebuffer_request = { - .id = LIMINE_FRAMEBUFFER_REQUEST, - .revision = 0, - .response = nullptr -}; -} - -namespace { -__attribute__((used, section(".requests"))) -volatile limine_memmap_request memmap_request = { - .id = LIMINE_MEMMAP_REQUEST, - .revision = 0, - .response = nullptr -}; -} - -namespace { -__attribute__((used, section(".requests"))) -volatile limine_hhdm_request hhdm_request = { - .id = LIMINE_HHDM_REQUEST, - .revision = 0, - .response = nullptr -}; -} - -namespace { -__attribute__((used, section(".requests_start_marker"))) -volatile LIMINE_REQUESTS_START_MARKER; - -__attribute__((used, section(".requests_end_marker"))) -volatile LIMINE_REQUESTS_END_MARKER; -} - -namespace { -[[noreturn]] void hcf() { - asm("cli"); - for (;;) { - asm("hlt"); - } -} -} - -extern void (*__init_array[])(); -extern void (*__init_array_end[])(); - -void kernel_main(); - -// this will cause problems later -uint64_t _hhdm_offset; - -extern "C" void _start() { - asm("cli"); - if (!LIMINE_BASE_REVISION_SUPPORTED) { - hcf(); - } - - _hhdm_offset = hhdm_request.response->offset; - - // setup gdt - SegDesc segs[5]; - GDTR gdtr{sizeof(struct SegDesc) * 5 - 1, (uint64_t)&segs}; - - gdt_entry(&segs[0], 0, 0, 0, 0); // null desc - gdt_entry(&segs[1], 0, 0xFFFFF, 0x9A, 0xA); // kcode - gdt_entry(&segs[2], 0, 0xFFFFF, 0x92, 0xA); // kdata - gdt_entry(&segs[3], 0, 0xFFFFF, 0xFA, 0xA); // ucode - gdt_entry(&segs[4], 0, 0xFFFFF, 0xF2, 0xA); // udata - - load_gdt(&gdtr); - reload_segments(); - - setup_idt(); - - // initialize global constructors - for (size_t i = 0; &__init_array[i] != __init_array_end; i++) { - __init_array[i](); - } - - // Ensure we got a framebuffer. - if (framebuffer_request.response == nullptr - || framebuffer_request.response->framebuffer_count < 1) { - hcf(); - } - - if (memmap_request.response == nullptr) { - hcf(); - } - - // Fetch the first framebuffer. - limine_framebuffer* framebuffer = framebuffer_request.response->framebuffers[0]; - - // Note: we assume the framebuffer model is RGB with 32-bit pixels. - // for (size_t i = 0; i < 100; i++) { - // volatile uint32_t *fb_ptr = static_cast(framebuffer->address); - // fb_ptr[i * (framebuffer->pitch / 4) + i] = 0xffffff; - // } - - fb_init((uint32_t*)framebuffer->address, framebuffer->width, framebuffer->height); - draw_pixel(727, 727, 0x9528fd); - draw_pixel(0, 0, 0xff0000); - draw_pixel(framebuffer->width - 1, framebuffer->height - 1, 0x00ff00); - // for (size_t i = 0; i < framebuffer->mode_count; i++) { - // printf("Mode %d\n", i); - // printf("Pitch %d\nWidth %d\nHeight %d\nbpp %d\nmem_model %d\n", - // framebuffer->modes[i]->pitch, framebuffer->modes[i]->width, framebuffer->modes[i]->height, - // framebuffer->modes[i]->bpp, framebuffer->modes[i]->memory_model); - // } - - printf("Actual framebuffer:\n"); - printf("Pitch %d\nWidth %d\nHeight %d\nbpp %d\nmem_model %d\n", - framebuffer->pitch, framebuffer->width, framebuffer->height, - framebuffer->bpp, framebuffer->memory_model); - - limine_memmap_response* memmap = memmap_request.response; - for (int i = 0; i < memmap->entry_count; i++) { - printf("base: %lx\nlength: %lx\ntype: %d\n\n", - memmap->entries[i]->base, memmap->entries[i]->length, memmap->entries[i]->type); - } - - printf("hhdm offset: %lx\n", _hhdm_offset); - pmm_init(memmap_request.response); - - - - kernel_main(); - - // We're done, just hang... - hcf(); -} \ No newline at end of file diff --git a/kernel/framebuffer.cpp b/kernel/framebuffer.cpp index 62ffee7..1c3780d 100644 --- a/kernel/framebuffer.cpp +++ b/kernel/framebuffer.cpp @@ -8,7 +8,7 @@ uint32_t fb_height; void fb_init(uint32_t* addr, uint32_t width, uint32_t height) { fb_addr = addr; - fb_width = width; + fb_width = width / 4; fb_height = height; fb_clear(); } diff --git a/kernel/include/arch/arch_init.h b/kernel/include/arch/arch_init.h new file mode 100644 index 0000000..c3a5ae0 --- /dev/null +++ b/kernel/include/arch/arch_init.h @@ -0,0 +1,6 @@ +#ifndef ARCH_INIT_H +#define ARCH_INIT_H + +void arch_init(); + +#endif \ No newline at end of file diff --git a/kernel/kernel.cpp b/kernel/kernel.cpp index e72500e..9fbab22 100644 --- a/kernel/kernel.cpp +++ b/kernel/kernel.cpp @@ -1,25 +1,124 @@ -#include -//#include -//#include -//#include +#include +#include +#include +#include +#include +#include +#include +#include -//#include -//#include -//#include +namespace { +__attribute__((used, section(".requests"))) +volatile LIMINE_BASE_REVISION(2); +} -// linker symbols -unsigned int _kernel_begin; -unsigned int _kernel_end; +namespace { +__attribute__((used, section(".requests"))) +volatile limine_framebuffer_request framebuffer_request = { + .id = LIMINE_FRAMEBUFFER_REQUEST, + .revision = 0, + .response = nullptr +}; +} +namespace { +__attribute__((used, section(".requests"))) +volatile limine_memmap_request memmap_request = { + .id = LIMINE_MEMMAP_REQUEST, + .revision = 0, + .response = nullptr +}; +} -void kernel_main(void) { - // Initialize terminal - //terminal_initialize(); +namespace { +__attribute__((used, section(".requests"))) +volatile limine_hhdm_request hhdm_request = { + .id = LIMINE_HHDM_REQUEST, + .revision = 0, + .response = nullptr +}; +} - //initialize_ps2_controller(); - //keyboard_init(); +namespace { +__attribute__((used, section(".requests_start_marker"))) +volatile LIMINE_REQUESTS_START_MARKER; - //printf("Hello world!\n"); - //printf("a%db\n", 1); - //printf("_begin: %x, _end: %x", &_kernel_begin, &_kernel_end); +__attribute__((used, section(".requests_end_marker"))) +volatile LIMINE_REQUESTS_END_MARKER; } + +namespace { +[[noreturn]] void hcf() { + asm("cli"); + for (;;) { + asm("hlt"); + } +} +} + +extern void (*__init_array[])(); +extern void (*__init_array_end[])(); + +// linker symbols +uint64_t _kernel_begin; +uint64_t _kernel_end; + +// this will cause problems later +uint64_t _hhdm_offset; + +extern "C" void _start() { + asm("cli"); + if (!LIMINE_BASE_REVISION_SUPPORTED) { + hcf(); + } + + _hhdm_offset = hhdm_request.response->offset; + + arch_init(); + + // initialize global constructors + for (size_t i = 0; &__init_array[i] != __init_array_end; i++) { + __init_array[i](); + } + + // Ensure we got a framebuffer. + if (framebuffer_request.response == nullptr + || framebuffer_request.response->framebuffer_count < 1) { + hcf(); + } + + if (memmap_request.response == nullptr) { + hcf(); + } + + // Fetch the first framebuffer. + limine_framebuffer* framebuffer = framebuffer_request.response->framebuffers[0]; + + fb_init((uint32_t*)framebuffer->address, framebuffer->pitch, framebuffer->height); + draw_pixel(727, 727, 0x9528fd); + draw_pixel(0, 0, 0xff0000); + draw_pixel(framebuffer->width - 1, framebuffer->height - 1, 0x00ff00); + // for (size_t i = 0; i < framebuffer->mode_count; i++) { + // printf("Mode %d\n", i); + // printf("Pitch %d\nWidth %d\nHeight %d\nbpp %d\nmem_model %d\n", + // framebuffer->modes[i]->pitch, framebuffer->modes[i]->width, framebuffer->modes[i]->height, + // framebuffer->modes[i]->bpp, framebuffer->modes[i]->memory_model); + // } + + printf("Actual framebuffer:\n"); + printf("Pitch %d\nWidth %d\nHeight %d\nbpp %d\nmem_model %d\n", + framebuffer->pitch, framebuffer->width, framebuffer->height, + framebuffer->bpp, framebuffer->memory_model); + + limine_memmap_response* memmap = memmap_request.response; + for (int i = 0; i < memmap->entry_count; i++) { + printf("base: %lx\nlength: %lx\ntype: %d\n\n", + memmap->entries[i]->base, memmap->entries[i]->length, memmap->entries[i]->type); + } + + printf("hhdm offset: %lx\n", _hhdm_offset); + pmm_init(memmap_request.response); + + // We're done, just hang... + hcf(); +} \ No newline at end of file -- cgit v1.2.3-70-g09d2