Re: [RFC] disassemble-next-line

teawater
2009-03-13T03:10:13Z

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

Hi Pedro.

The enum auto_boolean and add_setshow_auto_boolean_cmd is cool.
Thanks for you remind me.

I had changed it. Do you think it's OK?

Thanks,
Hui

On Fri, Mar 13, 2009 at 08:20, Pedro Alves <pedro@codesourcery.com> wrote:
>> --- a/stack.c
>> +++ b/stack.c
>>
>> +/* Enum strings for "set|show disassemble-next-line".  */
>> +
>> +static const char disassemble_next_line_auto[] = "auto";
>> +static const char disassemble_next_line_on[] = "on";
>> +static const char disassemble_next_line_off[] = "off";
>> +static const char *disassemble_next_line_enum[] =
>> +{
>> +  disassemble_next_line_auto,
>> +  disassemble_next_line_on,
>> +  disassemble_next_line_off,
>> +  NULL,
>> +};
>
> Please make this an `enum auto_boolean' / AUTO_BOOLEAN_AUTO, and
> register the "disassemble-next-line" command with
> add_setshow_auto_boolean_cmd instead.
>
> --
> Pedro Alves
>

[-- Attachment #2: disassemble-next-line.txt --]
[-- Type: text/plain, Size: 3770 bytes --]

---
stack.c | 77 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 77 insertions(+)

--- a/stack.c
+++ b/stack.c
@@ -45,6 +45,7 @@
#include "valprint.h"
#include "gdbthread.h"
#include "cp-support.h"
+#include "disasm.h"

#include "gdb_assert.h"
#include <ctype.h>
@@ -456,6 +457,57 @@ set_current_sal_from_frame (struct frame
}
}

+/* If ON, GDB will disassemble the next source line when execution
+ stops.
+ If AUTO (which is the default) or the next source line cannot be
+ ascertained, the next instruction will be disassembled instead. */
+
+static enum auto_boolean disassemble_next_line;
+
+static void
+show_disassemble_next_line (struct ui_file *file, int from_tty,
+ struct cmd_list_element *c,
+ const char *value)
+{
+ fprintf_filtered (file, _("\
+Debugger's willingness to use disassemble-next-line is %s.\n"),
+ value);
+}
+
+/* Show assembly codes; stub for catch_errors. */
+
+struct gdb_disassembly_stub_args
+{
+ int how_many;
+ CORE_ADDR low;
+ CORE_ADDR high;
+};
+
+static void
+gdb_disassembly_stub (void *args)
+{
+ struct gdb_disassembly_stub_args *p = args;
+ gdb_disassembly (uiout, 0, 0, p->how_many, p->low, p->high);
+}
+
+/* Use TRY_CATCH to catch the exception from the gdb_disassembly
+ because it will be broken by filter sometime. */
+
+static void
+do_gdb_disassembly (int how_many, CORE_ADDR low, CORE_ADDR high)
+{
+ volatile struct gdb_exception exception;
+ struct gdb_disassembly_stub_args args;
+
+ args.how_many = how_many;
+ args.low = low;
+ args.high = high;
+ TRY_CATCH (exception, RETURN_MASK_ALL)
+ {
+ gdb_disassembly_stub (&args);
+ }
+}
+
/* Print information about frame FRAME. The output is format according
to PRINT_LEVEL and PRINT_WHAT and PRINT ARGS. The meaning of
PRINT_WHAT is:
@@ -533,6 +585,13 @@ print_frame_info (struct frame_info *fra

source_print = (print_what == SRC_LINE || print_what == SRC_AND_LOC);

+ /* If disassemble-next-line is set to auto or on and doesn't have
+ the line debug messages for $pc, output current instructions. */
+ if ((disassemble_next_line == AUTO_BOOLEAN_AUTO
+ || disassemble_next_line == AUTO_BOOLEAN_TRUE)
+ && source_print && !sal.symtab)
+ do_gdb_disassembly (1, get_frame_pc (frame), get_frame_pc (frame) + 1);
+
if (source_print && sal.symtab)
{
int done = 0;
@@ -569,6 +628,11 @@ print_frame_info (struct frame_info *fra
print_source_lines (sal.symtab, sal.line, sal.line + 1, 0);
}
}
+
+ /* If disassemble-next-line is set to on and there is line
+ messages, output assembly codes for next line. */
+ if (disassemble_next_line == AUTO_BOOLEAN_TRUE)
+ do_gdb_disassembly (-1, get_frame_pc (frame), sal.end);
}

if (print_what != LOCATION)
@@ -2062,6 +2126,19 @@ Usage: func <name>\n"));
_("Show printing of non-scalar frame arguments"),
NULL, NULL, NULL, &setprintlist, &showprintlist);

+ add_setshow_auto_boolean_cmd ("disassemble-next-line", class_stack,
+ &disassemble_next_line, _("\
+Set debugger's willingness to use disassemble-next-line."), _("\
+Show debugger's willingness to use disassemble-next-line."), _("\
+If ON, GDB will disassemble the next source line when execution\n\
+stops.\n\
+If AUTO (which is the default) or the next source line cannot be\n\
+ascertained, the next instruction will be disassembled instead."),
+ NULL,
+ show_disassemble_next_line,
+ &setlist, &showlist);
+ disassemble_next_line = AUTO_BOOLEAN_AUTO;
+
#if 0
add_cmd ("backtrace-limit", class_stack, set_backtrace_limit_command, _(\
"Specify maximum number of frames for \"backtrace\" to print by default."),