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

Timestamp:

2018-03-08T18:25:31Z (7 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

53ad43c, 615e83d

Parents:

fd57cf17

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-03-06 22:03:11)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-03-08 18:25:31)

Message:

Introduce context_swap() and use it to simplify fibril implementation.

This wraps the use of context_save()/context_restore(), to provide a more
natural (and easier to understand) control flow. The patch also hides the
details of the underlying context, requiring the use of context_get_pc()
to acquire program counter. This might allow context_swap() to only store
one pointer in the context, storing the remaining information in its stack
frame. However, that is not done in this patch.

Location:

uspace/lib/c/arch

Files:

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

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

@@ -37 +37 @@
 
 #include <stdint.h>
+#include <libarch/fibril_context.h>
 
 #define SP_DELTA  0
@@ -48 +49 @@
         } while (0)
 
-/*
- * On real hardware this stores the registers which
- * need to be preserved across function calls.
- */
-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)
+static inline uintptr_t _context_get_fp(context_t *ctx)
 {
         /* On real hardware, this function returns the frame pointer. */

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

@@ -53 +53 @@
         } while (0)
 
-static inline uintptr_t context_get_fp(context_t *ctx)
+static inline uintptr_t _context_get_fp(context_t *ctx)
 {
         return ctx->rbp;

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

@@ -67 +67 @@
         } while (0)
 
-static inline uintptr_t context_get_fp(context_t *ctx)
+static inline uintptr_t _context_get_fp(context_t *ctx)
 {
         return ctx->fp;

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

@@ -54 +54 @@
         } while (0)
 
-static inline uintptr_t context_get_fp(context_t *ctx)
+static inline uintptr_t _context_get_fp(context_t *ctx)
 {
         return ctx->ebp;

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

@@ -65 +65 @@
         } while (0)
 
-static inline uintptr_t context_get_fp(context_t *ctx)
+static inline uintptr_t _context_get_fp(context_t *ctx)
 {
         return 0;       /* FIXME */

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

@@ -57 +57 @@
         } while (0)
 
-static inline uintptr_t context_get_fp(context_t *ctx)
+static inline uintptr_t _context_get_fp(context_t *ctx)
 {
         return ctx->sp;

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

@@ -54 +54 @@
         } while (0)
 
-static inline uintptr_t context_get_fp(context_t *ctx)
+static inline uintptr_t _context_get_fp(context_t *ctx)
 {
         return ctx->sp;

uspace/lib/c/arch/riscv64/include/libarch/fibril.h

@@ -59 +59 @@
 } context_t;
 
-static inline uintptr_t context_get_fp(context_t *ctx)
+static inline uintptr_t _context_get_fp(context_t *ctx)
 {
         /* This function returns the frame pointer. */

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

@@ -52 +52 @@
         } while (0)
 
-static inline uintptr_t context_get_fp(context_t *ctx)
+static inline uintptr_t _context_get_fp(context_t *ctx)
 {
         return ctx->sp + STACK_BIAS;