git://scm.lunaixsky.com
/
lunaix-os.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
refactor: full rewrite of signal feature
[lunaix-os.git]
/
lunaix-os
/
kernel
/
mm
/
vmap.c
diff --git
a/lunaix-os/kernel/mm/vmap.c
b/lunaix-os/kernel/mm/vmap.c
index 7507b1a86113a5364d6e6020d6e5a4724ca239a7..ad1a832a5a4dc8c80ff3ede81221f6ba41a15b5c 100644
(file)
--- a/
lunaix-os/kernel/mm/vmap.c
+++ b/
lunaix-os/kernel/mm/vmap.c
@@
-3,18
+3,18
@@
#include <lunaix/spike.h>
#define VMAP_START PG_MOUNT_BASE + MEM_4MB
#include <lunaix/spike.h>
#define VMAP_START PG_MOUNT_BASE + MEM_4MB
-#define VMAP_END
PD_REFERENCED
+#define VMAP_END
VMS_SELF
-static
uint
ptr_t start = VMAP_START;
+static ptr_t start = VMAP_START;
void*
void*
-vmm_vmap(
uint
ptr_t paddr, size_t size, pt_attr attr)
+vmm_vmap(ptr_t paddr, size_t size, pt_attr attr)
{
// next fit
assert_msg((paddr & 0xfff) == 0, "vmap: bad alignment");
size = ROUNDUP(size, PG_SIZE);
{
// next fit
assert_msg((paddr & 0xfff) == 0, "vmap: bad alignment");
size = ROUNDUP(size, PG_SIZE);
-
uint
ptr_t current_addr = start;
+ ptr_t current_addr = start;
size_t examed_size = 0, wrapped = 0;
x86_page_table* pd = (x86_page_table*)L1_BASE_VADDR;
size_t examed_size = 0, wrapped = 0;
x86_page_table* pd = (x86_page_table*)L1_BASE_VADDR;
@@
-54,10
+54,9
@@
vmm_vmap(uintptr_t paddr, size_t size, pt_attr attr)
return NULL;
done:
return NULL;
done:
-
uint
ptr_t alloc_begin = current_addr - examed_size;
+ ptr_t alloc_begin = current_addr - examed_size;
for (size_t i = 0; i < size; i += PG_SIZE) {
for (size_t i = 0; i < size; i += PG_SIZE) {
- vmm_set_mapping(
- PD_REFERENCED, alloc_begin + i, paddr + i, PG_PREM_RW, 0);
+ vmm_set_mapping(VMS_SELF, alloc_begin + i, paddr + i, PG_PREM_RW, 0);
pmm_ref_page(KERNEL_PID, paddr + i);
}
start = alloc_begin + size;
pmm_ref_page(KERNEL_PID, paddr + i);
}
start = alloc_begin + size;