Changeset 04803bf in mainline for uspace/lib/c/arch/arm32/include/fibril.h

Timestamp:

2011-03-21T22:00:17Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

143932e3

Parents:

b50b5af2 (diff), 7308e84 (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 (needs fixes).

File:

• uspace/lib/c/arch/arm32/include/fibril.h (moved) (moved from uspace/lib/libc/arch/arm32/include/fibril.h ) (2 diffs)

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

@@ -58 +58 @@
  *  @param ptls  Pointer to the TCB.
  */
-#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)) + sizeof(tcb_t) + ARM_TP_OFFSET;
-
+#define context_set(c, _pc, stack, size, ptls) \
+        do { \
+                (c)->pc = (sysarg_t) (_pc); \
+                (c)->sp = ((sysarg_t) (stack)) + (size) - SP_DELTA; \
+                (c)->tls = ((sysarg_t)(ptls)) + sizeof(tcb_t) + ARM_TP_OFFSET; \
+                (c)->fp = 0; \
+        } while (0)
 
 /** Fibril context. 
@@ -79 +81 @@
         uint32_t r7;
         uint32_t r8;
-        uint32_t tls;
+        uint32_t tls;   /* r9 */
         uint32_t r10;
-        uint32_t r11;
+        uint32_t fp;    /* r11 */
 } context_t;
+
+static inline uintptr_t context_get_fp(context_t *ctx)
+{
+        return ctx->fp;
+}