Changeset da52547 in mainline for kernel/generic

Timestamp:

2010-07-02T10:16:38Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

b5382d4f

Parents:

ad8f03d2

Message:

add early_putchar() which can be used to do early kernel console output for debugging purposes
(the availability of this feature depends on each platform and specific configuration, currently it works only on ia32/amd64 with EGA and no framebuffer)
instrument more kernel functions
mark some functions as no_instrument (context_restore(), overlaps(), main_bsp())

Location:

kernel/generic

Files:

• include/console/console.h (modified) (1 diff)
• include/context.h (modified) (1 diff)
• include/debug.h (modified) (2 diffs)
• include/macros.h (modified) (1 diff)
• src/console/console.c (modified) (1 diff)
• src/debug/debug.c (modified) (3 diffs)
• src/main/main.c (modified) (3 diffs)

kernel/generic/include/console/console.h

@@ -56 +56 @@
 extern outdev_t *stdout;
 
+extern void early_putchar(wchar_t);
+
 extern indev_t *stdin_wire(void);
 extern void stdout_wire(outdev_t *outdev);

kernel/generic/include/context.h

@@ -87 +87 @@
  *
  * @param ctx Context structure.
+ *
  */
-static inline void context_restore(context_t *ctx)
+static inline void __attribute__((no_instrument_function))
+    context_restore(context_t *ctx)
 {
         context_restore_arch(ctx);

kernel/generic/include/debug.h

@@ -98 +98 @@
         } while (0)
 
-extern void __cyg_profile_func_enter(void *, void *);
-extern void __cyg_profile_func_exit(void *, void *);
-
 #else /* CONFIG_LOG */
 
@@ -107 +104 @@
 #endif /* CONFIG_LOG */
 
+#ifdef CONFIG_TRACE
+
+extern void __cyg_profile_func_enter(void *, void *);
+extern void __cyg_profile_func_exit(void *, void *);
+
+#endif /* CONFIG_TRACE */
+
 #endif
 

kernel/generic/include/macros.h

@@ -47 +47 @@
  * @param sz2 Size of the second interval.
  */
-static inline int overlaps(uintptr_t s1, size_t sz1, uintptr_t s2, size_t sz2)
+static inline int __attribute__((no_instrument_function))
+    overlaps(uintptr_t s1, size_t sz1, uintptr_t s2, size_t sz2)
 {
         uintptr_t e1 = s1 + sz1;

kernel/generic/src/console/console.c

@@ -294 +294 @@
                 stdout->op->write(stdout, ch, silent);
         else {
-                /* The character is just in the kernel log */
+                /*
+                 * No standard output routine defined yet.
+                 * The character is still stored in the kernel log
+                 * for possible future output.
+                 *
+                 * The early_putchar() function is used to output
+                 * the character for low-level debugging purposes.
+                 * Note that the early_putc() function might be
+                 * a no-op on certain hardware configurations.
+                 *
+                 */
+                early_putchar(ch);
+                
                 if (klog_stored < klog_len)
                         klog_stored++;

kernel/generic/src/debug/debug.c

@@ -36 +36 @@
  */
 
-#ifdef CONFIG_LOG
+#ifdef CONFIG_TRACE
 
 #include <debug.h>
@@ -52 +52 @@
         if (symtab_name_lookup((uintptr_t) call_site, &call_site_sym,
             &call_site_off) == EOK)
-                printf("%s:%p->%s\n", call_site_sym, call_site_off, fn_sym);
+                printf("%s+%" PRIp "->%s\n", call_site_sym, call_site_off,
+                    fn_sym);
         else
                 printf("->%s\n", fn_sym);
@@ -66 +67 @@
         if (symtab_name_lookup((uintptr_t) call_site, &call_site_sym,
             &call_site_off) == EOK)
-                printf("%s:%p<-%s\n", call_site_sym, call_site_off, fn_sym);
+                printf("%s+%" PRIp "<-%s\n", call_site_sym, call_site_off,
+                    fn_sym);
         else
                 printf("<-%s\n", fn_sym);
 }
 
-#endif /* CONFIG_LOG */
+#endif /* CONFIG_TRACE */
 
 /** @}

kernel/generic/src/main/main.c

@@ -131 +131 @@
  *
  */
-void main_bsp(void)
+void __attribute__((no_instrument_function)) main_bsp(void)
 {
         config.cpu_count = 1;
@@ -183 +183 @@
         version_print();
         
-        LOG("\nconfig.base=%#" PRIp " config.kernel_size=%" PRIs
-            "\nconfig.stack_base=%#" PRIp " config.stack_size=%" PRIs,
+        LOG("\nconfig.base=%p config.kernel_size=%" PRIs
+            "\nconfig.stack_base=%p config.stack_size=%" PRIs,
             config.base, config.kernel_size, config.stack_base,
             config.stack_size);
@@ -241 +241 @@
                 size_t i;
                 for (i = 0; i < init.cnt; i++)
-                        LOG("init[%" PRIs "].addr=%#" PRIp ", init[%" PRIs
-                            "].size=%#" PRIs, i, init.tasks[i].addr, i,
+                        LOG("init[%" PRIs "].addr=%p, init[%" PRIs
+                            "].size=%" PRIs, i, init.tasks[i].addr, i,
                             init.tasks[i].size);
         } else