Changeset d43d2f7 in mainline for generic

Timestamp:

2005-12-06T19:42:04Z (20 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

090e7ea1

Parents:

795ff98

Message:

Cleanup and fixes.

Location:

generic

Files:

• include/mm/frame.h (modified) (1 diff)
• src/console/kconsole.c (modified) (2 diffs)
• src/cpu/cpu.c (modified) (1 diff)
• src/mm/page.c (modified) (3 diffs)
• src/mm/vm.c (modified) (2 diffs)
• src/proc/thread.c (modified) (1 diff)

generic/include/mm/frame.h

@@ -36 +36 @@
 #include <synch/spinlock.h>
 #include <mm/buddy.h>
+
+#define ONE_FRAME       0
 
 #define FRAME_KA        1       /* skip frames conflicting with user address space */

generic/src/console/kconsole.c

@@ -426 +426 @@
 }
 
+/** Print detailed description of 'describe' command. */
+void desc_help(void)
+{
+        printf("Syntax: describe command_name\n");
+}
+
 /** Halt the kernel.
  *
- * @param argv Argument vector.
- *
- * @return 0 on failure, 1 on success.
+ * @param argv Argument vector (ignored).
+ *
+ * @return 0 on failure, 1 on success (never returns).
  */
 int cmd_halt(cmd_arg_t *argv)
@@ -437 +443 @@
         return 1;
 }
-
-/** Print detailed description of 'describe' command. */
-void desc_help(void)
-{
-        printf("Syntax: describe command_name\n");
-}

generic/src/cpu/cpu.c

@@ -61 +61 @@
 
                 for (i=0; i < config.cpu_count; i++) {
-                        cpus[i].stack = (__u8 *) frame_alloc(FRAME_KA | FRAME_PANIC,0);
+                        cpus[i].stack = (__u8 *) frame_alloc(FRAME_KA | FRAME_PANIC, ONE_FRAME);
                         if (!cpus[i].stack)
                                 panic("malloc/cpus[%d].stack\n", i);

generic/src/mm/page.c

@@ -80 +80 @@
 
         if (GET_PTL1_FLAGS(ptl0, PTL0_INDEX(page)) & PAGE_NOT_PRESENT) {
-                newpt = frame_alloc(FRAME_KA, 0);
+                newpt = frame_alloc(FRAME_KA, ONE_FRAME);
                 memsetb(newpt, PAGE_SIZE, 0);
                 SET_PTL1_ADDRESS(ptl0, PTL0_INDEX(page), KA2PA(newpt));
-                SET_PTL1_FLAGS(ptl0, PTL0_INDEX(page), PAGE_PRESENT | PAGE_USER | PAGE_EXEC);
+                SET_PTL1_FLAGS(ptl0, PTL0_INDEX(page), PAGE_PRESENT | PAGE_USER | PAGE_EXEC | PAGE_CACHEABLE);
         }
 
@@ -89 +89 @@
 
         if (GET_PTL2_FLAGS(ptl1, PTL1_INDEX(page)) & PAGE_NOT_PRESENT) {
-                newpt = frame_alloc(FRAME_KA, 0);
+                newpt = frame_alloc(FRAME_KA, ONE_FRAME);
                 memsetb(newpt, PAGE_SIZE, 0);
                 SET_PTL2_ADDRESS(ptl1, PTL1_INDEX(page), KA2PA(newpt));
-                SET_PTL2_FLAGS(ptl1, PTL1_INDEX(page), PAGE_PRESENT | PAGE_USER | PAGE_EXEC);
+                SET_PTL2_FLAGS(ptl1, PTL1_INDEX(page), PAGE_PRESENT | PAGE_USER | PAGE_EXEC | PAGE_CACHEABLE);
         }
 
@@ -98 +98 @@
 
         if (GET_PTL3_FLAGS(ptl2, PTL2_INDEX(page)) & PAGE_NOT_PRESENT) {
-                newpt = frame_alloc(FRAME_KA, 0);
+                newpt = frame_alloc(FRAME_KA, ONE_FRAME);
                 memsetb(newpt, PAGE_SIZE, 0);
                 SET_PTL3_ADDRESS(ptl2, PTL2_INDEX(page), KA2PA(newpt));
-                SET_PTL3_FLAGS(ptl2, PTL2_INDEX(page), PAGE_PRESENT | PAGE_USER | PAGE_EXEC);
+                SET_PTL3_FLAGS(ptl2, PTL2_INDEX(page), PAGE_PRESENT | PAGE_USER | PAGE_EXEC | PAGE_CACHEABLE);
         }
 

generic/src/mm/vm.c

@@ -70 +70 @@
                 
                         src_ptl0 = (pte_t *) PA2KA((__address) GET_PTL0_ADDRESS());
-                        dst_ptl0 = (pte_t *) frame_alloc(FRAME_KA | FRAME_PANIC, 0);
+                        dst_ptl0 = (pte_t *) frame_alloc(FRAME_KA | FRAME_PANIC, ONE_FRAME);
 
 //                      memsetb((__address) dst_ptl0, PAGE_SIZE, 0);
@@ -116 +116 @@
                 
                 for (i=0; i<size; i++)
-                        a->mapping[i] = frame_alloc(0,0);
+                        a->mapping[i] = frame_alloc(0, ONE_FRAME);
                 
                 spinlock_initialize(&a->lock);

generic/src/proc/thread.c

@@ -176 +176 @@
                 spinlock_initialize(&t->lock);
         
-                frame_ks = frame_alloc(FRAME_KA,0);
+                frame_ks = frame_alloc(FRAME_KA, ONE_FRAME);
                 if (THREAD_USER_STACK & flags) {
-                        frame_us = frame_alloc(FRAME_KA,0);
+                        frame_us = frame_alloc(FRAME_KA, ONE_FRAME);
                 }