Changeset 1066041 in mainline for kernel/generic/include/arch.h

Timestamp:

2012-07-11T07:58:03Z (13 years ago)

Author:

Adam Hraska <adam.hraska+hos@…>

Branches:

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

Children:

935e28c

Parents:

b68ae24

Message:

preemption_disable: Turned functions into macros. Moved THREAD, AS, TASK, CPU into thread.h, as.h, task.h, cpu.h to fix the include hell that ensued.

File:

• kernel/generic/include/arch.h (modified) (5 diffs)

kernel/generic/include/arch.h

@@ -36 +36 @@
 #define KERN_ARCH_H_
 
-#include <arch/arch.h>
-#include <proc/thread.h>
-#include <proc/task.h>
-#include <mm/as.h>
+#include <arch/arch.h>  /* arch_pre_main() */
+#include <arch/asm.h>   /* get_stack_base() */
+
 
 /*
@@ -49 +48 @@
 #define THE  ((the_t * )(get_stack_base()))
 
-#define CPU                  THE->cpu
-#define THREAD               THE->thread
-#define TASK                 THE->task
-#define AS                   THE->as
-#define PREEMPTION_DISABLED  (0 != THE->preemption_disabled)
-#define PREEMPTION_ENABLED   (0 == THE->preemption_disabled)
 #define MAGIC                UINT32_C(0xfacefeed)
 
@@ -63 +56 @@
         ((THE->task) ? (THE->task->container) : (DEFAULT_CONTAINER))
 
+/* Fwd decl. to avoid include hell. */
+struct thread;
+struct task;
+struct cpu;
+struct as;
+
 /**
  * For each possible kernel stack, structure
@@ -69 +68 @@
  */
 typedef struct {
-        size_t preemption_disabled;  /**< Preemption disabled counter. */
-        thread_t *thread;            /**< Current thread. */
-        task_t *task;                /**< Current task. */
-        cpu_t *cpu;                  /**< Executing cpu. */
-        as_t *as;                    /**< Current address space. */
-        uint32_t magic;              /**< Magic value */
+        size_t preemption;     /**< Preemption disabled counter and flag. */
+        struct thread *thread; /**< Current thread. */
+        struct task *task;     /**< Current task. */
+        struct cpu *cpu;       /**< Executing cpu. */
+        struct as *as;         /**< Current address space. */
+        uint32_t magic;        /**< Magic value */
 } the_t;
 
@@ -92 +91 @@
 extern void *arch_construct_function(fncptr_t *, void *, void *);
 
+
 #endif