fix gcc warnings & improved makefile echos

[lunaix-os.git] / lunaix-os / kernel / mm / vmm.c

diff --git a/lunaix-os/kernel/mm/vmm.c b/lunaix-os/kernel/mm/vmm.c
index 364332e186ee7621ecea955a90f64030c21c5dbc..a076a976cbbe2fa9f495bc9cafcc6af932f7b328 100644 (file)
--- a/lunaix-os/kernel/mm/vmm.c
+++ b/lunaix-os/kernel/mm/vmm.c
@@ -1,52 +1,57 @@
+#include <libc/string.h>
 #include <lunaix/mm/page.h>
-#include <lunaix/mm/vmm.h>
 #include <lunaix/mm/pmm.h>
-#include <libc/string.h>
+#include <lunaix/mm/vmm.h>
 
 // TODO: Move these nasty inline asm stuff into hal
 //      These should be arch dependent
-ptd_t* get_pd() {
+ptd_t*
+get_pd()
+{
     ptd_t* pd;
-    #ifdef __ARCH_IA32
-    __asm__(
-        "movl %%cr3, %0\n"
-        "andl $0xfffff000, %0"
-        : "=r"(pd)
-    );
-    #endif
-    return P2V(pd);
+#ifdef __ARCH_IA32
+    __asm__("movl %%cr3, %0\n"
+            "andl $0xfffff000, %0"
+            : "=r"(pd));
+#endif
+    return (ptd_t*)P2V(pd);
 }
 
-void set_pd(ptd_t* pd) {
-    #ifdef __ARCH_IA32
-    __asm__(
-        "movl %0, %%eax\n"
-        "andl $0xfffff000, %%eax\n"
-        "movl %%eax, %%cr3\n"
-        :
-        : "r" (pd)
-    );
-    #endif
+void
+set_pd(ptd_t* pd)
+{
+#ifdef __ARCH_IA32
+    __asm__("movl %0, %%eax\n"
+            "andl $0xfffff000, %%eax\n"
+            "movl %%eax, %%cr3\n"
+            :
+            : "r"(pd));
+#endif
 }
 
-void vmm_init() {
+void
+vmm_init()
+{
     // TODO: something here?
 }
 
-ptd_t* vmm_init_pd() {
+ptd_t*
+vmm_init_pd()
+{
     ptd_t* dir = pmm_alloc_page();
-    for (size_t i = 0; i < 1024; i++)
-    {
+    for (size_t i = 0; i < 1024; i++) {
         dir[i] = 0;
     }
-    
+
     // 自己映射自己，方便我们在软件层面进行查表地址转换
     dir[1023] = PDE(T_SELF_REF_PERM, dir);
 
     return dir;
 }
 
-void* vmm_map_page(void* va, void* pa, pt_attr dattr, pt_attr tattr) {
+void*
+vmm_map_page(void* va, void* pa, pt_attr dattr, pt_attr tattr)
+{
     // 显然，对空指针进行映射没有意义。
     if (!pa || !va) {
         return NULL;
@@ -57,8 +62,8 @@ void* vmm_map_page(void* va, void* pa, pt_attr dattr, pt_attr tattr) {
     ptd_t* ptd = (ptd_t*)PTD_BASE_VADDR;
 
     // 在页表与页目录中找到一个可用的空位进行映射（位于va或其附近）
-    ptd_t* pde = ptd[pd_offset];
-    pt_t* pt = (uintptr_t)PT_VADDR(pd_offset);
+    ptd_t pde = ptd[pd_offset];
+    pt_t* pt = (pt_t*)PT_VADDR(pd_offset);
     while (pde && pd_offset < 1024) {
         if (pt_offset == 1024) {
             pd_offset++;
@@ -69,11 +74,11 @@ void* vmm_map_page(void* va, void* pa, pt_attr dattr, pt_attr tattr) {
         // 页表有空位，只需要开辟一个新的 PTE
         if (pt && !pt[pt_offset]) {
             pt[pt_offset] = PTE(tattr, pa);
-            return V_ADDR(pd_offset, pt_offset, PG_OFFSET(va));
+            return (void*)V_ADDR(pd_offset, pt_offset, PG_OFFSET(va));
         }
         pt_offset++;
     }
-    
+
     // 页目录与所有页表已满！
     if (pd_offset > 1024) {
         return NULL;
@@ -81,21 +86,23 @@ void* vmm_map_page(void* va, void* pa, pt_attr dattr, pt_attr tattr) {
 
     // 页目录有空位，需要开辟一个新的 PDE
     uint8_t* new_pt_pa = pmm_alloc_page();
-    
+
     // 物理内存已满！
     if (!new_pt_pa) {
         return NULL;
     }
-    
+
     ptd[pd_offset] = PDE(dattr, new_pt_pa);
-    
+
     memset((void*)PT_VADDR(pd_offset), 0, PM_PAGE_SIZE);
     pt[pt_offset] = PTE(tattr, pa);
 
-    return V_ADDR(pd_offset, pt_offset, PG_OFFSET(va));
+    return (void*)V_ADDR(pd_offset, pt_offset, PG_OFFSET(va));
 }
 
-void* vmm_alloc_page(void* vpn, pt_attr dattr, pt_attr tattr) {
+void*
+vmm_alloc_page(void* vpn, pt_attr dattr, pt_attr tattr)
+{
     void* pp = pmm_alloc_page();
     void* result = vmm_map_page(vpn, pp, dattr, tattr);
     if (!result) {
@@ -104,31 +111,35 @@ void* vmm_alloc_page(void* vpn, pt_attr dattr, pt_attr tattr) {
     return result;
 }
 
-void vmm_unmap_page(void* vpn) {
+void
+vmm_unmap_page(void* vpn)
+{
     uintptr_t pd_offset = PD_INDEX(vpn);
     uintptr_t pt_offset = PT_INDEX(vpn);
-    ptd_t* self_pde = PTD_BASE_VADDR;
+    ptd_t* self_pde = (ptd_t*)PTD_BASE_VADDR;
 
     ptd_t pde = self_pde[pd_offset];
 
     if (pde) {
         pt_t* pt = (pt_t*)PT_VADDR(pd_offset);
         uint32_t pte = pt[pt_offset];
-        if (IS_CACHED(pte) && pmm_free_page(pte)) {
-            // 刷新TLB
-            #ifdef __ARCH_IA32
-            __asm__("invlpg (%0)" :: "r"((uintptr_t)vpn) : "memory");
-            #endif
+        if (IS_CACHED(pte) && pmm_free_page((void*)pte)) {
+// 刷新TLB
+#ifdef __ARCH_IA32
+            __asm__("invlpg (%0)" ::"r"((uintptr_t)vpn) : "memory");
+#endif
         }
         pt[pt_offset] = 0;
     }
 }
 
-void* vmm_v2p(void* va) {
+void*
+vmm_v2p(void* va)
+{
     uintptr_t pd_offset = PD_INDEX(va);
     uintptr_t pt_offset = PT_INDEX(va);
     uintptr_t po = PG_OFFSET(va);
-    ptd_t* self_pde = PTD_BASE_VADDR;
+    ptd_t* self_pde = (ptd_t*)PTD_BASE_VADDR;
 
     ptd_t pde = self_pde[pd_offset];
     if (pde) {