Changeset 246 for soft/giet_vm/sys/vm_handler.c

Timestamp:

Jul 9, 2013, 3:54:53 PM (11 years ago)

Author:

meunier

Message:

Cosmétique + gestion du reset de l'irq du timer ou de l'xicu lors d'un task_switch

File:

• soft/giet_vm/sys/vm_handler.c (modified) (5 diffs)

soft/giet_vm/sys/vm_handler.c

@@ -38 +38 @@
 
     // get ptba and update PT2
-    if ((pt->pt1[ix1] & PTE_V) == 0) {
+    if ((pt->pt1[ix1] & PTE_V) == 0)
+    {
         _puts("\n[GIET ERROR] in iommu_add_pte2 function\n");
         _puts("the IOMMU PT1 entry is not mapped / ix1 = ");
@@ -66 +67 @@
 
     // get ptba and inval PTE2
-    if ((pt->pt1[ix1] & PTE_V) == 0) {
+    if ((pt->pt1[ix1] & PTE_V) == 0)
+    {
         _puts("\n[GIET ERROR] in iommu_inval_pte2 function\n");
         _puts("the IOMMU PT1 entry is not mapped / ix1 = ");
@@ -85 +87 @@
 // Returns 0 if success, 1 if PTE1 or PTE2 unmapped
 //////////////////////////////////////////////////////////////////////////////
-unsigned int _v2p_translate( page_table_t*   pt,
-                             unsigned int    vpn,
-                             unsigned int*   ppn,        
-                             unsigned int*   flags ) 
+unsigned int _v2p_translate(page_table_t * pt,
+                            unsigned int   vpn,
+                            unsigned int * ppn,
+                            unsigned int * flags) 
 {
-    paddr_t                 ptba;
-    paddr_t                 pte2;
+    paddr_t ptba;
+    paddr_t pte2;
 
-    register unsigned int   pte2_msb;
-    register unsigned int   pte2_lsb;
-    register unsigned int   flags_value;
-    register unsigned int   ppn_value;
+    register unsigned int pte2_msb;
+    register unsigned int pte2_lsb;
+    register unsigned int flags_value;
+    register unsigned int ppn_value;
 
     unsigned int ix1 = vpn >> 9;
@@ -102 +104 @@
 
     // check PTE1 mapping
-    if ((pt->pt1[ix1] & PTE_V) == 0) return 1;
+    if ((pt->pt1[ix1] & PTE_V) == 0)
+    {
+        return 1;
+    }
     else 
     {
         // get physical addresses of pte2 
-        ptba     = (paddr_t)(pt->pt1[ix1] & 0x0FFFFFFF) << 12;
-        pte2     = ptba + 8*ix2;
-        pte2_lsb = (unsigned int)pte2;
-        pte2_msb = (unsigned int)(pte2 >> 32);
+        ptba     = (paddr_t) (pt->pt1[ix1] & 0x0FFFFFFF) << 12;
+        pte2     = ptba + 8 * ix2;
+        pte2_lsb = (unsigned int) pte2;
+        pte2_msb = (unsigned int) (pte2 >> 32);
 
         // gets ppn_value and flags_value, after temporary DTLB desactivation
@@ -135 +140 @@
 
         // check PTE2 mapping
-        if ((flags_value & PTE_V) == 0)  return 1; 
+        if ((flags_value & PTE_V) == 0) {
+            return 1;
+        }
 
         // set return values