Changeset d1a184f in mainline

Timestamp:

2005-06-03T19:37:31Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

d47f0e1

Parents:

673104e

Message:

Discard 'copy' parameter of map_page_to_frame().
Introduce 'root' parameter of map_page_to_frame().
If 'root' is zero, page directory address is read from CPU.
Otherwise 'root' is used as page directory address.

Add missing word to new doxygen-style comments in scheduler.c.

Files:

• arch/ia32/src/mm/page.c (modified) (4 diffs)
• arch/mips/src/mm/page.c (modified) (1 diff)
• include/mm/page.h (modified) (1 diff)
• src/proc/scheduler.c (modified) (1 diff)

arch/ia32/src/mm/page.c

@@ -65 +65 @@
                  */
                 for (i = 1; i < frames; i++) {
-                        map_page_to_frame(i * PAGE_SIZE, i * PAGE_SIZE, PAGE_CACHEABLE, 0);
-                        map_page_to_frame(PA2KA(i * PAGE_SIZE), i * PAGE_SIZE, PAGE_CACHEABLE, 0);                      
+                        map_page_to_frame(i * PAGE_SIZE, i * PAGE_SIZE, PAGE_CACHEABLE, dba);
+                        map_page_to_frame(PA2KA(i * PAGE_SIZE), i * PAGE_SIZE, PAGE_CACHEABLE, dba);
                 }
 
@@ -95 +95 @@
  * care of it and allocate the necessary frame.
  *
- * When the copy parameter is positive, map_page_to_frame will not overwrite
- * the current mapping. It will allocate a new frame and do the mapping on it
- * instead.
- *
  * PAGE_CACHEABLE flag: when set, it turns caches for that page on
  * PAGE_NOT_PRESENT flag: when set, it marks the page not present
  * PAGE_USER flag: when set, the page is accessible from userspace
+ *
+ * When the root parameter is non-zero, it is used as the page directory address.
+ * Otherwise, the page directory address is read from CPU.
  */
-void map_page_to_frame(__address page, __address frame, int flags, int copy)
+void map_page_to_frame(__address page, __address frame, int flags, __address root)
 {
         struct page_specifier *pd, *pt;
@@ -109 +108 @@
         int pde, pte;
 
-//      TODO: map_page_to_frame should take dba as a parameter
-//      dba = cpu_read_dba();
-        dba = bootstrap_dba;
+        if (root) dba = root;
+        else dba = cpu_read_dba();
 
         pde = page >> 22;               /* page directory entry */
@@ -129 +127 @@
                 pd[pde].uaccessible = 1;
         }
-        if (copy) {
-                newpt = frame_alloc(FRAME_KA);
-                memcopy(pd[pde].frame_address << 12, newpt, PAGE_SIZE);
-                pd[pde].frame_address = KA2PA(newpt) >> 12;
-        }
         
         pt = (struct page_specifier *) (pd[pde].frame_address << 12);

arch/mips/src/mm/page.c

@@ -30 +30 @@
 #include <mm/page.h>
 
-void map_page_to_frame(__address page, __address frame, int flags, int copy)
+void map_page_to_frame(__address page, __address frame, int flags, __address root)
 {
         /* TODO !!! */

include/mm/page.h

@@ -47 +47 @@
 
 extern void page_init(void);
-extern void map_page_to_frame(__address page, __address frame, int flags, int copy);
+extern void map_page_to_frame(__address page, __address frame, int flags, __address root);
 
 #endif

src/proc/scheduler.c

@@ -85 +85 @@
  *
  * Get the optimal thread to be scheduled
- * according thread accounting and scheduler
+ * according to thread accounting and scheduler
  * policy.
  *