From 20b4545caeff265844e1027a4807efb9f1415020 Mon Sep 17 00:00:00 2001 From: kamkow1 Date: Fri, 3 Oct 2025 22:41:38 +0200 Subject: [PATCH] Fix minor warnings --- kernel/baseimg/baseimg.c | 2 +- kernel/fs/portlfs/portlfs.c | 2 +- kernel/hal/x86_64/intr.c | 2 +- kernel/hal/x86_64/vmm.c | 2 +- kernel/hal/x86_64/vmm.h | 4 +--- kernel/proc/proc.c | 2 +- kernel/storedev/storedev.h | 3 ++- kernel/syscall/syscall.h | 14 +++++++------- kernel/vfs/vfs.h | 3 ++- share/errors.h | 1 + 10 files changed, 18 insertions(+), 17 deletions(-) diff --git a/kernel/baseimg/baseimg.c b/kernel/baseimg/baseimg.c index 5f9dc2e..f1f232f 100644 --- a/kernel/baseimg/baseimg.c +++ b/kernel/baseimg/baseimg.c @@ -32,7 +32,7 @@ void baseimg_init(void) { hal_hang(); } else { LOG("baseimg", "base.img found\n"); - LOG("baseimg", "addr = %p, size = %lld\n", baseimg->address, baseimg->size); + LOG("baseimg", "addr = %p, size = %lu\n", baseimg->address, baseimg->size); for (size_t i = 0; i < 30; i++) { kprintf("%02X ", ((uint8_t *)(baseimg->address))[i]); if (i > 0 && (i + 1) % 10 == 0) { diff --git a/kernel/fs/portlfs/portlfs.c b/kernel/fs/portlfs/portlfs.c index f3af3c7..521f427 100644 --- a/kernel/fs/portlfs/portlfs.c +++ b/kernel/fs/portlfs/portlfs.c @@ -8,7 +8,7 @@ #include "hal/hal.h" int32_t littlefs_cleanup(struct VfsMountPoint *vmp) { - dlfree(vmp->fs.littlefs.instance.cfg); + dlfree((void *)vmp->fs.littlefs.instance.cfg); int32_t err = vmp->backingsd->cleanup(vmp->backingsd); if (err != E_OK) { return err; diff --git a/kernel/hal/x86_64/intr.c b/kernel/hal/x86_64/intr.c index eb79caa..b389cb7 100644 --- a/kernel/hal/x86_64/intr.c +++ b/kernel/hal/x86_64/intr.c @@ -25,7 +25,7 @@ typedef struct BackTraceFrame { void backtrace(BackTraceFrame *bt) { kprintf("Backtrace:\n"); for (size_t frame = 0; bt; frame++) { - kprintf(" 0x%llx\n", bt->rip); + kprintf(" %zu: 0x%lx\n", frame, bt->rip); bt = bt->rbp; } } diff --git a/kernel/hal/x86_64/vmm.c b/kernel/hal/x86_64/vmm.c index e2a57ea..14e641a 100644 --- a/kernel/hal/x86_64/vmm.c +++ b/kernel/hal/x86_64/vmm.c @@ -110,7 +110,7 @@ void hal_vmm_map_kern(uint64_t targetcr3) { } } -uint64_t hal_vmm_userproc_pml4_phys(Proc *proc) { +uint64_t hal_vmm_userproc_pml4_phys(void) { uint8_t *cr3phys = pmm_alloc(1); uint64_t phys = (uint64_t)cr3phys; hal_memset(VIRT(phys), 0, HAL_PAGE_SIZE); diff --git a/kernel/hal/x86_64/vmm.h b/kernel/hal/x86_64/vmm.h index 0c2cdff..568448a 100644 --- a/kernel/hal/x86_64/vmm.h +++ b/kernel/hal/x86_64/vmm.h @@ -17,8 +17,6 @@ typedef struct VasRange { uint8_t pgflags; } PACKED VasRange; -struct Proc; - enum { HAL_PG_PRESENT = 1<<0, HAL_PG_RW = 1<<1, @@ -60,6 +58,6 @@ void hal_vmm_map_page(uint64_t cr3phys, uint64_t virtaddr, uint64_t physaddr, ui uint64_t hal_vmm_current_cr3(void); void hal_vmm_map_range(uint64_t cr3phys, void *virtstart, void *physstart, size_t size, uint32_t flags); void hal_vmm_unmap_range(uint64_t cr3phys, void *virtstart, void *physstart, size_t size); -uint64_t hal_vmm_userproc_pml4_phys(struct Proc *proc); +uint64_t hal_vmm_userproc_pml4_phys(); #endif // HAL_VMM_H_ diff --git a/kernel/proc/proc.c b/kernel/proc/proc.c index af98760..3ed21ba 100644 --- a/kernel/proc/proc.c +++ b/kernel/proc/proc.c @@ -108,7 +108,7 @@ Proc *proc_spawnuser(char *mountpoint, char *path) { ksprintf(proc->name, "%s:%s", mountpoint, path); hal_memset(&proc->platformdata.trapframe, 0, sizeof(proc->platformdata.trapframe)); - proc->platformdata.cr3 = hal_vmm_userproc_pml4_phys(proc); + proc->platformdata.cr3 = hal_vmm_userproc_pml4_phys(); uint8_t *kstackp = (uint8_t *)pmm_alloc(PROC_STACKBLOCKS) + PROC_STACKSIZE; proc->platformdata.kstack = kstackp; diff --git a/kernel/storedev/storedev.h b/kernel/storedev/storedev.h index df4e141..9c7efd0 100644 --- a/kernel/storedev/storedev.h +++ b/kernel/storedev/storedev.h @@ -5,12 +5,13 @@ #include #include "spinlock/spinlock.h" #include "ramsd.h" +#include "compiler/attr.h" enum { STOREDEV_RAMSD, }; -static const char *storedev_strings[] = { +UNUSED static const char *storedev_strings[] = { "RAMSD", }; diff --git a/kernel/syscall/syscall.h b/kernel/syscall/syscall.h index fe6fa60..e05c0b6 100644 --- a/kernel/syscall/syscall.h +++ b/kernel/syscall/syscall.h @@ -8,7 +8,7 @@ #define SYSCALLS_MAX 0xff #define SYSCALL0(name) \ - name(IntrStackFrame *frame, \ + name(UNUSED IntrStackFrame *frame, \ UNUSED uint64_t _1, \ UNUSED uint64_t _2, \ UNUSED uint64_t _3, \ @@ -18,7 +18,7 @@ ) #define SYSCALL1(name, arg1) \ - name(IntrStackFrame *frame, \ + name(UNUSED IntrStackFrame *frame, \ uint64_t arg1, \ UNUSED uint64_t _2, \ UNUSED uint64_t _3, \ @@ -28,7 +28,7 @@ ) #define SYSCALL2(name, arg1, arg2) \ - name(IntrStackFrame *frame, \ + name(UNUSED IntrStackFrame *frame, \ uint64_t arg1, \ uint64_t arg2, \ UNUSED uint64_t _3, \ @@ -38,7 +38,7 @@ ) #define SYSCALL3(name, arg1, arg2, arg3) \ - name(IntrStackFrame *frame, \ + name(UNUSED IntrStackFrame *frame, \ uint64_t arg1, \ uint64_t arg2, \ uint64_t arg3, \ @@ -48,7 +48,7 @@ ) #define SYSCALL4(name, arg1, arg2, arg3, arg4) \ - name(IntrStackFrame *frame, \ + name(UNUSED IntrStackFrame *frame, \ uint64_t arg1, \ uint64_t arg2, \ uint64_t arg3, \ @@ -58,7 +58,7 @@ ) #define SYSCALL5(name, arg1, arg2, arg3, arg4, arg5) \ - name(IntrStackFrame *frame, \ + name(UNUSED IntrStackFrame *frame, \ uint64_t arg1, \ uint64_t arg2, \ uint64_t arg3, \ @@ -68,7 +68,7 @@ ) #define SYSCALL6(name, arg1, arg2, arg3, arg4, arg5, arg6) \ - name(IntrStackFrame *frame, \ + name(UNUSED IntrStackFrame *frame, \ uint64_t arg1, \ uint64_t arg2, \ uint64_t arg3, \ diff --git a/kernel/vfs/vfs.h b/kernel/vfs/vfs.h index 90f6f81..41823f2 100644 --- a/kernel/vfs/vfs.h +++ b/kernel/vfs/vfs.h @@ -8,6 +8,7 @@ #include "fs/portlfs/portlfs.h" #include "storedev/storedev.h" #include "sysdefs/ioctl.h" +#include "compiler/attr.h" #define VFS_MOUNTPOINT_LABEL_MAX 128 #define VFS_MOUNTPOINTS_MAX 30 @@ -16,7 +17,7 @@ enum { VFS_LITTLEFS, }; -static const char *vfs_strings[] = { +UNUSED static const char *vfs_strings[] = { "Little FS", }; diff --git a/share/errors.h b/share/errors.h index a730321..393db0d 100644 --- a/share/errors.h +++ b/share/errors.h @@ -19,6 +19,7 @@ #if !defined(__ASSEMBLER__) +__attribute__((unused)) static const char *_ERROR_STRINGS[] = { "OK", "Out of memory",