PoliEcho-holding-org/kern
1
0
Fork 1
mirror of https://github.com/Tom-on64/kern.git synced 2026-11-03 18:22:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Minor changes

Browse Source
This commit is contained in:
Tom-on
2025-04-10 11:50:10 +02:00
parent 7c2fcd8e9f
commit ba28eafb20
5 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kernel/include/kernel.h
+1 -1
View File
@@ -98,7 +98,7 @@ extern uint32_t __kernel_stack_top, __kernel_stack_bottom;
#define pr_wrn(_s) printk("[warning] %s\n", (_s)) #define pr_wrn(_s) printk("[warning] %s\n", (_s))
#define pr_err(_s) printk("[error] %s\n", (_s)) #define pr_err(_s) printk("[error] %s\n", (_s))
#define panic(_s) do {\ #define panic(_s) do {\
printk("[panic] %s\n", (_s));\ printk("[kernel] Panic! %s\n", (_s));\
while (1) __asm__ volatile ("cli; hlt");\ while (1) __asm__ volatile ("cli; hlt");\
} while (0) } while (0)
#define BUG() panic("BUG()") #define BUG() panic("BUG()")
kernel/linker.ld
+2 -2
View File
@@ -5,7 +5,7 @@ ENTRY(_start)
/* Define sections */ /* Define sections */
SECTIONS { SECTIONS {
. = 0x00100000; . = 0x00100000;
kernel_start = .; __kernel_start = .;
.boot ALIGN(4K) : { .boot ALIGN(4K) : {
*(.multiboot) *(.multiboot)
@@ -31,5 +31,5 @@ SECTIONS {
*(.bss) *(.bss)
} }
kernel_end = .; __kernel_end = .;
} }
kernel/src/kernel.c
+5 -4
View File
@@ -16,9 +16,6 @@ void kmain(void* ptr, uint32_t magic) {
if (serial_init(COM1) != 0) panic("Failed to initialize Serial driver."); if (serial_init(COM1) != 0) panic("Failed to initialize Serial driver.");
debugf("\x1b[H\x1b[J\x1b[0mkern. \x1b[36m(serial console)\x1b[0m\n\n"); debugf("\x1b[H\x1b[J\x1b[0mkern. \x1b[36m(serial console)\x1b[0m\n\n");
// VGA tty thingy
if (tty_init() != 0) panic("Failed to initalize TTY driver.");
tty_puts("kern.\n\n");
// System init // System init
if (gdt_init() != 0) panic("Failed to initalize GDT."); if (gdt_init() != 0) panic("Failed to initalize GDT.");
@@ -29,7 +26,11 @@ void kmain(void* ptr, uint32_t magic) {
if (pmm_init() != 0) panic("Failed to initalize Physical Memory Manager."); if (pmm_init() != 0) panic("Failed to initalize Physical Memory Manager.");
if (vmm_init() != 0) panic("Failed to initalize Virtual Memory Manager."); if (vmm_init() != 0) panic("Failed to initalize Virtual Memory Manager.");
debugf("Basic initialization complete!\n"); // VGA TTY
if (tty_init() != 0) panic("Failed to initalize TTY driver.");
tty_puts("kern.\n\n");
debugf("[kernel] Basic initialization complete!\n");
panic("kmain() reached end."); panic("kmain() reached end.");
} }
kernel/src/pmm.c
+1
View File
@@ -65,6 +65,7 @@ int pmm_init(void) {
bmap_setarea(&pmm_bitmap, bitmapStartPhys, pmm_bitmap.bytes, 1); bmap_setarea(&pmm_bitmap, bitmapStartPhys, pmm_bitmap.bytes, 1);
bmap_setarea(&pmm_bitmap, pageFrameStart, ptcount * PAGE_SIZE, 1); bmap_setarea(&pmm_bitmap, pageFrameStart, ptcount * PAGE_SIZE, 1);
bmap_set(&pmm_bitmap, 0, 1); // Reserve block 0 - NULL page bmap_set(&pmm_bitmap, 0, 1); // Reserve block 0 - NULL page
// Beatifull print statement :) // Beatifull print statement :)
kernel/src/vmm.c
-3
View File
@@ -16,13 +16,10 @@ int vmm_init(void) {
vmm_bitmap.bytes = dceil(vmm_bitmap.blocks, 8); vmm_bitmap.bytes = dceil(vmm_bitmap.blocks, 8);
uint32_t bitmaploc = 0xC6000000; uint32_t bitmaploc = 0xC6000000;
debugf("%d blocks in %d bytes\n", vmm_bitmap.blocks, vmm_bitmap.bytes);
size_t pagecount = dceil(vmm_bitmap.bytes, PAGE_SIZE); size_t pagecount = dceil(vmm_bitmap.bytes, PAGE_SIZE);
for (size_t i = 0; i < pagecount; i++) { for (size_t i = 0; i < pagecount; i++) {
void* fr = pmm_allocPage(); void* fr = pmm_allocPage();
debugf("Allocating page %d/%d...\n", i+1, pagecount);
if (fr == NULL) return 1; if (fr == NULL) return 1;
debugf("Mapping page at 0x%08x to 0x%08x\n", fr, bitmaploc + i * PAGE_SIZE);
pag_mapPage(bitmaploc + i * PAGE_SIZE, (uint32_t)fr, 0); pag_mapPage(bitmaploc + i * PAGE_SIZE, (uint32_t)fr, 0);
} }