Changeset 53 for trunk/hal/tsar_mips32/hal_gpt.c

Timestamp:

Jun 26, 2017, 4:22:00 PM (7 years ago)

Author:

alain

Message:

Compilation OK pout TSAR

File:

• trunk/hal/tsar_mips32/hal_gpt.c (modified) (16 diffs)

trunk/hal/tsar_mips32/hal_gpt.c

@@ -121 +121 @@
 
     // initialize generic page table descriptor
-        gpt->ptr  = ppm_page2base( page );
+        gpt->ptr  = ppm_page2vaddr( page );
         gpt->ppn  = ppm_page2ppn( page );
         gpt->page = page;
@@ -193 +193 @@
                 // get pointer on PT2
                 pt2_ppn = TSAR_MMU_PTBA_FROM_PTE1( pte1 );
-                pt2 = ppm_ppn2base( pt2_ppn );
+                pt2 = ppm_ppn2vaddr( pt2_ppn );
 
                 // scan the PT2 to release all entries VALID and USER if reference cluster
@@ -212 +212 @@
                 // release the PT2
                 req.type = KMEM_PAGE;
-                req.ptr  = ppm_base2page( pt2 );
+                req.ptr  = ppm_vaddr2page( pt2 );
                 kmem_free( &req );
             }
@@ -220 +220 @@
     // release the PT1
     req.type = KMEM_PAGE;
-    req.ptr  = ppm_base2page( pt1 );
+    req.ptr  = ppm_vaddr2page( pt1 );
     kmem_free( &req );
 
@@ -255 +255 @@
             {
                 pt2_ppn = TSAR_MMU_PTBA_FROM_PTE1( pte1 );
-                pt2 = ppm_ppn2base( pt2_ppn );
+                pt2 = ppm_ppn2vaddr( pt2_ppn );
 
                 // scan the PT2
@@ -339 +339 @@
         }
         pt2_ppn = ppm_page2ppn( page );
-        pt2     = ppm_page2base( page );
+        pt2     = ppm_page2vaddr( page );
 
         // try to atomicaly set a PTD1 in the PT1 entry 
@@ -361 +361 @@
 
             // compute pointer on PT2 base
-                        pt2 = (uint32_t*)ppm_ppn2base( pt2_ppn );
+                        pt2 = (uint32_t*)ppm_ppn2vaddr( pt2_ppn );
                 }
         }
@@ -378 +378 @@
 
         // compute pointer on PT2 base
-            pt2 = (uint32_t*)ppm_ppn2base( pt2_ppn );
+            pt2 = (uint32_t*)ppm_ppn2vaddr( pt2_ppn );
         }
 
@@ -424 +424 @@
         // compute PT2 base address
         pt2_ppn = TSAR_MMU_PTBA_FROM_PTE1( pte1 );
-        pt2     = (uint32_t*)ppm_ppn2base( pt2_ppn );
+        pt2     = (uint32_t*)ppm_ppn2vaddr( pt2_ppn );
 
             *ppn  = pt2[2*ix2+1] & ((1<<TSAR_MMU_PPN_WIDTH)-1);
@@ -478 +478 @@
         // compute PT2 base address
         pt2_ppn = TSAR_MMU_PTBA_FROM_PTE1( pte1 );
-        pt2 = (uint32_t*)ppm_ppn2base( pt2_ppn );
+        pt2 = (uint32_t*)ppm_ppn2vaddr( pt2_ppn );
         
         // get PPN
@@ -548 +548 @@
 
         pt2_ppn = ppm_page2ppn( page );
-        pt2     = ppm_page2base( page );
+        pt2     = ppm_page2vaddr( page );
 
         // try to set the PT1 entry
@@ -568 +568 @@
             // get the PT2 base address
                         pt2_ppn = TSAR_MMU_PPN_FROM_PTE1( pte1 );
-                        pt2     = (uint32_t*)ppm_ppn2base( pt2_ppn );
+                        pt2     = (uint32_t*)ppm_ppn2vaddr( pt2_ppn );
                 }
         }
@@ -585 +585 @@
 
         // compute pointer on PT2 base
-            pt2 = (uint32_t*)ppm_ppn2base( pt2_ppn );
+            pt2 = (uint32_t*)ppm_ppn2vaddr( pt2_ppn );
     }
     
@@ -645 +645 @@
     // get pointer on PT2 base
     pt2_ppn = TSAR_MMU_PPN_FROM_PTE1( pte1 );
-    pt2     = ppm_ppn2base( pt2_ppn );
+    pt2     = ppm_ppn2vaddr( pt2_ppn );
  
     // get pointer on PTE2
@@ -722 +722 @@
 
                 // get pointer on new PT2 in DST_GPT
-                dst_pt2 = (uint32_t *)ppm_page2base( page );
+                dst_pt2 = (uint32_t *)ppm_page2vaddr( page );
 
                 // set a new PTD1 in DST_GPT
@@ -730 +730 @@
                 // get pointer on PT2 in SRC_GPT
                 src_pt2_ppn = (ppn_t)TSAR_MMU_PTBA_FROM_PTE1( pte1 );
-                src_pt2     = (uint32_t *)ppm_ppn2base( src_pt2_ppn );
+                src_pt2     = (uint32_t *)ppm_ppn2vaddr( src_pt2_ppn );
 
                 // scan the SRC_PT2