Changeset 2a2fbc8 in mainline for kernel/generic/src/mm/as.c

Timestamp:

2016-09-01T17:05:13Z (9 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/generic/src/mm/as.c (modified) (6 diffs)

kernel/generic/src/mm/as.c

@@ -889 +889 @@
                 
                                 for (; i < node_size; i++) {
-                                        pte_t *pte = page_mapping_find(as,
-                                            ptr + P2SZ(i), false);
+                                        pte_t pte;
+                                        bool found = page_mapping_find(as,
+                                            ptr + P2SZ(i), false, &pte);
                                         
-                                        ASSERT(pte);
-                                        ASSERT(PTE_VALID(pte));
-                                        ASSERT(PTE_PRESENT(pte));
+                                        ASSERT(found);
+                                        ASSERT(PTE_VALID(&pte));
+                                        ASSERT(PTE_PRESENT(&pte));
                                         
                                         if ((area->backend) &&
@@ -900 +901 @@
                                                 area->backend->frame_free(area,
                                                     ptr + P2SZ(i),
-                                                    PTE_GET_FRAME(pte));
+                                                    PTE_GET_FRAME(&pte));
                                         }
                                         
@@ -1003 +1004 @@
                         
                         for (size = 0; size < (size_t) node->value[i]; size++) {
-                                pte_t *pte = page_mapping_find(as,
-                                     ptr + P2SZ(size), false);
+                                pte_t pte;
+                                bool found = page_mapping_find(as,
+                                     ptr + P2SZ(size), false, &pte);
                                 
-                                ASSERT(pte);
-                                ASSERT(PTE_VALID(pte));
-                                ASSERT(PTE_PRESENT(pte));
+                                ASSERT(found);
+                                ASSERT(PTE_VALID(&pte));
+                                ASSERT(PTE_PRESENT(&pte));
                                 
                                 if ((area->backend) &&
@@ -1014 +1016 @@
                                         area->backend->frame_free(area,
                                             ptr + P2SZ(size),
-                                            PTE_GET_FRAME(pte));
+                                            PTE_GET_FRAME(&pte));
                                 }
                                 
@@ -1315 +1317 @@
                         
                         for (size = 0; size < (size_t) node->value[i]; size++) {
-                                pte_t *pte = page_mapping_find(as,
-                                    ptr + P2SZ(size), false);
+                                pte_t pte;
+                                bool found = page_mapping_find(as,
+                                    ptr + P2SZ(size), false, &pte);
                                 
-                                ASSERT(pte);
-                                ASSERT(PTE_VALID(pte));
-                                ASSERT(PTE_PRESENT(pte));
+                                ASSERT(found);
+                                ASSERT(PTE_VALID(&pte));
+                                ASSERT(PTE_PRESENT(&pte));
                                 
-                                old_frame[frame_idx++] = PTE_GET_FRAME(pte);
+                                old_frame[frame_idx++] = PTE_GET_FRAME(&pte);
                                 
                                 /* Remove old mapping */
@@ -1452 +1455 @@
          * we need to make sure the mapping has not been already inserted.
          */
-        pte_t *pte;
-        if ((pte = page_mapping_find(AS, page, false))) {
-                if (PTE_PRESENT(pte)) {
-                        if (((access == PF_ACCESS_READ) && PTE_READABLE(pte)) ||
-                            (access == PF_ACCESS_WRITE && PTE_WRITABLE(pte)) ||
-                            (access == PF_ACCESS_EXEC && PTE_EXECUTABLE(pte))) {
+        pte_t pte;
+        bool found = page_mapping_find(AS, page, false, &pte);
+        if (found) {
+                if (PTE_PRESENT(&pte)) {
+                        if (((access == PF_ACCESS_READ) && PTE_READABLE(&pte)) ||
+                            (access == PF_ACCESS_WRITE && PTE_WRITABLE(&pte)) ||
+                            (access == PF_ACCESS_EXEC && PTE_EXECUTABLE(&pte))) {
                                 page_table_unlock(AS, false);
                                 mutex_unlock(&area->lock);