Changeset 36df4109 in mainline for kernel/generic

Timestamp:

2016-06-06T16:29:56Z (10 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

7510326

Parents:

7f0580d

Message:

Introduce architecure-specific operations

This replaces the arch_*_init() functions with an arch_ops_t structure
defined for each architecture. Undefined operations are treated as NOPs.

Location:

kernel/generic

Files:

• include/arch.h (modified) (3 diffs)
• src/main/kinit.c (modified) (1 diff)
• src/main/main.c (modified) (4 diffs)

kernel/generic/include/arch.h

@@ -36 +36 @@
 #define KERN_ARCH_H_
 
-#include <arch/arch.h>  /* arch_pre_main() */
 #include <arch/asm.h>   /* get_stack_base() */
 #include <config.h>
@@ -80 +79 @@
 } the_t;
 
+typedef struct {
+        void (* pre_mm_init)(void);
+        void (* post_mm_init)(void);
+        void (* post_cpu_init)(void);
+        void (* pre_smp_init)(void);
+        void (* post_smp_init)(void);
+} arch_ops_t;
+
+extern arch_ops_t *arch_ops;
+
+#define ARCH_OP(op) \
+        do { \
+                if (arch_ops->op) \
+                        arch_ops->op(); \
+        } while (0)
+
 extern void the_initialize(the_t *);
 extern void the_copy(the_t *, the_t *);
-
-extern void arch_pre_mm_init(void);
-extern void arch_post_mm_init(void);
-extern void arch_post_cpu_init(void);
-extern void arch_pre_smp_init(void);
-extern void arch_post_smp_init(void);
 
 extern void calibrate_delay_loop(void);
@@ -95 +104 @@
 extern void *arch_construct_function(fncptr_t *, void *, void *);
 
-
 #endif
 

kernel/generic/src/main/kinit.c

@@ -160 +160 @@
          * At this point SMP, if present, is configured.
          */
-        arch_post_smp_init();
+        ARCH_OP(post_smp_init);
         
         /* Start thread computing system load */

kernel/generic/src/main/main.c

@@ -238 +238 @@
          * Memory management subsystems initialization.
          */
-        arch_pre_mm_init();
+        ARCH_OP(pre_mm_init);
         km_identity_init();
         frame_init();
@@ -250 +250 @@
         km_non_identity_init();
         ddi_init();
-        arch_post_mm_init();
+        ARCH_OP(post_mm_init);
         reserve_init();
-        arch_pre_smp_init();
+        ARCH_OP(pre_smp_init);
         smp_init();
         
@@ -266 +266 @@
         cpu_init();
         calibrate_delay_loop();
-        arch_post_cpu_init();
+        ARCH_OP(post_cpu_init);
 
         smp_call_init();
@@ -341 +341 @@
         the_initialize(THE);
         
-        arch_pre_mm_init();
+        ARCH_OP(pre_mm_init);
         frame_init();
         page_init();
         tlb_init();
-        arch_post_mm_init();
+        ARCH_OP(post_mm_init);
         
         cpu_init();
         calibrate_delay_loop();
-        arch_post_cpu_init();
+        ARCH_OP(post_cpu_init);
         
         the_copy(THE, (the_t *) CPU->stack);