Changeset b1d3c36 in mainline for kernel/arch

Timestamp:

2010-02-04T16:51:36Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

4cac2d69

Parents:

d32358f

Message:

small arch/generic interface cleanup:
context_set() should be always defined explicitly (either as a custom macro
or as a reference to context_set_generic()), using #undef and implicit macro
values can be rather confusing

Location:

kernel/arch

Files:

• abs32le/include/context.h (modified) (1 diff)
• ia64/include/context.h (modified) (1 diff)
• mips32/include/context.h (modified) (2 diffs)
• ppc32/include/context.h (modified) (3 diffs)
• sparc64/include/context.h (modified) (1 diff)

kernel/arch/abs32le/include/context.h

@@ -39 +39 @@
 #define SP_DELTA         0
 
+#define context_set(ctx, pc, stack, size) \
+    context_set_generic(ctx, pc, stack, size)
+
 /*
  * On real hardware this stores the registers which

kernel/arch/ia64/include/context.h

@@ -48 +48 @@
  */
 #define SP_DELTA        (0 + ALIGN_UP(STACK_ITEM_SIZE, STACK_ALIGNMENT))
-
-#ifdef context_set
-#undef context_set
-#endif
 
 /* RSE stack starts at the bottom of memory stack. */

kernel/arch/mips32/include/context.h

@@ -27 +27 @@
  */
 
-/** @addtogroup mips32  
+/** @addtogroup mips32
  * @{
  */
@@ -42 +42 @@
  * Put one item onto the stack to support get_stack_base() and align it up.
  */
-#define SP_DELTA        (0 + ALIGN_UP(STACK_ITEM_SIZE, STACK_ALIGNMENT))
-
+#define SP_DELTA  (0 + ALIGN_UP(STACK_ITEM_SIZE, STACK_ALIGNMENT))
 
 #ifndef __ASM__
 
 #include <arch/types.h>
+
+#define context_set(ctx, pc, stack, size) \
+    context_set_generic(ctx, pc, stack, size)
 
 /*

kernel/arch/ppc32/include/context.h

@@ -27 +27 @@
  */
 
-/** @addtogroup ppc32   
+/** @addtogroup ppc32
  * @{
  */
@@ -38 +38 @@
 #include <arch/types.h>
 
-#define SP_DELTA        16
+#define SP_DELTA  16
+
+#define context_set(ctx, pc, stack, size) \
+    context_set_generic(ctx, pc, stack, size)
 
 typedef struct {
@@ -68 +71 @@
         
         ipl_t ipl;
-} __attribute__ ((packed)) context_t;
+} __attribute__((packed)) context_t;
 
 #endif

kernel/arch/sparc64/include/context.h

@@ -42 +42 @@
 #define SP_DELTA        (STACK_WINDOW_SAVE_AREA_SIZE + STACK_ARG_SAVE_AREA_SIZE)
 
-#ifdef context_set
-#undef context_set
-#endif
-
 #define context_set(c, _pc, stack, size)                        \
         (c)->pc = ((uintptr_t) _pc) - 8;                        \