Changeset ab936440 in mainline for uspace/lib/c/arch/sparc64/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/sparc64/src/fibril.S (modified) (2 diffs)

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

@@ -32 +32 @@
 .text
 
-FUNCTION_BEGIN(__setjmp)
+FUNCTION_BEGIN(__context_save)
         #
         # We rely on the kernel to flush our active register windows to memory
         # should a thread switch occur.
         #
-        stx %sp, [%o0 + CONTEXT_OFFSET_SP]
-        stx %o7, [%o0 + CONTEXT_OFFSET_PC]
-        stx %i0, [%o0 + CONTEXT_OFFSET_I0]
-        stx %i1, [%o0 + CONTEXT_OFFSET_I1]
-        stx %i2, [%o0 + CONTEXT_OFFSET_I2]
-        stx %i3, [%o0 + CONTEXT_OFFSET_I3]
-        stx %i4, [%o0 + CONTEXT_OFFSET_I4]
-        stx %i5, [%o0 + CONTEXT_OFFSET_I5]
-        stx %fp, [%o0 + CONTEXT_OFFSET_FP]
-        stx %i7, [%o0 + CONTEXT_OFFSET_I7]
-        stx %l0, [%o0 + CONTEXT_OFFSET_L0]
-        stx %l1, [%o0 + CONTEXT_OFFSET_L1]
-        stx %l2, [%o0 + CONTEXT_OFFSET_L2]
-        stx %l3, [%o0 + CONTEXT_OFFSET_L3]
-        stx %l4, [%o0 + CONTEXT_OFFSET_L4]
-        stx %l5, [%o0 + CONTEXT_OFFSET_L5]
-        stx %l6, [%o0 + CONTEXT_OFFSET_L6]
-        stx %l7, [%o0 + CONTEXT_OFFSET_L7]
-        stx %g7, [%o0 + CONTEXT_OFFSET_TP]
+        stx %sp, [%o0 + __CONTEXT_OFFSET_SP]
+        stx %o7, [%o0 + __CONTEXT_OFFSET_PC]
+        stx %i0, [%o0 + __CONTEXT_OFFSET_I0]
+        stx %i1, [%o0 + __CONTEXT_OFFSET_I1]
+        stx %i2, [%o0 + __CONTEXT_OFFSET_I2]
+        stx %i3, [%o0 + __CONTEXT_OFFSET_I3]
+        stx %i4, [%o0 + __CONTEXT_OFFSET_I4]
+        stx %i5, [%o0 + __CONTEXT_OFFSET_I5]
+        stx %fp, [%o0 + __CONTEXT_OFFSET_FP]
+        stx %i7, [%o0 + __CONTEXT_OFFSET_I7]
+        stx %l0, [%o0 + __CONTEXT_OFFSET_L0]
+        stx %l1, [%o0 + __CONTEXT_OFFSET_L1]
+        stx %l2, [%o0 + __CONTEXT_OFFSET_L2]
+        stx %l3, [%o0 + __CONTEXT_OFFSET_L3]
+        stx %l4, [%o0 + __CONTEXT_OFFSET_L4]
+        stx %l5, [%o0 + __CONTEXT_OFFSET_L5]
+        stx %l6, [%o0 + __CONTEXT_OFFSET_L6]
+        stx %l7, [%o0 + __CONTEXT_OFFSET_L7]
+        stx %g7, [%o0 + __CONTEXT_OFFSET_TP]
         retl
-        mov 0, %o0              ! __setjmp returns 0
-FUNCTION_END(__setjmp)
+        mov 0, %o0              ! __context_save returns 0
+FUNCTION_END(__context_save)
 
-FUNCTION_BEGIN(__longjmp)
+FUNCTION_BEGIN(__context_restore)
         #
         # Flush all active windows.
@@ -69 +69 @@
         flushw
 
-        ldx [%o0 + CONTEXT_OFFSET_SP], %sp
-        ldx [%o0 + CONTEXT_OFFSET_PC], %o7
-        ldx [%o0 + CONTEXT_OFFSET_I0], %i0
-        ldx [%o0 + CONTEXT_OFFSET_I1], %i1
-        ldx [%o0 + CONTEXT_OFFSET_I2], %i2
-        ldx [%o0 + CONTEXT_OFFSET_I3], %i3
-        ldx [%o0 + CONTEXT_OFFSET_I4], %i4
-        ldx [%o0 + CONTEXT_OFFSET_I5], %i5
-        ldx [%o0 + CONTEXT_OFFSET_FP], %fp
-        ldx [%o0 + CONTEXT_OFFSET_I7], %i7
-        ldx [%o0 + CONTEXT_OFFSET_L0], %l0
-        ldx [%o0 + CONTEXT_OFFSET_L1], %l1
-        ldx [%o0 + CONTEXT_OFFSET_L2], %l2
-        ldx [%o0 + CONTEXT_OFFSET_L3], %l3
-        ldx [%o0 + CONTEXT_OFFSET_L4], %l4
-        ldx [%o0 + CONTEXT_OFFSET_L5], %l5
-        ldx [%o0 + CONTEXT_OFFSET_L6], %l6
-        ldx [%o0 + CONTEXT_OFFSET_L7], %l7
-        ldx [%o0 + CONTEXT_OFFSET_TP], %g7
+        ldx [%o0 + __CONTEXT_OFFSET_SP], %sp
+        ldx [%o0 + __CONTEXT_OFFSET_PC], %o7
+        ldx [%o0 + __CONTEXT_OFFSET_I0], %i0
+        ldx [%o0 + __CONTEXT_OFFSET_I1], %i1
+        ldx [%o0 + __CONTEXT_OFFSET_I2], %i2
+        ldx [%o0 + __CONTEXT_OFFSET_I3], %i3
+        ldx [%o0 + __CONTEXT_OFFSET_I4], %i4
+        ldx [%o0 + __CONTEXT_OFFSET_I5], %i5
+        ldx [%o0 + __CONTEXT_OFFSET_FP], %fp
+        ldx [%o0 + __CONTEXT_OFFSET_I7], %i7
+        ldx [%o0 + __CONTEXT_OFFSET_L0], %l0
+        ldx [%o0 + __CONTEXT_OFFSET_L1], %l1
+        ldx [%o0 + __CONTEXT_OFFSET_L2], %l2
+        ldx [%o0 + __CONTEXT_OFFSET_L3], %l3
+        ldx [%o0 + __CONTEXT_OFFSET_L4], %l4
+        ldx [%o0 + __CONTEXT_OFFSET_L5], %l5
+        ldx [%o0 + __CONTEXT_OFFSET_L6], %l6
+        ldx [%o0 + __CONTEXT_OFFSET_L7], %l7
+        ldx [%o0 + __CONTEXT_OFFSET_TP], %g7
         retl
-        mov %o1, %o0    ! __longjmp returns second argument
-FUNCTION_END(__longjmp)
+        mov %o1, %o0    ! __context_restore returns second argument
+FUNCTION_END(__context_restore)