Changeset 20d50a1 in mainline for generic/src/proc

Timestamp:

2006-01-13T13:02:45Z (20 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

f9425006

Parents:

0369911

Message:

Memory management work.

• vm.* → as.* (as like address space is, imho, more fitting)
• Don't do TLB shootdown on vm_install(). Some architectures only need to call tlb_invalidate_asid().
• Don't allocate all frames for as_area in as_area_create(), but let them be allocated on-demand by as_page_fault().
• Add high-level page fault handler as_page_fault().
• Add as_area_load_mapping().

Location:

generic/src/proc

Files:

• scheduler.c (modified) (2 diffs)
• task.c (modified) (3 diffs)
• the.c (modified) (1 diff)

generic/src/proc/scheduler.c

@@ -33 +33 @@
 #include <mm/frame.h>
 #include <mm/page.h>
-#include <mm/vm.h>
+#include <mm/as.h>
 #include <arch/asm.h>
 #include <arch/faddr.h>
@@ -353 +353 @@
          */
         if (TASK != THREAD->task) {
-                vm_t *m1 = NULL;
-                vm_t *m2;
+                as_t *as1 = NULL;
+                as_t *as2;
 
                 if (TASK) {
                         spinlock_lock(&TASK->lock);
-                        m1 = TASK->vm;
+                        as1 = TASK->as;
                         spinlock_unlock(&TASK->lock);
                 }
 
                 spinlock_lock(&THREAD->task->lock);
-                m2 = THREAD->task->vm;
+                as2 = THREAD->task->as;
                 spinlock_unlock(&THREAD->task->lock);
                 
                 /*
-                 * Note that it is possible for two tasks to share one vm mapping.
-                 */
-                if (m1 != m2) {
-                        /*
-                         * Both tasks and vm mappings are different.
+                 * Note that it is possible for two tasks to share one address space.
+                 */
+                if (as1 != as2) {
+                        /*
+                         * Both tasks and address spaces are different.
                          * Replace the old one with the new one.
                          */
-                        vm_install(m2);
+                        as_install(as2);
                 }
                 TASK = THREAD->task;    

generic/src/proc/task.c

@@ -29 +29 @@
 #include <proc/thread.h>
 #include <proc/task.h>
-#include <mm/vm.h>
+#include <mm/as.h>
 #include <mm/heap.h>
 
@@ -55 +55 @@
  * Create new task with no threads.
  *
- * @param m Task's virtual memory structure.
+ * @param as Task's address space.
  *
  * @return New task's structure on success, NULL on failure.
  *
  */
-task_t *task_create(vm_t *m)
+task_t *task_create(as_t *as)
 {
         ipl_t ipl;
@@ -70 +70 @@
                 list_initialize(&ta->th_head);
                 list_initialize(&ta->tasks_link);
-                ta->vm = m;
+                ta->as = as;
                 
                 ipl = interrupts_disable();

generic/src/proc/the.c

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