suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

win64: JIT stack-trace repair

Browse Source 
Relevant to PR 13702

Merge to 5.3.4
(cherry picked from commit 5887d7808c)
This commit is contained in:
Matthew Flatt 2013-04-19 10:13:40 -06:00 committed by Ryan Culpepper
parent 4f738c6094
commit b6bd86f825
1 changed files with 27 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/racket/src/jitstack.c
View File

@ -244,30 +244,30 @@ Scheme_Object *scheme_native_stack_trace(void)
may have the next return address */
ctx.Rip = fp[-(3 + LOCAL_FRAME_SIZE + 1)];
}
name = NULL;
name = find_symbol((uintptr_t)ctx.Rip);
} else {
/* normal JIT function convention */
cache_sp = (void *)fp;
if (SCHEME_EOFP(name)) {
/* JIT_LOCAL2 has the name to use */
name = *(Scheme_Object **)fp[JIT_LOCAL2 >> JIT_LOG_WORD_SIZE];
}
ctx.Rsp = ctx.Rbp + (2 * sizeof(void*));
# ifdef NEED_LOCAL4
ctx.R14 = fp[-JIT_LOCAL4_OFFSET];
# endif
ctx.Rbp = fp[0];
ctx.Rbx = fp[-1];
ctx.Rsi = fp[-2];
ctx.Rdi = fp[-3];
ctx.Rip = fp[1];
if (SCHEME_NULLP(name))
name = NULL;
}
cache_sp = (void *)fp;
if (SCHEME_EOFP(name)) {
/* JIT_LOCAL2 has the name to use */
name = *(Scheme_Object **)fp[JIT_LOCAL2 >> JIT_LOG_WORD_SIZE];
}
ctx.Rsp = ctx.Rbp + (2 * sizeof(void*));
# ifdef NEED_LOCAL4
ctx.R14 = fp[-JIT_LOCAL4_OFFSET];
# endif
ctx.Rbp = fp[0];
ctx.Rbx = fp[-1];
ctx.Rsi = fp[-2];
ctx.Rdi = fp[-3];
ctx.Rip = fp[1];
if (SCHEME_NULLP(name))
name = NULL;
} else {
unsuccess++;
rf = RtlLookupFunctionEntry(ctx.Rip, &base, NULL);
@ -296,6 +296,12 @@ Scheme_Object *scheme_native_stack_trace(void)
}
cache_sp = NULL;
}
if (!(STK_COMP((uintptr_t)ctx.Rsp, stack_end)
&& STK_COMP(stack_start, (uintptr_t)ctx.Rsp))) {
/* out of stack range */
break;
}
}
if (last)