Changeset ab936440 in mainline for uspace/lib/c/arch/arm32/src/fibril.S

Timestamp:

2019-02-12T20:42:42Z (6 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/arch/arm32/src/fibril.S (modified) (3 diffs)

uspace/lib/c/arch/arm32/src/fibril.S

@@ -31 +31 @@
 .text
 
-FUNCTION_BEGIN(__setjmp)
+FUNCTION_BEGIN(__context_save)
         stmia r0!, {sp, lr}
         stmia r0!, {r4-r11}
@@ -38 +38 @@
         mov r0, #0
         mov pc, lr
-FUNCTION_END(__setjmp)
+FUNCTION_END(__context_save)
 
-FUNCTION_BEGIN(__longjmp)
+FUNCTION_BEGIN(__context_restore)
         ldmia r0!, {sp, lr}
         ldmia r0!, {r4-r11}
@@ -47 +47 @@
         mov r0, r1
         mov pc, lr
-FUNCTION_END(__longjmp)
+FUNCTION_END(__context_restore)