apio/Luna
1
1
Fork 0
Code Issues Pull Requests Actions Projects Releases 8 Wiki Activity

Use %p everywhere with printf() #9

Merged
apio merged 6 commits from printf_pointers into main 2022-10-08 16:27:37 +00:00
Conversation 0 Commits 6 Files Changed 6 +4 -4
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 3feb7782bc - Show all commits

8
kernel/src/sys/mem.cpp
View File

@ -21,7 +21,7 @@ void sys_mmap(Context* context, void* address, size_t size, int flags)
if (flags & MAP_READ_WRITE) real_flags |= MAP_READ_WRITE; if (flags & MAP_READ_WRITE) real_flags |= MAP_READ_WRITE;
if (address) if (address)
{ {
kdbgln("sys_mmap: %ld pages at address %lx, %s", size / PAGE_SIZE, (uint64_t)address, kdbgln("sys_mmap: %ld pages at address %p, %s", size / PAGE_SIZE, address,
real_flags & MAP_READ_WRITE ? "rw" : "ro"); real_flags & MAP_READ_WRITE ? "rw" : "ro");
if (kernelVMM.getPhysical((uint64_t)address) != (uint64_t)-1) // Address is already used. if (kernelVMM.getPhysical((uint64_t)address) != (uint64_t)-1) // Address is already used.
{ {
@ -33,7 +33,7 @@ void sys_mmap(Context* context, void* address, size_t size, int flags)
void* result = MemoryManager::get_pages_at((uint64_t)address - offset, size / PAGE_SIZE, real_flags); void* result = MemoryManager::get_pages_at((uint64_t)address - offset, size / PAGE_SIZE, real_flags);
if (result) if (result)
{ {
kdbgln("mmap succeeded: %lx", (uint64_t)result); kdbgln("mmap succeeded: %p", result);
context->rax = (uint64_t)result; context->rax = (uint64_t)result;
return; return;
} }
@ -48,7 +48,7 @@ void sys_mmap(Context* context, void* address, size_t size, int flags)
void* result = MemoryManager::get_pages(size / PAGE_SIZE, real_flags); void* result = MemoryManager::get_pages(size / PAGE_SIZE, real_flags);
if (result) if (result)
{ {
kdbgln("mmap succeeded: %lx", (uint64_t)result); kdbgln("mmap succeeded: %p", result);
context->rax = (uint64_t)result; context->rax = (uint64_t)result;
return; return;
} }
@ -62,7 +62,7 @@ void sys_mmap(Context* context, void* address, size_t size, int flags)
void sys_munmap(Context* context, void* address, size_t size) void sys_munmap(Context* context, void* address, size_t size)
{ {
kdbgln("sys_munmap: attempting to unmap %lx", (uint64_t)address); kdbgln("sys_munmap: attempting to unmap %p", address);
if (size < PAGE_SIZE) if (size < PAGE_SIZE)
{ {
kdbgln("munmap failed: size is too small"); kdbgln("munmap failed: size is too small");