Ekdohibs
/
ocaml
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PR#3809 wrong line numbers in backtrace 

git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@7162 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
master
Damien Doligez 2005-10-25 16:22:38 +00:00
parent 47d37cc125
commit 736d2cfe14
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
byterun/backtrace.c
View File

@ -147,19 +147,22 @@ static value read_debug_info(void)
static value event_for_location(value events, code_t pc)
{
mlsize_t i;
value pos, l, ev, ev_pos;
value pos, l, ev, ev_pos, best_ev;
best_ev = 0;
Assert(pc >= caml_start_code && pc < caml_start_code + caml_code_size);
pos = Val_long((char *) pc - (char *) caml_start_code);
for (i = 0; i < Wosize_val(events); i++) {
for (l = Field(events, i); l != Val_int(0); l = Field(l, 1)) {
ev = Field(l, 0);
ev_pos = Field(ev, EV_POS);
if (ev_pos == pos) return ev;
/* ocamlc sometimes moves an event past a following PUSH instruction;
allow mismatch by 1 instruction. */
if (ev_pos == pos || ev_pos == pos + 8) return ev;
if (ev_pos == pos + 8) best_ev = ev;
}
}
if (best_ev != 0) return best_ev;
return Val_false;
}