xamidev/blankos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 7 Wiki Activity

Fix: explicit typecasting

Browse Source
This commit is contained in:
xamidev
2024-09-10 21:11:41 +02:00
parent bf0228d3ac
commit 64ccec0866
9 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/kernel/gdt.c
View File

@@ -36,9 +36,9 @@ void gdt_install()
gdt_set_gate(2, 0, 0xFFFFFFFF, 0x92, 0xCF);
// Ring 3
gdt_set_gate(3, 0, 0xFFFFFFFF, 0xFA, 0xCF);
gdt_set_gate(4, 0, 0xFFFFFFFF, 0xF2, 0xCF);
//gdt_set_gate(3, 0, 0xFFFFFFFF, 0xFA, 0xCF);
//gdt_set_gate(4, 0, 0xFFFFFFFF, 0xF2, 0xCF);
gdt_flush();
printf("[kernel] GDT gates set (ring 0 and 3), gdt=0x%x\n", &gdt);
printf("[kernel] GDT gates set (ring 0), gdt=0x%x\n", (unsigned int)&gdt);
}

2
src/kernel/idt.c
View File

@@ -30,5 +30,5 @@ void idt_install()
memset(&idt, 0, sizeof(struct idt_entry)*256);
idt_load();
printf("[kernel] loaded IDT at idt=0x%x\n", &idt);
printf("[kernel] loaded IDT at idt=0x%x\n", (unsigned int)&idt);
}

2
src/kernel/initrd.c
View File

@@ -82,7 +82,7 @@ void ls_initrd(uint8_t* initrd, int verbose)
{
printf("%s\n", header->filename);
} else {
printf("%7d\t%c\t %s\n", header->size, header->typeflag, header->filename);
printf("%7d\t%c\t %s\n", (int)header->size, header->typeflag, header->filename);
}
uint32_t size = tar_parse_size(header->size);

6
src/kernel/kmain.c
View File

@@ -65,12 +65,12 @@ void kmain(multiboot2_info *mb_info)
}
printf("[kernel] multiboot2 info at 0x%x, size=%u\n", mb_info, mb_info->total_size);
printf("[kernel] framebuffer discovered at 0x%x\n", fb_info->framebuffer_addr);
printf("[kernel] framebuffer discovered at 0x%x\n", (unsigned int)fb_info->framebuffer_addr);
printf("[kernel] fb0: width=%u, height=%u, pitch=%u, bpp=%u\n", fb_info->framebuffer_width, fb_info->framebuffer_height, fb_info->framebuffer_pitch, fb_info->framebuffer_bpp);
if (mmap_tag) // memmap debug print
{
printf("[kernel] found memory map tag by multiboot2\n");
puts("[kernel] found memory map tag by multiboot2\n");
struct multiboot_mmap_entry *mmap = mmap_tag->entries;
while ((uint8_t*) mmap < tags + mmap_tag->size)
@@ -115,7 +115,7 @@ void kmain(multiboot2_info *mb_info)
init_alloc();
void* ptr1 = malloc(256);
void* ptr2 = malloc(512);
printf("[debug] malloc test ptr1=0x%x, ptr2=0x%x\n", ptr1, ptr2);
printf("[debug] malloc test ptr1=0x%x, ptr2=0x%x\n", (unsigned int)ptr1, (unsigned int)ptr2);
free(ptr1); free(ptr2);
timer_install();