Ignore:
Timestamp:
2016-05-02T20:58:16Z (8 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
7c4b26c
Parents:
6adb775f (diff), 5035ba05 (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, which has dltest and fixes.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/lib/c/arch/sparc64/src/fibril.S

    r6adb775f r32573ff  
    2727#
    2828
     29#include <abi/asmtool.h>
    2930#include <libarch/fibril_context.h>
    3031
    3132.text
    3233
    33 .global context_save
    34 .global context_restore
    35 
    36 context_save:
     34FUNCTION_BEGIN(context_save)
    3735        #
    3836        # We rely on the kernel to flush our active register windows to memory
     
    6058        retl
    6159        mov 1, %o0              ! context_save_arch returns 1
     60FUNCTION_END(context_save)
    6261
    63 context_restore:
     62FUNCTION_BEGIN(context_restore)
    6463        #
    6564        # Flush all active windows.
     
    9190        retl
    9291        xor %o0, %o0, %o0       ! context_restore_arch returns 0
     92FUNCTION_END(context_restore)
Note: See TracChangeset for help on using the changeset viewer.