Re: [patch/rfc] Use frame_type for sigtramp test in infrun.c

Joel Brobecker
2004-04-06T16:21:57Z

[-- Attachment #1: Type: text/plain, Size: 205 bytes --]

> 2004-04-05 Joel Brobecker <brobecker@gnat.com>
>
> * infrun.c (handle_inferior_event): Rely on frame IDs to detect
> function calls.

Sorry Andrew, here is the patch (sigh).

--
Joel

[-- Attachment #2: infrun.c.diff --]
[-- Type: text/plain, Size: 1554 bytes --]

Index: infrun.c
===================================================================
RCS file: /cvs/src/src/gdb/infrun.c,v
retrieving revision 1.145
diff -u -p -r1.145 infrun.c
--- infrun.c 2 Apr 2004 22:38:43 -0000 1.145
+++ infrun.c 6 Apr 2004 00:11:59 -0000
@@ -2464,6 +2464,18 @@ process_event_stop_test:
return;
}

+ if (step_over_calls == STEP_OVER_UNDEBUGGABLE
+ && ecs->stop_func_name == NULL)
+ {
+ /* There is no symbol, not even a minimal symbol, corresponding
+ to the address where we just stopped. So we just stepped
+ inside undebuggable code. Since we want to step over this
+ kind of code, we keep going until the inferior returns from
+ the current function. */
+ handle_step_into_function (ecs);
+ return;
+ }
+
/* We can't update step_sp every time through the loop, because
reading the stack pointer would slow down stepping too much.
But we can update it every time we leave the step range. */
@@ -2542,11 +2554,8 @@ process_event_stop_test:
return;
}

- if (((stop_pc == ecs->stop_func_start /* Quick test */
- || in_prologue (stop_pc, ecs->stop_func_start))
- && !IN_SOLIB_RETURN_TRAMPOLINE (stop_pc, ecs->stop_func_name))
- || IN_SOLIB_CALL_TRAMPOLINE (stop_pc, ecs->stop_func_name)
- || ecs->stop_func_name == 0)
+ if (frame_id_eq (get_frame_id (get_prev_frame (get_current_frame ())),
+ step_frame_id))
{
/* It's a subroutine call. */
handle_step_into_function (ecs);