mirror of
https://github.com/Mathewnd/Astral.git
synced 2026-11-01 15:08:21 +00:00
mmap: properly support files
This commit is contained in:
@@ -40,16 +40,30 @@ syscallret_t syscall_mmap(context_t *context, void *hint, size_t len, int prot,
|
|||||||
if ((prot & PROT_EXEC) == 0)
|
if ((prot & PROT_EXEC) == 0)
|
||||||
mmuflags |= ARCH_MMU_FLAGS_NOEXEC;
|
mmuflags |= ARCH_MMU_FLAGS_NOEXEC;
|
||||||
|
|
||||||
bool file = (flags & MAP_ANONYMOUS) == 0;
|
bool isfile = (flags & MAP_ANONYMOUS) == 0;
|
||||||
int vmmflags = 0;
|
int vmmflags = 0;
|
||||||
|
|
||||||
// XXX this isn't the correct behaviour for MAP_FIXED
|
// XXX this isn't the correct behaviour for MAP_FIXED
|
||||||
if (flags & MAP_FIXED)
|
if (flags & MAP_FIXED)
|
||||||
vmmflags |= VMM_FLAGS_EXACT;
|
vmmflags |= VMM_FLAGS_EXACT;
|
||||||
|
|
||||||
|
if ((flags & MAP_PRIVATE) == 0)
|
||||||
|
vmmflags |= VMM_FLAGS_FILE;
|
||||||
|
|
||||||
|
if (flags & MAP_SHARED)
|
||||||
|
vmmflags |= VMM_FLAGS_SHARED;
|
||||||
|
|
||||||
vmmfiledesc_t vfd;
|
vmmfiledesc_t vfd;
|
||||||
// TODO file mappings
|
file_t *file = NULL;
|
||||||
__assert(file == false);
|
if (isfile) {
|
||||||
|
file = fd_get(fd);
|
||||||
|
if (file == NULL) {
|
||||||
|
ret.errno = EBADF;
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
vfd.node = file->vnode;
|
||||||
|
vfd.offset = offset;
|
||||||
|
}
|
||||||
|
|
||||||
if (hint < USERSPACE_START)
|
if (hint < USERSPACE_START)
|
||||||
hint = USERSPACE_START;
|
hint = USERSPACE_START;
|
||||||
@@ -57,5 +71,9 @@ syscallret_t syscall_mmap(context_t *context, void *hint, size_t len, int prot,
|
|||||||
ret.ret = (uint64_t)vmm_map(hint, len, vmmflags, mmuflags, &vfd);
|
ret.ret = (uint64_t)vmm_map(hint, len, vmmflags, mmuflags, &vfd);
|
||||||
if (ret.ret == 0)
|
if (ret.ret == 0)
|
||||||
ret.errno = ENOMEM;
|
ret.errno = ENOMEM;
|
||||||
|
|
||||||
|
if (isfile)
|
||||||
|
fd_release(file);
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user