修复内存free失败

2024-04-10 19:48:14 +08:00
parent bbf0bde6bf
commit c00cc6dd9d
6 changed files with 101 additions and 55 deletions
--- a/mkrtos_user/lib/libc_backend/src/aarch64/mm_backend.c
+++ b/mkrtos_user/lib/libc_backend/src/aarch64/mm_backend.c
@@ -74,6 +74,6 @@ long sys_munmap(va_list ap)
    void *start;
    size_t len;

-    ARG_2_BE(ap, len, size_t, start, void *);
+    ARG_2_BE(ap, start, void *, len, size_t);
    return be_munmap(start, len);
 }
--- a/mkrtos_user/lib/sys/src/u_vmam.c
+++ b/mkrtos_user/lib/sys/src/u_vmam.c
@@ -57,7 +57,7 @@ msg_tag_t u_vmam_free(obj_handler_t obj, addr_t addr, size_t size)
 {
    register volatile umword_t r0 asm(ARCH_REG_0);

-    mk_syscall(syscall_prot_create4(VMA_ALLOC, VMA_PROT, obj, FALSE).raw,
+    mk_syscall(syscall_prot_create4(VMA_FREE, VMA_PROT, obj, FALSE).raw,
               addr,
               size,
               0,
--- a/mkrtos_user/server/init/src/init.cfg
+++ b/mkrtos_user/server/init/src/init.cfg
@@ -1,7 +1,7 @@
 #一次读取一行，每行代表启动的应用程序，暂时不支持参数

 # fatfs
-# cpiofs
+cpiofs.elf
 # dm9000_drv
 # net
 sh.elf