Index: doc/gdb.texinfo =================================================================== RCS file: /cvs/src/src/gdb/doc/gdb.texinfo,v retrieving revision 1.635 diff -u -p -u -r1.635 gdb.texinfo --- doc/gdb.texinfo 21 Oct 2009 18:02:26 -0000 1.635 +++ doc/gdb.texinfo 21 Oct 2009 22:37:41 -0000 @@ -6524,7 +6524,9 @@ The default memory range is the function program counter of the selected frame. A single argument to this command is a program counter value; @value{GDBN} dumps the function surrounding this value. Two arguments specify a range of addresses -(first inclusive, second exclusive) to dump. +(first inclusive, second exclusive) to dump. In that case, the name of +the function is also printed (since there could be several functions in +the given range). If the range of memory being disassembled contains current program counter, the instruction at that location is shown with a @code{=>} marker. @@ -6554,21 +6556,21 @@ program is stopped just after function p (@value{GDBP}) disas /m main Dump of assembler code for function main: 5 @{ - 0x08048330 : push %ebp - 0x08048331 : mov %esp,%ebp - 0x08048333 : sub $0x8,%esp - 0x08048336 : and $0xfffffff0,%esp - 0x08048339 : sub $0x10,%esp + 0x08048330 <+0>: push %ebp + 0x08048331 <+1>: mov %esp,%ebp + 0x08048333 <+3>: sub $0x8,%esp + 0x08048336 <+6>: and $0xfffffff0,%esp + 0x08048339 <+9>: sub $0x10,%esp 6 printf ("Hello.\n"); -=> 0x0804833c : movl $0x8048440,(%esp) - 0x08048343 : call 0x8048284 +=> 0x0804833c <+12>: movl $0x8048440,(%esp) + 0x08048343 <+19>: call 0x8048284 7 return 0; 8 @} - 0x08048348 : mov $0x0,%eax - 0x0804834d : leave - 0x0804834e : ret + 0x08048348 <+24>: mov $0x0,%eax + 0x0804834d <+29>: leave + 0x0804834e <+30>: ret End of assembler dump. @end smallexample Index: disasm.h =================================================================== RCS file: /cvs/src/src/gdb/disasm.h,v retrieving revision 1.13 diff -u -p -u -r1.13 disasm.h --- disasm.h 11 Jul 2009 14:04:23 -0000 1.13 +++ disasm.h 21 Oct 2009 22:37:41 -0000 @@ -21,14 +21,14 @@ #define DISASSEMBLY_SOURCE (0x1 << 0) #define DISASSEMBLY_RAW_INSN (0x1 << 1) +#define DISASSEMBLY_OMIT_FNAME (0x1 << 2) struct ui_out; struct ui_file; extern void gdb_disassembly (struct gdbarch *gdbarch, struct ui_out *uiout, - char *file_string, - int mixed_source_and_assembly, - int how_many, CORE_ADDR low, CORE_ADDR high); + char *file_string, int flags, int how_many, + CORE_ADDR low, CORE_ADDR high); /* Print the instruction at address MEMADDR in debugged memory, on STREAM. Returns the length of the instruction, in bytes, Index: disasm.c =================================================================== RCS file: /cvs/src/src/gdb/disasm.c,v retrieving revision 1.34 diff -u -p -u -r1.34 disasm.c --- disasm.c 21 Oct 2009 18:02:25 -0000 1.34 +++ disasm.c 21 Oct 2009 22:37:41 -0000 @@ -122,7 +122,8 @@ dump_insns (struct gdbarch *gdbarch, str /* We don't care now about line, filename and unmapped. But we might in the future. */ ui_out_text (uiout, " <"); - ui_out_field_string (uiout, "func-name", name); + if ((flags & DISASSEMBLY_OMIT_FNAME) == 0) + ui_out_field_string (uiout, "func-name", name); ui_out_text (uiout, "+"); ui_out_field_int (uiout, "offset", offset); ui_out_text (uiout, ">:\t"); @@ -373,9 +374,8 @@ gdb_disassemble_info (struct gdbarch *gd void gdb_disassembly (struct gdbarch *gdbarch, struct ui_out *uiout, - char *file_string, - int flags, - int how_many, CORE_ADDR low, CORE_ADDR high) + char *file_string, int flags, int how_many, + CORE_ADDR low, CORE_ADDR high) { struct ui_stream *stb = ui_out_stream_new (uiout); struct cleanup *cleanups = make_cleanup_ui_out_stream_delete (stb); Index: cli/cli-cmds.c =================================================================== RCS file: /cvs/src/src/gdb/cli/cli-cmds.c,v retrieving revision 1.92 diff -u -p -u -r1.92 cli-cmds.c --- cli/cli-cmds.c 11 Jul 2009 14:04:23 -0000 1.92 +++ cli/cli-cmds.c 21 Oct 2009 22:37:41 -0000 @@ -936,8 +936,7 @@ print_disassembly (struct gdbarch *gdbar } /* Subroutine of disassemble_command to simplify it. - Print a disassembly of the current function. - MIXED is non-zero to print source with the assembler. */ + Print a disassembly of the current function according to FLAGS. */ static void disassemble_current_function (int flags) @@ -1018,6 +1017,7 @@ disassemble_command (char *arg, int from if (! arg || ! *arg) { + flags |= DISASSEMBLY_OMIT_FNAME; disassemble_current_function (flags); return; } @@ -1039,6 +1039,7 @@ disassemble_command (char *arg, int from low = tui_get_low_disassembly_address (gdbarch, low, pc); #endif low += gdbarch_deprecated_function_start_offset (gdbarch); + flags |= DISASSEMBLY_OMIT_FNAME; } else { Index: testsuite/gdb.asm/asm-source.exp =================================================================== RCS file: /cvs/src/src/gdb/testsuite/gdb.asm/asm-source.exp,v retrieving revision 1.74 diff -u -p -u -r1.74 asm-source.exp --- testsuite/gdb.asm/asm-source.exp 18 May 2009 13:25:34 -0000 1.74 +++ testsuite/gdb.asm/asm-source.exp 21 Oct 2009 22:37:41 -0000 @@ -461,7 +461,7 @@ test_dis "x/i &staticvar" "staticvar" test_dis "disassem &staticvar &staticvar+1" "staticvar" # See if we can look at a static function -gdb_test "disassem foostatic" ".*:.*End of assembler dump." \ +gdb_test "disassem foostatic" ".*<\\+0>:.*End of assembler dump." \ "look at static function" remote_exec build "rm -f ${subdir}/arch.inc"