[PATCH] disassemble support start,+length format

[crquan at gmail dot com]

From: CHENG Renquan <rqcheng@smu.edu.sg>

add new support for disassemble by "start,+length" format;

update ChangeLog,NEWS,doc/gdb.texinfo accordingly.

BTW, I found two disassemble Changes in GDB 7.0 in NEWS, separated in two
paragraphs, so I merged them into one.

 gdb/NEWS            |   13 ++++++++-----
 gdb/cli/cli-cmds.c  |   18 +++++++++++++++---
 gdb/doc/gdb.texinfo |   27 +++++++++++++++++++++++++--
 gdb/ChangeLog       |    8 ++++++++
 gdb/doc/ChangeLog   |    5 +++++
 5 files changed, 61 insertions(+), 10 deletions(-)

---
rebased onto snapshot 2010-07-09.

Index: gdb-7.2.50.20100708/gdb/NEWS
===================================================================
--- gdb-7.2.50.20100708.orig/gdb/NEWS
+++ gdb-7.2.50.20100708/gdb/NEWS
@@ -3,6 +3,11 @@
 
 *** Changes since GDB 7.2
 
+* Changed commands
+
+disassemble
+  The disassemble command now supports "start,+length" form of two arguments.
+
 *** Changes in GDB 7.1
 
 * C++ Improvements:
@@ -518,8 +523,9 @@ or the "condition" command is available.
 the target for evaluation using the same bytecode format as is used
 for tracepoint actions.
 
-* "disassemble" command with a /r modifier, print the raw instructions
-in hex as well as in symbolic form.
+* The disassemble command now supports: an optional /r modifier, print the
+raw instructions in hex as well as in symbolic form, and an optional /m
+modifier to print mixed source+assembly.
 
 * Process record and replay
 
@@ -611,9 +617,6 @@ qXfer:siginfo:write
   packet that permited the stub to pass a process id was removed.
   Remote servers should use the `T' stop reply packet instead.
 
-* The "disassemble" command now supports an optional /m modifier to print mixed
-source+assembly.
-
 * GDB now supports multiple function calling conventions according to the
 DWARF-2 DW_AT_calling_convention function attribute.
   
Index: gdb-7.2.50.20100708/gdb/cli/cli-cmds.c
===================================================================
--- gdb-7.2.50.20100708.orig/gdb/cli/cli-cmds.c
+++ gdb-7.2.50.20100708/gdb/cli/cli-cmds.c
@@ -1108,8 +1108,9 @@ disassemble_current_function (int flags)
        - dump the assembly code for the function of the current pc
      disassemble [/mr] addr
        - dump the assembly code for the function at ADDR
-     disassemble [/mr] low high
-       - dump the assembly code in the range [LOW,HIGH)
+     disassemble [/mr] low,high
+     disassemble [/mr] low,+length
+       - dump the assembly code in the range [LOW,HIGH), or [LOW,LOW+length)
 
    A /m modifier will include source code with the assembly.
    A /r modifier will include raw instructions in hex with the assembly.  */
@@ -1180,8 +1181,18 @@ disassemble_command (char *arg, int from
   else
     {
       /* Two arguments.  */
+      int incl_flag = 0;
       low = pc;
+      while (*arg == ' ' || *arg == '\t')
+	arg++;
+      if (arg[0] == '+')
+	{
+	  ++arg;
+	  incl_flag = 1;
+	}
       high = parse_and_eval_address (arg);
+      if (incl_flag)
+	high += low;
     }
 
   print_disassembly (gdbarch, name, low, high, flags);
@@ -1615,7 +1626,8 @@ Default is the function surrounding the
 With a /m modifier, source lines are included (if available).\n\
 With a /r modifier, raw instructions in hex are included.\n\
 With a single argument, the function surrounding that address is dumped.\n\
-Two arguments (separated by a comma) are taken as a range of memory to dump."));
+Two arguments (separated by a comma) are taken as a range of memory to dump,\n\
+  in the form of \"start,end\", or \"start,+length\"."));
   set_cmd_completer (c, location_completer);
   if (xdb_commands)
     add_com_alias ("va", "disassemble", class_xdb, 0);
Index: gdb-7.2.50.20100708/gdb/doc/gdb.texinfo
===================================================================
--- gdb-7.2.50.20100708.orig/gdb/doc/gdb.texinfo
+++ gdb-7.2.50.20100708/gdb/doc/gdb.texinfo
@@ -6736,8 +6736,19 @@ command is a program counter value; @val
 surrounding this value.  When two arguments are given, they should
 be separated by a comma, possibly surrounded by whitespace.  The
 arguments specify a range of addresses (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).
+arguments specify a range of addresses to dump, in one of two forms:
+
+@table @code
+@item @var{start},@var{end}
+the addresses from @var{start} (inclusive) to @var{end} (exclusive)
+@item @var{start},+@var{length}
+the addresses from @var{start} (inclusive) to
+@code{@var{start}+@var{length}} (exclusive).
+@end table
+
+@noindent
+When 2 arguments are specified, the name of the function is also
+printed (since there could be several functions in the given range).
 
 The argument(s) can be any expression yielding a numeric value, such as
 @samp{0x32c4}, @samp{&main+10} or @samp{$pc - 8}.
@@ -6789,6 +6800,18 @@ Dump of assembler code for function main
 End of assembler dump.
 @end smallexample
 
+Here is another example showing raw instructions in hex for AMD x86-64,
+
+@smallexample
+(gdb) disas /r 0x400281,+10
+Dump of assembler code from 0x400281 to 0x40028b:
+   0x0000000000400281:	 38 36	cmp    %dh,(%rsi)
+   0x0000000000400283:	 2d 36 34 2e 73	sub    $0x732e3436,%eax
+   0x0000000000400288:	 6f	outsl  %ds:(%rsi),(%dx)
+   0x0000000000400289:	 2e 32 00	xor    %cs:(%rax),%al
+End of assembler dump.
+@end smallexample
+
 Some architectures have more than one commonly-used set of instruction
 mnemonics or other syntax.
 
Index: gdb-7.2.50.20100708/gdb/ChangeLog
===================================================================
--- gdb-7.2.50.20100708.orig/gdb/ChangeLog
+++ gdb-7.2.50.20100708/gdb/ChangeLog
@@ -1,3 +1,11 @@
+2010-07-09  CHENG Renquan  <rqcheng@smu.edu.sg>
+
+	* cli/cli-cmds.c (disassemble_command): Add support of disassemble
+	"start,+length" form of arguments.
+	* NEWS: Add "Changed commands" (disassemble) section for "Changes
+	since GDB 7.1"; and merge two separated paragraphs of disassemble
+	description in "Changes in GDB 7.0".
+
 2010-07-07  Joel Brobecker  <brobecker@adacore.com>
 
 	* NEWS: Create a new section for the next release branch.
Index: gdb-7.2.50.20100708/gdb/doc/ChangeLog
===================================================================
--- gdb-7.2.50.20100708.orig/gdb/doc/ChangeLog
+++ gdb-7.2.50.20100708/gdb/doc/ChangeLog
@@ -1,3 +1,8 @@
+2010-07-09  CHENG Renquan  <rqcheng@smu.edu.sg>
+
+	* gdb.texinfo (Machine Code): Update description of two forms of
+	arguments, and add new example to demonstrate the new form.
+
 2010-07-01  Pedro Alves  <pedro@codesourcery.com>
 
 	* gdb.texinfo (Create and Delete Tracepoints): Add more index

--
git v1.7.1.1

CHENG Renquan
38 St Thomas Walk, Singapore 238118      http://crquan.fedorapeople.org