Changeset 534

Timestamp:

Mar 27, 2015, 12:24:12 PM (10 years ago)

Author:

alain

Message:

Simplify the _v2p_translate function prototype.

Location:

soft/giet_vm/giet_common

Files:

• vmem.c (modified) (5 diffs)
• vmem.h (modified) (3 diffs)

soft/giet_vm/giet_common/vmem.c

@@ -9 +9 @@
 #include <utils.h>
 #include <vmem.h>
+#include <ctx_handler.h>
 #include <giet_config.h>
 
-/////////////////////////////////////////
-void _v2p_translate( page_table_t*  ptab,
-                     unsigned int   vpn,
-                     unsigned int*  ppn,
-                     unsigned int*  flags ) 
+///////////////////////////////////////////////////////
+unsigned long long _v2p_translate( unsigned int  vaddr,
+                                   unsigned int* flags )
 {
     unsigned long long ptba;
@@ -25 +24 @@
     unsigned int ppn_value;
 
-    unsigned int ix1 = vpn >> 9;
-    unsigned int ix2 = vpn & 0x1FF;
+    unsigned int save_sr;
+  
+    // decode the vaddr fields
+    unsigned int offset = vaddr & 0xFFF;
+    unsigned int ix1    = (vaddr >> 21) & 0x7FF;
+    unsigned int ix2    = (vaddr >> 12) & 0x1FF;
 
-    unsigned int save_sr;
+    // get page table vbase address
+    page_table_t* pt = (page_table_t*)_get_context_slot(CTX_PTAB_ID);
 
     // get PTE1
-    unsigned int pte1 = ptab->pt1[ix1];
+    unsigned int pte1 = pt->pt1[ix1];
 
     // check PTE1 mapping
@@ -37 +41 @@
     {
         _printf("\n[VMEM ERROR] _v2p_translate() : pte1 unmapped\n"
-                "  vpn = %x / ptab = %x / pte1_vaddr = %x / pte1_value = %x\n",
-                vpn , (unsigned int)ptab, &(ptab->pt1[ix1]) , pte1 );
+                "  vaddr = %x / ptab = %x / pte1_vaddr = %x / pte1_value = %x\n",
+                vaddr , (unsigned int)pt, &(pt->pt1[ix1]) , pte1 );
         _exit();
     }
@@ -45 +49 @@
     if ( (pte1 & PTE_T) == 0 )  // big page
     {
-        // set return values
-        *ppn   = ((pte1 << 9) & 0x0FFFFE00) | (vpn & 0X000001FF);
         *flags = pte1 & 0xFFC00000;
+        offset = offset | (ix2<<12);
+        return (((unsigned long long)(pte1 & 0x7FFFF)) << 21) | offset;
     }
     else                        // small page
@@ -84 +88 @@
         _it_restore( &save_sr );
 
-        // set return values 
-        *ppn   = ppn_value   & 0x0FFFFFFF;
-        *flags = flags_value & 0xFFC00000;
-
         // check PTE2 mapping
         if ( (flags_value & PTE_V) == 0 )
         {
             _printf("\n[VMEM ERROR] _v2p_translate() : pte2 unmapped\n"
-                    "  vpn = %x / ptab = %x / pte1_value = %x\n"
+                    "  vaddr = %x / ptab = %x / pte1_value = %x\n"
                     "  pte2_paddr = %l / ppn = %x / flags = %x\n",
-                    vpn , ptab , pte1 , pte2_paddr ,  ppn_value , flags_value );
+                    vaddr , pt , pte1 , pte2_paddr ,  ppn_value , flags_value );
             _exit();
         }
+
+        *flags = flags_value & 0xFFC00000;
+        return (((unsigned long long)(ppn_value & 0x0FFFFFFF)) << 12) | offset;
     }
 } // end _v2p_translate()

soft/giet_vm/giet_common/vmem.h

@@ -45 +45 @@
 #define PTE_D  0x00400000
 
-/////////////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////////
 // MMU error codes definition 
-/////////////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////////
 
 #define MMU_ERR_PT1_UNMAPPED         0x001 // Page fault on Table1 (invalid PTE) 
@@ -59 +59 @@
 #define MMU_ERR_CACHE_ILLEGAL_ACCESS 0x100 // Bus Error during the cache access 
 
-/////////////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////////
 // Page table structure definition
-/////////////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////////
 
 typedef struct PageTable 
@@ -69 +69 @@
 } page_table_t;
 
-////////////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////////
 // functions prototypes
-////////////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////////////////////////////
-// This function makes a "vpn" to "ppn" translation, from the page table 
-// defined by the virtual address "pt". The MMU is supposed to be activated.
+// This function makes a "virtual" to "physical" address translation,
+// using the page table of the calling task.
+// The MMU is supposed to be activated.
 // It supports both small (4 Kbytes) & big (2 Mbytes) pages.
+// The page flags are written in the flags buffer.
 // It uses the address extension mechanism for physical addressing.
-// Return 0 if success. Return 1 if PTE1 or PTE2 unmapped.
+// Returns the physical address if success, exit if PTE1 or PTE2 unmapped.
 ///////////////////////////////////////////////////////////////////////////////////
-void _v2p_translate( page_table_t* pt, 
-                     unsigned int  vpn, 
-                     unsigned int* ppn, 
-                     unsigned int* flags );
+unsigned long long _v2p_translate( unsigned int  vaddr,
+                                   unsigned int* flags );
 
 #endif