Changeset 315 for trunk/kernel/mm/ppm.c

Timestamp:

Aug 3, 2017, 10:15:18 AM (7 years ago)

Author:

alain

Message:

Redefine the fuctions ppm_base2page() / ppm_page2base() / ppm_page2ppn() / ppm_ppn2page() / ppm_base2ppn() / ppm_ppn2base(),
to use explicitely extended pointers.

File:

• trunk/kernel/mm/ppm.c (modified) (1 diff)

trunk/kernel/mm/ppm.c

@@ -47 +47 @@
 
 
+
 /////////////////////////////////////////////
-inline void * ppm_page2vaddr( page_t * page )
-{
-        ppm_t * ppm = &LOCAL_CLUSTER->ppm;
-        return ppm->vaddr_base + ((page - ppm->pages_tbl) << CONFIG_PPM_PAGE_SHIFT);
-}
-
-//////////////////////////////////////////////
-inline page_t * ppm_vaddr2page( void * vaddr )
-{
-        ppm_t * ppm = &LOCAL_CLUSTER->ppm;
-        return ppm->pages_tbl + (vaddr - ppm->vaddr_base);
-}
+inline xptr_t ppm_page2base( xptr_t page_xp )
+{
+        ppm_t  * ppm      = &LOCAL_CLUSTER->ppm;
+
+    cxy_t    page_cxy = GET_CXY( page_xp );
+    page_t * page_ptr = (page_t *)GET_PTR( page_xp );
+
+    void   * base_ptr = ppm->vaddr_base + 
+                        ((page_ptr - ppm->pages_tbl)<<CONFIG_PPM_PAGE_SHIFT);
+  
+        return XPTR( page_cxy , base_ptr );
+
+} // end ppm_page2base()
+
+/////////////////////////////////////////////
+inline xptr_t ppm_base2page( xptr_t base_xp )
+{
+        ppm_t  * ppm = &LOCAL_CLUSTER->ppm;
+
+    cxy_t    base_cxy = GET_CXY( base_xp );
+    void   * base_ptr = (void *)GET_PTR( base_xp );
+
+        page_t * page_ptr = ppm->pages_tbl + 
+                        ((base_ptr - ppm->vaddr_base)>>CONFIG_PPM_PAGE_SHIFT);
+
+        return XPTR( base_cxy , page_ptr );
+
+}  // end ppm_base2page()
+
+
+
+///////////////////////////////////////////
+inline ppn_t ppm_page2ppn( xptr_t page_xp )
+{
+        ppm_t  * ppm      = &LOCAL_CLUSTER->ppm;
+
+    cxy_t    page_cxy = GET_CXY( page_xp );
+    page_t * page_ptr = (page_t *)GET_PTR( page_xp );
+
+    paddr_t  paddr    = PADDR( page_cxy , (page_ptr - ppm->pages_tbl)<<CONFIG_PPM_PAGE_SHIFT );
+
+    return paddr >> CONFIG_PPM_PAGE_SHIFT;
+
+}  // end hal_page2ppn()
+
+///////////////////////////////////////
+inline xptr_t ppm_ppn2page( ppn_t ppn )
+{
+        ppm_t  * ppm      = &LOCAL_CLUSTER->ppm;
+
+    paddr_t  paddr    = ppn << CONFIG_PPM_PAGE_SHIFT;
+
+    cxy_t    page_cxy = CXY_FROM_PADDR( paddr );
+    lpa_t    page_lpa = LPA_FROM_PADDR( paddr );
+
+    return XPTR( page_cxy , &ppm->pages_tbl[page_lpa>>CONFIG_PPM_PAGE_SHIFT] );
+
+}  // end hal_ppn2page
+
+
+
+///////////////////////////////////////
+inline xptr_t ppm_ppn2base( ppn_t ppn )
+{
+        ppm_t  * ppm      = &LOCAL_CLUSTER->ppm;
+   
+    paddr_t  paddr    = ppn << CONFIG_PPM_PAGE_SHIFT;
+
+    cxy_t    page_cxy = CXY_FROM_PADDR( paddr );
+    lpa_t    page_lpa = LPA_FROM_PADDR( paddr );
+
+    void   * base_ptr = (void *)ppm->vaddr_base + (page_lpa & ~CONFIG_PPM_PAGE_SHIFT);
+  
+        return XPTR( page_cxy , base_ptr );
+
+}  // end ppm_ppn2base()
+
+///////////////////////////////////////////
+inline ppn_t ppm_base2ppn( xptr_t base_xp )
+{
+        ppm_t  * ppm      = &LOCAL_CLUSTER->ppm;
+
+    cxy_t    base_cxy = GET_CXY( base_xp );
+    void   * base_ptr = (void *)GET_PTR( base_xp );
+
+    paddr_t  paddr    = PADDR( base_cxy , (base_ptr - ppm->vaddr_base) );
+
+    return paddr >> CONFIG_PPM_PAGE_SHIFT;
+
+}  // end ppm_base2ppn()
+
+
 
 ///////////////////////////////////////////