Changeset 4f5dc18 in mainline for kernel/generic/include

Timestamp:

2009-11-03T21:36:54Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

1647323

Parents:

bbddafb (diff), b1c21c2 (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 with mainline.

Location:

kernel/generic/include

Files:

• context.h (modified) (2 diffs)
• print.h (modified) (1 diff)
• printf/printf_core.h (modified) (1 diff)
• stackarg.h (deleted)
• stdarg.h (modified) (3 diffs)

kernel/generic/include/context.h

@@ -51 +51 @@
 /** Save register context.
  *
- * Save current register context (including stack pointers)
- * to context structure.
- *
- * Note that call to context_restore() will return at the same
+ * Save the current register context (including stack pointer) to a context
+ * structure. A subsequent call to context_restore() will return to the same
  * address as the corresponding call to context_save().
  *
- * This MUST be a macro, gcc -O0 does not inline functions even
- * if they are marked inline and context_save_arch must be called
- * from level <= that when context_restore is called.
+ * Note that context_save_arch() must reuse the stack frame of the function
+ * which called context_save(). We guarantee this by:
  *
- * @param c Context structure.
+ *   a) implementing context_save_arch() in assembly so that it does not create
+ *      its own stack frame, and by
+ *   b) defining context_save() as a macro because the inline keyword is just a
+ *      hint for the compiler, not a real constraint; the application of a macro
+ *      will definitely not create a stack frame either.
  *
- * @return context_save() returns 1, context_restore() returns 0.
+ * To imagine what could happen if there were some extra stack frames created
+ * either by context_save() or context_save_arch(), we need to realize that the
+ * sp saved in the contex_t structure points to the current stack frame as it
+ * existed when context_save_arch() was executing. After the return from
+ * context_save_arch() and context_save(), any extra stack frames created by
+ * these functions will be destroyed and their contents sooner or later
+ * overwritten by functions called next. Any attempt to restore to a context
+ * saved like that would therefore lead to a disaster.
+ *
+ * @param c             Context structure.
+ *
+ * @return              context_save() returns 1, context_restore() returns 0.
  */
 #define context_save(c)   context_save_arch(c)
@@ -69 +81 @@
 /** Restore register context.
  *
- * Restore previously saved register context (including stack pointers)
- * from context structure.
+ * Restore a previously saved register context (including stack pointer) from
+ * a context structure.
  *
- * Note that this function does not normally return.
- * Instead, it returns at the same address as the
- * corresponding call to context_save(), the only
- * difference being return value.
+ * Note that this function does not normally return.  Instead, it returns to the
+ * same address as the corresponding call to context_save(), the only difference
+ * being return value.
  *
- * @param c Context structure.
+ * @param c             Context structure.
  */
 static inline void context_restore(context_t *c)

kernel/generic/include/print.h

@@ -37 +37 @@
 
 #include <arch/types.h>
-#include <arch/arg.h>
+#include <stdarg.h>
 
 #define EOF (-1)

kernel/generic/include/printf/printf_core.h

@@ -37 +37 @@
 
 #include <typedefs.h>
-#include <arch/arg.h>
+#include <stdarg.h>
 
 /** Structure for specifying output methods for different printf clones. */

kernel/generic/include/stdarg.h

@@ -27 +27 @@
  */
 
-/** @addtogroup generic 
+/** @addtogroup generic
  * @{
  */
@@ -37 +37 @@
  * for all architectures with compiler support for __builtin_va_*.
  */
- 
+
 #ifndef KERN_STDARG_H_
 #define KERN_STDARG_H_
@@ -43 +43 @@
 typedef __builtin_va_list va_list;
 
-#define va_start(ap, last)              __builtin_va_start(ap, last)
-#define va_arg(ap, type)                __builtin_va_arg(ap, type)
-#define va_end(ap)                      __builtin_va_end(ap)
-#define va_copy(dst, src)               __builtin_va_copy(dst, src)
+#define va_start(ap, last)  __builtin_va_start(ap, last)
+#define va_arg(ap, type)    __builtin_va_arg(ap, type)
+#define va_end(ap)          __builtin_va_end(ap)
+#define va_copy(dst, src)   __builtin_va_copy(dst, src)
 
 #endif