Changeset 4687a26c in mainline for uspace/lib/c/arch/abs32le/include

Timestamp:

2010-11-02T18:29:01Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

4f35b9ff

Parents:

76e1121f (diff), 28f4adb (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.

Location:

uspace/lib/c/arch/abs32le/include

Files:

• fibril.h (modified) (2 diffs)
• istate.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/abs32le/include/istate.h

@@ -36 +36 @@
 #define LIBC_abs32le__ISTATE_H_
 
-#include <sys/types.h>
-
-/** Interrupt context.
- *
- * On real hardware this stores the registers which
- * need to be preserved during interupts.
- */
-typedef struct istate {
-        uintptr_t ip;
-        uintptr_t fp;
-        uint32_t stack[];
-} istate_t;
-
-static inline uintptr_t istate_get_pc(istate_t *istate)
-{
-        return istate->ip;
-}
-
-static inline uintptr_t istate_get_fp(istate_t *istate)
-{
-        return istate->fp;
-}
+#include <arch/istate.h>
 
 #endif