diff options
| -rw-r--r-- | gdb/ChangeLog | 8 | ||||
| -rw-r--r-- | gdb/frame.c | 19 | ||||
| -rw-r--r-- | gdb/frame.h | 9 |
3 files changed, 20 insertions, 16 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index a982d91..3a0d371 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,13 @@ 2020-08-31 Simon Marchi <simon.marchi@efficios.com> + * frame.h (enum frame_id_stack_status) <FID_STACK_OUTER>: New. + * frame.c (fprint_frame_id): Handle FID_STACK_OUTER. + (outer_frame_id): Use FID_STACK_OUTER instead of + FID_STACK_INVALID. + (frame_id_p): Don't check for outer_frame_id. + +2020-08-31 Simon Marchi <simon.marchi@efficios.com> + * frame-unwind.c (frame_unwind_got_optimized): Don't set regnum/frame in value. Call allocate_value_lazy. * frame.c (frame_unwind_register_value): Use diff --git a/gdb/frame.c b/gdb/frame.c index ccaf97d..54f4c61 100644 --- a/gdb/frame.c +++ b/gdb/frame.c @@ -396,8 +396,11 @@ fprint_frame_id (struct ui_file *file, struct frame_id id) fprintf_unfiltered (file, "stack=<unavailable>"); else if (id.stack_status == FID_STACK_SENTINEL) fprintf_unfiltered (file, "stack=<sentinel>"); + else if (id.stack_status == FID_STACK_OUTER) + fprintf_unfiltered (file, "stack=<outer>"); else fprintf_unfiltered (file, "stack=%s", hex_string (id.stack_addr)); + fprintf_unfiltered (file, ","); fprint_field (file, "code", id.code_addr_p, id.code_addr); @@ -672,7 +675,7 @@ frame_unwind_caller_id (struct frame_info *next_frame) const struct frame_id null_frame_id = { 0 }; /* All zeros. */ const struct frame_id sentinel_frame_id = { 0, 0, 0, FID_STACK_SENTINEL, 0, 1, 0 }; -const struct frame_id outer_frame_id = { 0, 0, 0, FID_STACK_INVALID, 0, 1, 0 }; +const struct frame_id outer_frame_id = { 0, 0, 0, FID_STACK_OUTER, 0, 1, 0 }; struct frame_id frame_id_build_special (CORE_ADDR stack_addr, CORE_ADDR code_addr, @@ -746,10 +749,6 @@ frame_id_p (frame_id l) /* The frame is valid iff it has a valid stack address. */ bool p = l.stack_status != FID_STACK_INVALID; - /* outer_frame_id is also valid. */ - if (!p && memcmp (&l, &outer_frame_id, sizeof (l)) == 0) - p = true; - if (frame_debug) { fprintf_unfiltered (gdb_stdlog, "{ frame_id_p (l="); @@ -774,15 +773,7 @@ frame_id_eq (frame_id l, frame_id r) { bool eq; - if (l.stack_status == FID_STACK_INVALID && l.special_addr_p - && r.stack_status == FID_STACK_INVALID && r.special_addr_p) - /* The outermost frame marker is equal to itself. This is the - dodgy thing about outer_frame_id, since between execution steps - we might step into another function - from which we can't - unwind either. More thought required to get rid of - outer_frame_id. */ - eq = true; - else if (l.stack_status == FID_STACK_INVALID + if (l.stack_status == FID_STACK_INVALID || r.stack_status == FID_STACK_INVALID) /* Like a NaN, if either ID is invalid, the result is false. Note that a frame ID is invalid iff it is the null frame ID. */ diff --git a/gdb/frame.h b/gdb/frame.h index 1c6afad..3ceb7b3 100644 --- a/gdb/frame.h +++ b/gdb/frame.h @@ -85,8 +85,7 @@ struct frame_print_options; enum frame_id_stack_status { - /* Stack address is invalid. E.g., this frame is the outermost - (i.e., _start), and the stack hasn't been setup yet. */ + /* Stack address is invalid. */ FID_STACK_INVALID = 0, /* Stack address is valid, and is found in the stack_addr field. */ @@ -95,6 +94,12 @@ enum frame_id_stack_status /* Sentinel frame. */ FID_STACK_SENTINEL = 2, + /* Outer frame. Since a frame's stack address is typically defined as the + value the stack pointer had prior to the activation of the frame, an outer + frame doesn't have a stack address. The frame ids of frames inlined in the + outer frame are also of this type. */ + FID_STACK_OUTER = 3, + /* Stack address is unavailable. I.e., there's a valid stack, but we don't know where it is (because memory or registers we'd compute it from were not collected). */ |