kamkow1/my-os-project2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix minor warnings

Browse Source
This commit is contained in:
Kamil Kowalczyk
2025-10-03 22:41:38 +02:00
parent fc47ff581e
commit 20b4545cae
10 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
kernel/baseimg/baseimg.c
View File

@ -32,7 +32,7 @@ void baseimg_init(void) {
hal_hang(); hal_hang();
} else { } else {
LOG("baseimg", "base.img found\n"); 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++) { for (size_t i = 0; i < 30; i++) {
kprintf("%02X ", ((uint8_t *)(baseimg->address))[i]); kprintf("%02X ", ((uint8_t *)(baseimg->address))[i]);
if (i > 0 && (i + 1) % 10 == 0) { if (i > 0 && (i + 1) % 10 == 0) {

2
kernel/fs/portlfs/portlfs.c
View File

@ -8,7 +8,7 @@
#include "hal/hal.h" #include "hal/hal.h"
int32_t littlefs_cleanup(struct VfsMountPoint *vmp) { 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); int32_t err = vmp->backingsd->cleanup(vmp->backingsd);
if (err != E_OK) { if (err != E_OK) {
return err; return err;

2
kernel/hal/x86_64/intr.c
View File

@ -25,7 +25,7 @@ typedef struct BackTraceFrame {
void backtrace(BackTraceFrame *bt) { void backtrace(BackTraceFrame *bt) {
kprintf("Backtrace:\n"); kprintf("Backtrace:\n");
for (size_t frame = 0; bt; frame++) { for (size_t frame = 0; bt; frame++) {
kprintf(" 0x%llx\n", bt->rip); kprintf(" %zu: 0x%lx\n", frame, bt->rip);
bt = bt->rbp; bt = bt->rbp;
} }
} }

2
kernel/hal/x86_64/vmm.c
View File

@ -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); uint8_t *cr3phys = pmm_alloc(1);
uint64_t phys = (uint64_t)cr3phys; uint64_t phys = (uint64_t)cr3phys;
hal_memset(VIRT(phys), 0, HAL_PAGE_SIZE); hal_memset(VIRT(phys), 0, HAL_PAGE_SIZE);

4
kernel/hal/x86_64/vmm.h
View File

@ -17,8 +17,6 @@ typedef struct VasRange {
uint8_t pgflags; uint8_t pgflags;
} PACKED VasRange; } PACKED VasRange;
struct Proc;
enum { enum {
HAL_PG_PRESENT = 1<<0, HAL_PG_PRESENT = 1<<0,
HAL_PG_RW = 1<<1, 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); 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_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); 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_ #endif // HAL_VMM_H_

2
kernel/proc/proc.c
View File

@ -108,7 +108,7 @@ Proc *proc_spawnuser(char *mountpoint, char *path) {
ksprintf(proc->name, "%s:%s", mountpoint, path); ksprintf(proc->name, "%s:%s", mountpoint, path);
hal_memset(&proc->platformdata.trapframe, 0, sizeof(proc->platformdata.trapframe)); 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; uint8_t *kstackp = (uint8_t *)pmm_alloc(PROC_STACKBLOCKS) + PROC_STACKSIZE;
proc->platformdata.kstack = kstackp; proc->platformdata.kstack = kstackp;

3
kernel/storedev/storedev.h
View File

@ -5,12 +5,13 @@
#include <stddef.h> #include <stddef.h>
#include "spinlock/spinlock.h" #include "spinlock/spinlock.h"
#include "ramsd.h" #include "ramsd.h"
#include "compiler/attr.h"
enum { enum {
STOREDEV_RAMSD, STOREDEV_RAMSD,
}; };
static const char *storedev_strings[] = { UNUSED static const char *storedev_strings[] = {
"RAMSD", "RAMSD",
}; };

14
kernel/syscall/syscall.h
View File

@ -8,7 +8,7 @@
#define SYSCALLS_MAX 0xff #define SYSCALLS_MAX 0xff
#define SYSCALL0(name) \ #define SYSCALL0(name) \
name(IntrStackFrame *frame, \ name(UNUSED IntrStackFrame *frame, \
UNUSED uint64_t _1, \ UNUSED uint64_t _1, \
UNUSED uint64_t _2, \ UNUSED uint64_t _2, \
UNUSED uint64_t _3, \ UNUSED uint64_t _3, \
@ -18,7 +18,7 @@
) )
#define SYSCALL1(name, arg1) \ #define SYSCALL1(name, arg1) \
name(IntrStackFrame *frame, \ name(UNUSED IntrStackFrame *frame, \
uint64_t arg1, \ uint64_t arg1, \
UNUSED uint64_t _2, \ UNUSED uint64_t _2, \
UNUSED uint64_t _3, \ UNUSED uint64_t _3, \
@ -28,7 +28,7 @@
) )
#define SYSCALL2(name, arg1, arg2) \ #define SYSCALL2(name, arg1, arg2) \
name(IntrStackFrame *frame, \ name(UNUSED IntrStackFrame *frame, \
uint64_t arg1, \ uint64_t arg1, \
uint64_t arg2, \ uint64_t arg2, \
UNUSED uint64_t _3, \ UNUSED uint64_t _3, \
@ -38,7 +38,7 @@
) )
#define SYSCALL3(name, arg1, arg2, arg3) \ #define SYSCALL3(name, arg1, arg2, arg3) \
name(IntrStackFrame *frame, \ name(UNUSED IntrStackFrame *frame, \
uint64_t arg1, \ uint64_t arg1, \
uint64_t arg2, \ uint64_t arg2, \
uint64_t arg3, \ uint64_t arg3, \
@ -48,7 +48,7 @@
) )
#define SYSCALL4(name, arg1, arg2, arg3, arg4) \ #define SYSCALL4(name, arg1, arg2, arg3, arg4) \
name(IntrStackFrame *frame, \ name(UNUSED IntrStackFrame *frame, \
uint64_t arg1, \ uint64_t arg1, \
uint64_t arg2, \ uint64_t arg2, \
uint64_t arg3, \ uint64_t arg3, \
@ -58,7 +58,7 @@
) )
#define SYSCALL5(name, arg1, arg2, arg3, arg4, arg5) \ #define SYSCALL5(name, arg1, arg2, arg3, arg4, arg5) \
name(IntrStackFrame *frame, \ name(UNUSED IntrStackFrame *frame, \
uint64_t arg1, \ uint64_t arg1, \
uint64_t arg2, \ uint64_t arg2, \
uint64_t arg3, \ uint64_t arg3, \
@ -68,7 +68,7 @@
) )
#define SYSCALL6(name, arg1, arg2, arg3, arg4, arg5, arg6) \ #define SYSCALL6(name, arg1, arg2, arg3, arg4, arg5, arg6) \
name(IntrStackFrame *frame, \ name(UNUSED IntrStackFrame *frame, \
uint64_t arg1, \ uint64_t arg1, \
uint64_t arg2, \ uint64_t arg2, \
uint64_t arg3, \ uint64_t arg3, \

3
kernel/vfs/vfs.h
View File

@ -8,6 +8,7 @@
#include "fs/portlfs/portlfs.h" #include "fs/portlfs/portlfs.h"
#include "storedev/storedev.h" #include "storedev/storedev.h"
#include "sysdefs/ioctl.h" #include "sysdefs/ioctl.h"
#include "compiler/attr.h"
#define VFS_MOUNTPOINT_LABEL_MAX 128 #define VFS_MOUNTPOINT_LABEL_MAX 128
#define VFS_MOUNTPOINTS_MAX 30 #define VFS_MOUNTPOINTS_MAX 30
@ -16,7 +17,7 @@ enum {
VFS_LITTLEFS, VFS_LITTLEFS,
}; };
static const char *vfs_strings[] = { UNUSED static const char *vfs_strings[] = {
"Little FS", "Little FS",
}; };

1
share/errors.h
View File

@ -19,6 +19,7 @@
#if !defined(__ASSEMBLER__) #if !defined(__ASSEMBLER__)
__attribute__((unused))
static const char *_ERROR_STRINGS[] = { static const char *_ERROR_STRINGS[] = {
"OK", "OK",
"Out of memory", "Out of memory",