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/stacktrace_asm.S

    r6adb775f r32573ff  
    2727#
    2828
     29#include <abi/asmtool.h>
    2930#include <libarch/stack.h>
    3031
    3132.text
    3233
    33 .global stacktrace_prepare
    34 .global stacktrace_fp_get
    35 .global stacktrace_pc_get
    36 
    37 stacktrace_prepare:
     34FUNCTION_BEGIN(stacktrace_prepare)
    3835        save %sp, -(STACK_WINDOW_SAVE_AREA_SIZE+STACK_ARG_SAVE_AREA_SIZE), %sp
    3936        # Flush all other windows to memory so that we can read their contents.
     
    4138        ret
    4239        restore
     40FUNCTION_END(stacktrace_prepare)
    4341
    44 stacktrace_fp_get:
     42FUNCTION_BEGIN(stacktrace_fp_get)
    4543        # Add the stack bias to %sp to get the actual address.
    4644        retl
    4745        add %sp, STACK_BIAS, %o0
     46FUNCTION_END(stacktrace_fp_get)
    4847
    49 stacktrace_pc_get:
     48FUNCTION_BEGIN(stacktrace_pc_get)
    5049        retl
    5150        mov %o7, %o0
     51FUNCTION_END(stacktrace_pc_get)
Note: See TracChangeset for help on using the changeset viewer.