Changeset 2a2fbc8 in mainline for kernel/arch/ppc32/src/mm/pht.c

Timestamp:

2016-09-01T17:05:13Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

42d08592

Parents:

f126c87 (diff), fb63c06 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge from lp:~jakub/helenos/pt

File:

• kernel/arch/ppc32/src/mm/pht.c (modified) (3 diffs)

kernel/arch/ppc32/src/mm/pht.c

@@ -49 +49 @@
  * @param access   Access mode that caused the fault.
  * @param istate   Pointer to interrupted state.
- *
- * @return PTE on success, NULL otherwise.
- *
- */
-static pte_t *find_mapping_and_check(as_t *as, uintptr_t badvaddr, int access,
-    istate_t *istate)
+ * @param[out] pte Structure that will receive a copy of the found PTE.
+ *
+ * @return True if the mapping was found, false otherwise.
+ *
+ */
+static bool find_mapping_and_check(as_t *as, uintptr_t badvaddr, int access,
+    istate_t *istate, pte_t *pte)
 {
         /*
          * Check if the mapping exists in page tables.
          */
-        pte_t *pte = page_mapping_find(as, badvaddr, true);
-        if ((pte) && (pte->present)) {
+        bool found = page_mapping_find(as, badvaddr, true, pte);
+        if (found && pte->present) {
                 /*
                  * Mapping found in page tables.
                  * Immediately succeed.
                  */
-                return pte;
+                return true;
         }
         /*
@@ -76 +77 @@
                  * The mapping ought to be in place.
                  */
-                pte = page_mapping_find(as, badvaddr, true);
-                ASSERT((pte) && (pte->present));
-                return pte;
-        }
-
-        return NULL;
+                found = page_mapping_find(as, badvaddr, true, pte);
+
+                ASSERT(found);
+                ASSERT(pte->present);
+
+                return found;
+        }
+
+        return false;
 }
 
@@ -182 +186 @@
                 badvaddr = istate->pc;
         
-        pte_t *pte = find_mapping_and_check(AS, badvaddr,
-            PF_ACCESS_READ /* FIXME */, istate);
-        
-        if (pte) {
+        pte_t pte;
+        bool found = find_mapping_and_check(AS, badvaddr,
+            PF_ACCESS_READ /* FIXME */, istate, &pte);
+        
+        if (found) {
                 /* Record access to PTE */
-                pte->accessed = 1;
-                pht_insert(badvaddr, pte);
+                pte.accessed = 1;
+                pht_insert(badvaddr, &pte);
         }
 }