Changeset 623ba26c in mainline

Timestamp:

2005-09-01T14:42:09Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

e83a9f7

Parents:

db3341e

Message:

Add couple of assertions CPU != NULL.

Change type of nrdy from int to count_t.

Rewrite halt() to avoid page fault when CPU == NULL.

Files:

• arch/mips/src/exception.c (modified) (2 diffs)
• include/proc/scheduler.h (modified) (1 diff)
• src/lib/func.c (modified) (1 diff)
• src/mm/vm.c (modified) (1 diff)
• src/proc/scheduler.c (modified) (5 diffs)
• src/proc/thread.c (modified) (1 diff)

arch/mips/src/exception.c

@@ -33 +33 @@
 #include <arch/types.h>
 #include <arch.h>
+#include <debug.h>
 
 void exception(void)
@@ -40 +41 @@
         __u32 epc_shift = 0;
         pri_t pri;
+
+        ASSERT(CPU != NULL);
 
         /*

include/proc/scheduler.h

@@ -44 +44 @@
 };
 
-extern volatile int nrdy;
+extern volatile count_t nrdy;
 
 static thread_t *find_best_thread(void);

src/lib/func.c

@@ -45 +45 @@
         haltstate = 1;
         cpu_priority_high();
-        printf("cpu%d: halted\n", CPU->id);
+        if (CPU)
+                printf("cpu%d: halted\n", CPU->id);
+        else
+                printf("cpu: halted\n");
         cpu_halt();
 }

src/mm/vm.c

@@ -67 +67 @@
                         src_ptl0 = (pte_t *) PA2KA((__address) GET_PTL0_ADDRESS());
                         dst_ptl0 = (pte_t *) frame_alloc(FRAME_KA | FRAME_PANIC);
+
+                        /* TODO: in theory, it should be only necessary to copy kernel address space... */
                         memcpy((void *)PA2KA((__address) dst_ptl0), (void *)GET_PTL0_ADDRESS() , PAGE_SIZE);
+
                         m->ptl0 = (pte_t *) KA2PA((__address) dst_ptl0);
                 }

src/proc/scheduler.c

@@ -47 +47 @@
 #include <mm/frame.h>
 #include <mm/heap.h>
-
-
-volatile int nrdy;
+#include <debug.h>
+
+volatile count_t nrdy;
 
 
@@ -90 +90 @@
         runq_t *r;
         int i, n;
+
+        ASSERT(CPU != NULL);
 
 loop:
@@ -148 +150 @@
                 spinlock_unlock(&CPU->lock);
 
-                atomic_dec(&nrdy);
+                atomic_dec((int *) &nrdy);
                 r->n--;
 
@@ -230 +232 @@
         volatile pri_t pri;
 
+        ASSERT(CPU != NULL);
+
         pri = cpu_priority_high();
 
@@ -292 +296 @@
 {
         int priority;
+
+        ASSERT(CPU != NULL);
 
         if (THREAD) {

src/proc/thread.c

@@ -137 +137 @@
         spinlock_unlock(&r->lock);
 
-        atomic_inc(&nrdy);
+        atomic_inc((int *) &nrdy);
         avg = nrdy / config.cpu_active;