Changeset e503d3a9 in mainline for uspace/lib/c/arch

Timestamp:

2010-10-25T21:33:03Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

e7f6389

Parents:

b14b71e (diff), 84b7384 (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 from lp:~jakub/helenos/deadlock-detection.

Location:

uspace/lib/c/arch

Files:

• abs32le/include/fibril.h (modified) (2 diffs)
• amd64/include/fibril.h (modified) (1 diff)
• arm32/include/fibril.h (modified) (1 diff)
• ia32/include/fibril.h (modified) (1 diff)
• ia64/include/fibril.h (modified) (1 diff)
• mips32/include/fibril.h (modified) (1 diff)
• ppc32/include/fibril.h (modified) (1 diff)
• sparc64/include/fibril.h (modified) (1 diff)

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

@@ -44 +44 @@
                 (ctx)->pc = (uintptr_t) (_pc); \
                 (ctx)->sp = ((uintptr_t) (stack)) + (size) - SP_DELTA; \
+                (ctx)->fp = 0; \
                 (ctx)->tls = ((uintptr_t) (ptls)) + sizeof(tcb_t); \
         } while (0)
@@ -53 +54 @@
 typedef struct {
         uintptr_t sp;
+        uintptr_t fp;
         uintptr_t pc;
         uintptr_t tls;
 } context_t;
+
+static inline uintptr_t context_get_fp(context_t *ctx)
+{
+        /* On real hardware, this function returns the frame pointer. */
+        return ctx->fp;
+}
 
 #endif

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

@@ -56 +56 @@
  */
 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

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

@@ -86 +86 @@
 } context_t;
 
+static inline uintptr_t context_get_fp(context_t *ctx)
+{
+        return ctx->fp;
+}
+
 
 #endif

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

@@ -67 +67 @@
 } context_t;
 
+static inline uintptr_t context_get_fp(context_t *ctx)
+{
+        return ctx->ebp;
+}
+
 #endif
 

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

@@ -130 +130 @@
 } context_t;
 
+static inline uintptr_t context_get_fp(context_t *ctx)
+{
+        return 0;       /* FIXME */
+}
+
 #endif
 

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

@@ -85 +85 @@
 } context_t;
 
+static inline uintptr_t context_get_fp(context_t *ctx)
+{
+        return ctx->sp;
+}
+
 #endif
 

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

@@ -78 +78 @@
 } __attribute__ ((packed)) context_t;
 
+static inline uintptr_t context_get_fp(context_t *ctx)
+{
+        return ctx->sp;
+}
+
 #endif
 

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

@@ -77 +77 @@
 } context_t;
 
+static inline uintptr_t context_get_fp(context_t *ctx)
+{
+        return ctx->sp + STACK_BIAS;
+}
+
 #endif