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
  • kernel/arch/sparc64/src/debug/stacktrace_asm.S

    r6adb775f r32573ff  
    2727#
    2828
     29#include <abi/asmtool.h>
    2930#include <arch/stack.h>
    3031
    3132.text
    3233
    33 .global frame_pointer_get
    34 .global program_counter_get
    35 .global alloc_window_and_flush
    36 
    37 frame_pointer_get:
     34FUNCTION_BEGIN(frame_pointer_get)
    3835        # Add the stack bias to %sp to get the actual address.
    3936        retl
    4037        add %sp, STACK_BIAS, %o0
     38FUNCTION_END(frame_pointer_get)
    4139
    42 program_counter_get:
     40FUNCTION_BEGIN(program_counter_get)
    4341        retl
    4442        mov %o7, %o0
     43FUNCTION_END(program_counter_get)
    4544
    46 alloc_window_and_flush:
     45FUNCTION_BEGIN(alloc_window_and_flush)
    4746        save %sp, -(STACK_WINDOW_SAVE_AREA_SIZE+STACK_ARG_SAVE_AREA_SIZE), %sp
    4847        # Flush all other windows to memory so that we can read their contents.
     
    5049        ret
    5150        restore
     51FUNCTION_END(alloc_window_and_flush)
    5252
Note: See TracChangeset for help on using the changeset viewer.