metaverse
/
kernel-dev
1
2
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

重构内存分配器、增加中断支持、整理rust运行时环境 #4

Merged
pointer-to-bios merged 39 commits from downstream into main 2024-04-11 00:36:14 +08:00
Conversation 0 Commits 39 Files Changed 51 +2 -1
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 501643f86a - Show all commits

3
src/kernel/memm/memm.c
View File

@ -228,7 +228,8 @@ void memm_free(void *mem)
if (allocator->magic != MEMM_ALLOCATOR_MAGIC) if (allocator->magic != MEMM_ALLOCATOR_MAGIC)
return; return;
if (is_user_address((u64)mem)) if (is_user_address((u64)mem))
{ // TODO 对于用户空间的地址需要先转换到内核地址后释放 {
mem = mem - allocator->userspace + (void *)allocator;
} }
allocator->free(allocator->allocator_instance, mem); allocator->free(allocator->allocator_instance, mem);
if (allocator->full) if (allocator->full)