Changeset e2ea4ab1 in mainline for kernel/generic/include

Timestamp:

2010-07-02T14:22:35Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

09b859c

Parents:

4d1be48 (diff), e3ee9b9 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

Location:

kernel/generic/include

Files:

• console/console.h (modified) (1 diff)
• context.h (modified) (1 diff)
• debug.h (modified) (2 diffs)
• macros.h (modified) (1 diff)
• sort.h (modified) (1 diff)

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

@@ -93 +93 @@
 #define LOG(format, ...) \
         do { \
-                printf("%s->%s() at %s:%u: " format "\n", symtab_fmt_name_lookup(CALLER), \
-                    __func__, __FILE__, __LINE__, ##__VA_ARGS__); \
-        } while (0)
-
-/** Extensive logging execute macro
- *
- * If CONFIG_LOG is set, the LOG_EXEC() macro
- * will print an information about calling a given
- * function and call it.
- *
- */
-#define LOG_EXEC(fnc) \
-        do { \
-                printf("%s->%s() at %s:%u: " #fnc "\n", symtab_fmt_name_lookup(CALLER), \
-                    __func__, __FILE__, __LINE__); \
-                fnc; \
+                printf("%s() from %s at %s:%u: " format "\n", __func__, \
+                    symtab_fmt_name_lookup(CALLER), __FILE__, __LINE__, \
+                    ##__VA_ARGS__); \
         } while (0)
 
@@ -114 +101 @@
 
 #define LOG(format, ...)
-#define LOG_EXEC(fnc)     fnc
 
-#endif /* CONFOG_LOG */
+#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/include/sort.h

@@ -38 +38 @@
 #include <typedefs.h>
 
-/* 
- * sorting routines
- */
-extern void bubblesort(void * data, size_t n, size_t e_size, int (* cmp) (void * a, void * b));
-extern void qsort(void * data, size_t n, size_t e_size, int (* cmp) (void * a, void * b));
+typedef int (* sort_cmp_t)(void *, void *, void *);
 
-/*
- * default sorting comparators
- */
-extern int int_cmp(void * a, void * b);
-extern int uint32_t_cmp(void * a, void * b);
-extern int uint16_t_cmp(void * a, void * b);
-extern int uint8_t_cmp(void * a, void * b);
+extern bool gsort(void *, size_t, size_t, sort_cmp_t, void *);
+extern bool qsort(void *, size_t, size_t, sort_cmp_t, void *);
 
 #endif