Changeset 1084a784 in mainline for src

Timestamp:

2005-10-04T22:09:41Z (20 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

342de62

Parents:

8e3f47b3

Message:

mips32 memory management work.
TLB Refill Exception implemented (passed basic testing).
Remove bit g from struct entry_hi.
Add generic find_mapping().
Add asid to vm_t type, define asid_t to hide architecture specific differences.
Implement ASID allocation for mips32, dummy for other architectures.
Add THE→vm (a.k.a. VM).
Add vm_install_arch().
Move pte_t definition to arch/types.h on each architecture.
Fix PTL manipulating functions on mips32 to shift pfn by 12 instead of by 14.
Fix tlb_init_arch() to initialize all entries.

Other.
Remove unnecessary header files from arch.h
Add missing headers here and there.
Remove two unnecessary ld flags from mips32 makefile.

Location:

src

Files:

• main/kinit.c (modified) (1 diff)
• mm/page.c (modified) (2 diffs)
• mm/vm.c (modified) (3 diffs)
• proc/the.c (modified) (1 diff)
• time/clock.c (modified) (1 diff)

src/main/kinit.c

@@ -54 +54 @@
 #include <test.h>
 #endif /* __TEST__ */
+
+#include <mm/frame.h>
 
 void kinit(void *arg)

src/mm/page.c

@@ -34 +34 @@
 #include <arch/asm.h>
 #include <memstr.h>
-
 
 void page_init(void)
@@ -110 +109 @@
         SET_FRAME_FLAGS(ptl3, PTL3_INDEX(page), flags);
 }
+
+/** Find mapping for virtual page
+ *
+ * Find mapping for virtual page.
+ *
+ * @param page Virtual page.
+ * @param root PTL0 address if non-zero.
+ *
+ * @return NULL if there is no such mapping; entry from PTL3 describing the mapping otherwise.
+ */
+pte_t *find_mapping(__address page, __address root)
+{
+        pte_t *ptl0, *ptl1, *ptl2, *ptl3;
+
+        ptl0 = (pte_t *) PA2KA(root ? root : (__address) GET_PTL0_ADDRESS());
+
+        if (GET_PTL1_FLAGS(ptl0, PTL0_INDEX(page)) & PAGE_NOT_PRESENT)
+                return NULL;
+
+        ptl1 = (pte_t *) PA2KA(GET_PTL1_ADDRESS(ptl0, PTL0_INDEX(page)));
+
+        if (GET_PTL2_FLAGS(ptl1, PTL1_INDEX(page)) & PAGE_NOT_PRESENT)
+                return NULL;
+
+        ptl2 = (pte_t *) PA2KA(GET_PTL2_ADDRESS(ptl1, PTL1_INDEX(page)));
+
+        if (GET_PTL3_FLAGS(ptl2, PTL2_INDEX(page)) & PAGE_NOT_PRESENT)
+                return NULL;
+
+        ptl3 = (pte_t *) PA2KA(GET_PTL3_ADDRESS(ptl2, PTL2_INDEX(page)));
+
+        return &ptl3[PTL3_INDEX(page)];
+}

src/mm/vm.c

@@ -33 +33 @@
 #include <mm/heap.h>
 #include <arch/mm/page.h>
+#include <arch/mm/asid.h>
+#include <arch/mm/vm.h>
 #include <arch/types.h>
 #include <typedefs.h>
@@ -56 +58 @@
                 spinlock_initialize(&m->lock);
                 list_initialize(&m->vm_area_head);
+
+                m->asid = asid_get();
 
                 /*
@@ -200 +204 @@
 
         cpu_priority_restore(pri);
-}
+
+        vm_install_arch(m);
+        
+        VM = m;
+}

src/proc/the.c

@@ -44 +44 @@
         the->thread = NULL;
         the->task = NULL;
+        the->vm = NULL;
 }
 

src/time/clock.c

@@ -40 +40 @@
 #include <list.h>
 #include <arch/atomic.h>
+#include <proc/thread.h>
 
 /** Clock routine