Added __printf() attributes to printf-like functions

This commit is contained in:
2026-03-28 18:03:46 +01:00
parent ad45de562a
commit f10f065e91
7 changed files with 12 additions and 18 deletions
+2 -2
View File
@@ -66,7 +66,7 @@
extern uint8_t console_loglevel; extern uint8_t console_loglevel;
// TODO: Add a ring buffer for the logs // TODO: Add a ring buffer for the logs
int printk(const char* fmt, ...); int printk(const char* fmt, ...) __printf(1, 2);
int vprintk(const char* fmt, va_list ap); int vprintk(const char* fmt, va_list ap);
#define pr_emerg(fmt, ...) printk(KERN_EMERG fmt, ##__VA_ARGS__) #define pr_emerg(fmt, ...) printk(KERN_EMERG fmt, ##__VA_ARGS__)
@@ -80,7 +80,7 @@ int vprintk(const char* fmt, va_list ap);
#define PANIC_MSG_BUFSZ 1024 #define PANIC_MSG_BUFSZ 1024
void panic(const char* fmt, ...) __noreturn __cold; void panic(const char* fmt, ...) __noreturn __cold __printf(1, 2);
void vpanic(const char* fmt, va_list ap)__noreturn __cold; void vpanic(const char* fmt, va_list ap)__noreturn __cold;
extern uintptr_t __kernel_start, __kernel_text_start, __kernel_rodata_start, __kernel_data_start; extern uintptr_t __kernel_start, __kernel_text_start, __kernel_rodata_start, __kernel_data_start;
+1 -1
View File
@@ -20,7 +20,7 @@ void serial_write(int dev, const char* buf, size_t len);
void serial_puts(int dev, const char* s); void serial_puts(int dev, const char* s);
void serial_cls(int dev); void serial_cls(int dev);
int debugf(const char* fmt, ...); int debugf(const char* fmt, ...) __printf(1, 2);
int vdebugf(const char* fmt, va_list args); int vdebugf(const char* fmt, va_list args);
#endif #endif
+1 -1
View File
@@ -3,7 +3,7 @@
#include <kernel.h> #include <kernel.h>
int snprintf(char *buf, size_t n, const char *fmt, ...); int snprintf(char *buf, size_t n, const char *fmt, ...) __printf(3, 4);
int vsnprintf(char* buf, size_t n, const char* fmt, va_list ap); int vsnprintf(char* buf, size_t n, const char* fmt, va_list ap);
#endif #endif
-4
View File
@@ -8,8 +8,6 @@
#include <isr.h> #include <isr.h>
#include <pmm.h> #include <pmm.h>
void a(void) { *(char*)(1234) = 0; }
__noreturn __noreturn
void _start(void) { void _start(void) {
int err = 0; int err = 0;
@@ -37,8 +35,6 @@ void _start(void) {
// The most important function in the world. // The most important function in the world.
splash(); splash();
a();
// Patiently wait for things to do :) // Patiently wait for things to do :)
while (1); while (1);
}; };
+2 -4
View File
@@ -11,8 +11,6 @@
// VIRTUAL address of the kernels PML4 // VIRTUAL address of the kernels PML4
uint64_t* pag_kernel_pml4 = NULL; uint64_t* pag_kernel_pml4 = NULL;
// abcabcaaabcaab
int pag_init(void) { int pag_init(void) {
pag_kernel_pml4 = TO_VIRT(pmm_alloc()); pag_kernel_pml4 = TO_VIRT(pmm_alloc());
if (IS_ERR(pag_kernel_pml4)) return PTR_ERR(pag_kernel_pml4); if (IS_ERR(pag_kernel_pml4)) return PTR_ERR(pag_kernel_pml4);
@@ -43,8 +41,8 @@ int pag_init(void) {
case LIMINE_MEMMAP_RESERVED_MAPPED: flags = 0; break; case LIMINE_MEMMAP_RESERVED_MAPPED: flags = 0; break;
default: default:
pr_warning( pr_warning(
"[pag] %p - %p: Unknown memmap type %d. Will remain unmapped.\n", "[pag] %p - %p: Unknown memmap type %lu. Will remain unmapped.\n",
entry->base, entry->base + entry->length, entry->type (void*)entry->base, (void*)entry->base + entry->length, entry->type
); );
continue; continue;
} }
+2 -2
View File
@@ -18,7 +18,7 @@ void panic_call_trace(void) {
// TODO: Parse ELF and print function names // TODO: Parse ELF and print function names
char* fname = "???"; char* fname = "???";
pr_emerg(" [<%p>] %s+0x%x\n", retaddr, fname, offset); pr_emerg(" [<%p>] %s+0x%lx\n", (void*)retaddr, fname, offset);
rbp = (uintptr_t*)*rbp; rbp = (uintptr_t*)*rbp;
} }
@@ -45,7 +45,7 @@ void vpanic(const char *fmt, va_list ap) {
pr_emerg("--- [ Kernel panic: %s ] ---\n\n", buf); pr_emerg("--- [ Kernel panic: %s ] ---\n\n", buf);
pr_emerg("%d / %d pages free.\n\n", pmm_free_pages, pmm_total_pages); pr_emerg("%lu / %lu pages free.\n\n", pmm_free_pages, pmm_total_pages);
panic_call_trace(); panic_call_trace();
pr_emerg("\n--- [ End kernel panic: %s ] ---\n", buf); pr_emerg("\n--- [ End kernel panic: %s ] ---\n", buf);
+4 -4
View File
@@ -16,8 +16,8 @@ int pmm_init(void) {
struct limine_memmap_entry* entry = bootloader.mm_entries[i]; struct limine_memmap_entry* entry = bootloader.mm_entries[i];
pr_info( pr_info(
"\t%p - %p (%d bytes), type %d\n", "\t%p - %p (%lu bytes), type %lu\n",
entry->base, entry->base + entry->length, entry->length, entry->type (void*)entry->base, (void*)entry->base + entry->length, entry->length, entry->type
); );
if (entry->type != LIMINE_MEMMAP_USABLE) continue; if (entry->type != LIMINE_MEMMAP_USABLE) continue;
@@ -25,7 +25,7 @@ int pmm_init(void) {
// Limine spec says that it'll be aligned, but just as a sanity check // Limine spec says that it'll be aligned, but just as a sanity check
if (entry->base % PAGE_SIZE != 0) { if (entry->base % PAGE_SIZE != 0) {
size_t diff = PAGE_SIZE - (entry->base % PAGE_SIZE); size_t diff = PAGE_SIZE - (entry->base % PAGE_SIZE);
pr_info("\t Not 4 kiB aligned, shifting %p -> %p (%d bytes).\n", entry->base, entry->base + diff, diff); pr_info("\t Not 4 kiB aligned, shifting %p -> %p (%lu bytes).\n", (void*)entry->base, (void*)entry->base + diff, diff);
entry->base += diff; entry->base += diff;
entry->length -= diff; entry->length -= diff;
} }
@@ -38,7 +38,7 @@ int pmm_init(void) {
} }
} }
pr_info("[pmm] %d free pages.\n", pmm_total_pages); pr_info("[pmm] %lu free pages.\n", pmm_total_pages);
if (pmm_total_pages == 0) return -ENOMEM; if (pmm_total_pages == 0) return -ENOMEM;
pmm_free_pages = pmm_total_pages; pmm_free_pages = pmm_total_pages;