Changeset 43114c5 in mainline for src/main

Timestamp:

2005-04-09T18:22:53Z (21 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

8262010

Parents:

e6ba9a3f

Message:

Introduce macros CPU, THREAD, TASK and use them to replace the→cpu, the→thread, the→task.
Later on, this will make it possible to reference *current* cpu, thread and/or task without the aid from virtual memory.

Location:

src/main

Files:

• kinit.c (modified) (2 diffs)
• main.c (modified) (1 diff)

src/main/kinit.c

@@ -71 +71 @@
                  * Just a beautification.
                  */
-                if (t = thread_create(kmp, NULL, the->task, 0)) {
+                if (t = thread_create(kmp, NULL, TASK, 0)) {
                         spinlock_lock(&t->lock);
                         t->flags |= X_WIRED;
@@ -96 +96 @@
                 for (i = 0; i < config.cpu_count; i++) {
 
-                        if (t = thread_create(kcpulb, NULL, the->task, 0)) {
+                        if (t = thread_create(kcpulb, NULL, TASK, 0)) {
                                 spinlock_lock(&t->lock);                        
                                 t->flags |= X_WIRED;

src/main/main.c

@@ -185 +185 @@
          * switch to this cpu's private stack prior to waking kmp up.
          */
-        the->cpu->saved_context.sp = (__address) &the->cpu->stack[CPU_STACK_SIZE-8];
-        the->cpu->saved_context.pc = (__address) main_ap_separated_stack;
-        context_restore(&the->cpu->saved_context);
+        CPU->saved_context.sp = (__address) &CPU->stack[CPU_STACK_SIZE-8];
+        CPU->saved_context.pc = (__address) main_ap_separated_stack;
+        context_restore(&CPU->saved_context);
         /* not reached */
 }