Changeset 96598b8 in mainline for uspace/lib/c/arch/mips64/include/fibril.h

Timestamp:

2012-03-16T20:32:13Z (12 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

b191acae

Parents:

53d5278 (diff), 145d16f (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

File:

• uspace/lib/c/arch/mips64/include/fibril.h (modified) (1 diff)

uspace/lib/c/arch/mips64/include/fibril.h

@@ -38 +38 @@
 
 #include <sys/types.h>
+#include <libarch/stack.h>
+#include <align.h>
 
-/* We define our own context_set, because we need to set
- * the TLS pointer to the tcb+0x7000
+#define SP_DELTA  (ABI_STACK_FRAME + ALIGN_UP(STACK_ITEM_SIZE, STACK_ALIGNMENT))
+
+/*
+ * We define our own context_set, because we need to set
+ * the TLS pointer to the tcb + 0x7000
  *
  * See tls_set in thread.h
  */
 #define context_set(c, _pc, stack, size, ptls) \
-        (c)->pc = (sysarg_t) (_pc); \
-        (c)->sp = ((sysarg_t) (stack)) + (size) - SP_DELTA; \
-        (c)->tls = ((sysarg_t)(ptls)) + 0x7000 + sizeof(tcb_t);
-
-/* +16 is just for sure that the called function
- * have space to store it's arguments
- */
-#define SP_DELTA  (8 + 16)
+        do { \
+                (c)->pc = (sysarg_t) (_pc); \
+                (c)->sp = ((sysarg_t) (stack)) + (size) - SP_DELTA; \
+                (c)->tls = ((sysarg_t)(ptls)) + 0x7000 + sizeof(tcb_t); \
+        } while (0)
 
 typedef struct {