Re: Allow -data-disassemble to run with only -s option

[John Lindal <support_0384@newplanetsoftware.com>]

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

> What Tom meant is that you should write a testcase for it.  See the
> directory gdb/testsuite for examples.

Attached are the updated patches.  Thanks for your patience.

John


[-- Attachment #2: ChangeLog --]
[-- Type: application/octet-stream, Size: 198 bytes --]

2011-08-06 John Lindal <gdb@newplanetsoftware.com>

	* mi-cmd-disas.c: Accept only -s option.  Automatically set end to end
	of function, or complain that start address is not part of any function.

[-- Attachment #3: patch_code --]
[-- Type: application/octet-stream, Size: 2161 bytes --]

*** gdb-7.3-orig/gdb/mi/mi-cmd-disas.c	2011-03-09 12:31:50.000000000 -0800
--- gdb-7.3/gdb/mi/mi-cmd-disas.c	2011-08-08 20:18:25.000000000 -0700
***************
*** 37,42 ****
--- 37,47 ----
  
     or:
  
+    START-ADDRESS: address to start the disassembly at.
+    (END-ADDRESS is the end of the function.)
+ 
+    or:
+ 
     FILENAME: The name of the file where we want disassemble from.
     LINE: The line around which we want to disassemble. It will
     disassemble the function that contins that line.
*************** mi_cmd_disassemble (char *command, char 
*** 127,132 ****
--- 132,148 ----
    argv += optind;
    argc -= optind;
  
+   if (!line_seen && !file_seen && !num_seen && start_seen && !end_seen)
+     {
+       char *ignore_name;
+       CORE_ADDR ignore_low;
+ 
+       if (!find_pc_partial_function (low, &ignore_name, &ignore_low, &high))
+ 	error (_("No function contains specified address"));
+ 
+       end_seen = 1;
+     }
+ 
    /* Allow only filename + linenum (with how_many which is not
       required) OR start_addr + and_addr */
  
*************** mi_cmd_disassemble (char *command, char 
*** 134,144 ****
  	|| (line_seen && file_seen && !num_seen && !start_seen && !end_seen)
  	|| (!line_seen && !file_seen && !num_seen && start_seen && end_seen)))
      error (_("-data-disassemble: Usage: ( [-f filename -l linenum [-n "
! 	     "howmany]] | [-s startaddr -e endaddr]) [--] mode."));
  
    if (argc != 1)
      error (_("-data-disassemble: Usage: [-f filename -l linenum "
! 	     "[-n howmany]] [-s startaddr -e endaddr] [--] mode."));
  
    mode = atoi (argv[0]);
    if (mode < 0 || mode > 3)
--- 150,160 ----
  	|| (line_seen && file_seen && !num_seen && !start_seen && !end_seen)
  	|| (!line_seen && !file_seen && !num_seen && start_seen && end_seen)))
      error (_("-data-disassemble: Usage: ( [-f filename -l linenum [-n "
! 	     "howmany]] | [-s startaddr [-e endaddr]]) [--] mode."));
  
    if (argc != 1)
      error (_("-data-disassemble: Usage: [-f filename -l linenum "
! 	     "[-n howmany]] [-s startaddr [-e endaddr]] [--] mode."));
  
    mode = atoi (argv[0]);
    if (mode < 0 || mode > 3)

[-- Attachment #4: patch_doc --]
[-- Type: application/octet-stream, Size: 1205 bytes --]

*** gdb-7.3/doc/gdb.texinfo-orig	2011-08-08 17:51:19.000000000 -0700
--- gdb-7.3/doc/gdb.texinfo	2011-08-08 20:15:15.000000000 -0700
*************** examine memory and registers, evaluate e
*** 28271,28277 ****
  
  @smallexample
   -data-disassemble
!     [ -s @var{start-addr} -e @var{end-addr} ]
    | [ -f @var{filename} -l @var{linenum} [ -n @var{lines} ] ]
    -- @var{mode}
  @end smallexample
--- 28271,28277 ----
  
  @smallexample
   -data-disassemble
!     [ -s @var{start-addr} [ -e @var{end-addr} ] ]
    | [ -f @var{filename} -l @var{linenum} [ -n @var{lines} ] ]
    -- @var{mode}
  @end smallexample
*************** Where:
*** 28283,28289 ****
  @item @var{start-addr}
  is the beginning address (or @code{$pc})
  @item @var{end-addr}
! is the end address
  @item @var{filename}
  is the name of the file to disassemble
  @item @var{linenum}
--- 28283,28291 ----
  @item @var{start-addr}
  is the beginning address (or @code{$pc})
  @item @var{end-addr}
! is the end address.  If only @var{start-addr} is specified, then
! @var{end-addr} is set to the end of the function containing
! @var{start-addr}.
  @item @var{filename}
  is the name of the file to disassemble
  @item @var{linenum}

[-- Attachment #5: patch_test --]
[-- Type: application/octet-stream, Size: 878 bytes --]

*** mi2-disassemble.exp-orig	2011-08-08 20:22:09.000000000 -0700
--- mi2-disassemble.exp	2011-08-09 09:29:52.000000000 -0700
*************** proc test_disassembly_only {} {
*** 58,63 ****
--- 58,67 ----
      mi_gdb_test "222-data-disassemble  -f basics.c -l $line_main_body -- 0" \
  	    "222\\^done,asm_insns=\\\[\{address=\"$hex\",func-name=\"main\",offset=\"0\",inst=\".*\"\},.*,\{address=\"$hex\",func-name=\"main\",offset=\"$decimal\",inst=\".*\"\}\\\]" \
                "data-disassemble file & line, assembly only"
+ 
+     mi_gdb_test "333-data-disassemble -s \$pc -- 0" \
+ 	    "333\\^done,asm_insns=\\\[\{address=\"$hex\",func-name=\"main\",offset=\"$decimal\",inst=\".*\"\},\{address=\"$hex\",func-name=\"main\",offset=\"$decimal\",inst=\".*\"\}.*\]" \
+              "data-disassemble from pc to end of function"
  }
  
  proc test_disassembly_with_opcodes {} {