Changeset 2d01bbd in mainline

Timestamp:

2006-03-14T15:25:23Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

6463264c

Parents:

8b1439e

Message:

Fixed shrinking of as area.

Files:

• arch/mips32/src/mm/tlb.c (modified) (3 diffs)
• generic/src/mm/as.c (modified) (2 diffs)

arch/mips32/src/mm/tlb.c

@@ -39 +39 @@
 #include <print.h>
 #include <debug.h>
+#include <align.h>
 
 static void tlb_refill_fail(istate_t *istate);
@@ -391 +392 @@
 void prepare_entry_hi(entry_hi_t *hi, asid_t asid, __address addr)
 {
-        hi->value = (((addr/PAGE_SIZE)/2)*PAGE_SIZE*2);
+        hi->value = ALIGN_DOWN(addr, PAGE_SIZE * 2);
         hi->asid = asid;
 }
@@ -514 +515 @@
         ipl = interrupts_disable();
 
-        for (i = 0; i < cnt; i++) {
+        for (i = 0; i < cnt+1; i+=2) {
                 hi.value = 0;
                 prepare_entry_hi(&hi, asid, page + i * PAGE_SIZE);

generic/src/mm/as.c

@@ -404 +404 @@
                                 ASSERT(PTE_PRESENT(pte));
                                 frame_free(ADDR2PFN(PTE_GET_FRAME(pte)));
+                                page_mapping_remove(as, area->base + i*PAGE_SIZE);
                         }
-                        page_mapping_remove(as, area->base + i*PAGE_SIZE);
                 }
                 /*
@@ -413 +413 @@
                 tlb_invalidate_pages(AS->asid, area->base + pages*PAGE_SIZE, area->size - pages);
                 tlb_shootdown_finalize();
-        } else {
-                /*
-                 * Growing the area.
-                 */
-                area->size = size;
-        }
+        } 
+
+        area->size = pages;
         
         spinlock_unlock(&area->lock);