Changeset ab936440 in mainline for uspace/lib/c/generic/context.c

Timestamp:

2019-02-12T20:42:42Z (7 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Branches:

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

Children:

f31ca47

Parents:

7f7817a9 (diff), 4805495 (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.

git-author:

Matthieu Riolo <matthieu.riolo@…> (2019-02-12 20:26:18)

git-committer:

Matthieu Riolo <matthieu.riolo@…> (2019-02-12 20:42:42)

Message:

Merge branch 'master' into bdsh_alias

Conflicts:

uspace/app/bdsh/Makefile
uspace/app/bdsh/cmds/modules/modules.h

Ccheck correction and removing header which includes itself

File:

• uspace/lib/c/generic/context.c (modified) (1 diff)

uspace/lib/c/generic/context.c

@@ -43 +43 @@
 void context_swap(context_t *self, context_t *other)
 {
-        if (!__setjmp(self))
-                __longjmp(other, 1);
+        if (!__context_save(self))
+                __context_restore(other, 1);
 }
 
 void context_create(context_t *context, const context_create_t *arg)
 {
-        __setjmp(context);
+        __context_save(context);
         context_set(context, FADDR(arg->fn), arg->stack_base,
             arg->stack_size, arg->tls);