Fork us on GitHub Follow us on Facebook Follow us on Twitter

Ignore:
Timestamp:
2010-07-16T10:11:41Z (12 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial
Children:
4d0f97d
Parents:
4003861 (diff), c8dea4f (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 from lp:~jakub/helenos/upa

File:
1 edited

Legend:

Unmodified
Added
Removed
  • kernel/arch/sparc64/src/debug/stacktrace.c

    r4003861 raa0d227  
    5050extern void alloc_window_and_flush(void);
    5151
    52 bool kernel_frame_pointer_validate(uintptr_t fp)
     52bool kernel_stack_trace_context_validate(stack_trace_context_t *ctx)
    5353{
    5454        uintptr_t kstack;
     
    6363        kstack -= PREEMPTIBLE_HANDLER_STACK_FRAME_SIZE;
    6464
    65         if (THREAD && (fp == kstack))
     65        if (THREAD && (ctx->fp == kstack))
    6666                return false;
    67         return fp != 0;
     67        return ctx->fp != 0;
    6868}
    6969
    70 bool kernel_frame_pointer_prev(uintptr_t fp, uintptr_t *prev)
     70bool kernel_frame_pointer_prev(stack_trace_context_t *ctx, uintptr_t *prev)
    7171{
    72         uint64_t *stack = (void *) fp;
     72        uint64_t *stack = (void *) ctx->fp;
    7373        alloc_window_and_flush();
    7474        *prev = stack[FRAME_OFFSET_FP_PREV] + STACK_BIAS;
     
    7676}
    7777
    78 bool kernel_return_address_get(uintptr_t fp, uintptr_t *ra)
     78bool kernel_return_address_get(stack_trace_context_t *ctx, uintptr_t *ra)
    7979{
    80         uint64_t *stack = (void *) fp;
     80        uint64_t *stack = (void *) ctx->fp;
    8181        alloc_window_and_flush();
    8282        *ra = stack[FRAME_OFFSET_RA];
     
    8484}
    8585
    86 bool uspace_frame_pointer_validate(uintptr_t fp)
     86bool uspace_stack_trace_context_validate(stack_trace_context_t *ctx)
    8787{
    8888        return false;
    8989}
    9090
    91 bool uspace_frame_pointer_prev(uintptr_t fp, uintptr_t *prev)
     91bool uspace_frame_pointer_prev(stack_trace_context_t *ctx, uintptr_t *prev)
    9292{
    9393        return false;
    9494}
    9595
    96 bool uspace_return_address_get(uintptr_t fp, uintptr_t *ra)
     96bool uspace_return_address_get(stack_trace_context_t *ctx , uintptr_t *ra)
    9797{
    9898        return false;
Note: See TracChangeset for help on using the changeset viewer.