Changeset 04803bf in mainline for uspace/lib/c/arch/amd64/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/amd64/include/fibril.h (moved) (moved from uspace/lib/libc/arch/amd64/include/fibril.h ) (1 diff)

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

@@ -44 +44 @@
 #define SP_DELTA     16
 
+#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); \
+                (c)->rbp = 0; \
+        } while (0)
+
 /* We include only registers that must be preserved
  * during function call
  */
 typedef struct {
-    uint64_t sp;
-    uint64_t pc;
-    
-    uint64_t rbx;
-    uint64_t rbp;
+        uint64_t sp;
+        uint64_t pc;
 
-    uint64_t r12;
-    uint64_t r13;
-    uint64_t r14;
-    uint64_t r15;
+        uint64_t rbx;
+        uint64_t rbp;
 
-    uint64_t tls;
+        uint64_t r12;
+        uint64_t r13;
+        uint64_t r14;
+        uint64_t r15;
+
+        uint64_t tls;
 } context_t;
+
+static inline uintptr_t context_get_fp(context_t *ctx)
+{
+        return ctx->rbp;
+}
 
 #endif