x86: drop a few dead macros

[deliverable/binutils-gdb.git] / gdb / mi / mi-cmd-disas.c

diff --git a/gdb/mi/mi-cmd-disas.c b/gdb/mi/mi-cmd-disas.c
index 9747ac6383800818c13fe7956e2e749e3f6744d2..7d38b8c5e0cf351fc6f81035cbcbf46bcb752743 100644 (file)
--- a/gdb/mi/mi-cmd-disas.c
+++ b/gdb/mi/mi-cmd-disas.c
@@ -1,5 +1,5 @@
 /* MI Command Set - disassemble commands.
-   Copyright (C) 2000-2013 Free Software Foundation, Inc.
+   Copyright (C) 2000-2019 Free Software Foundation, Inc.
    Contributed by Cygnus Solutions (a Red Hat company).
 
    This file is part of GDB.
@@ -23,7 +23,6 @@
 #include "value.h"
 #include "mi-cmds.h"
 #include "mi-getopt.h"
-#include <string.h>
 #include "ui-out.h"
 #include "disasm.h"
 
@@ -45,19 +44,21 @@
    always required:
 
    MODE: 0 -- disassembly.
-         1 -- disassembly and source.
+         1 -- disassembly and source (with deprecated source-centric view).
          2 -- disassembly and opcodes.
-         3 -- disassembly, source and opcodes.
-*/
+         3 -- disassembly, source-centric and opcodes.
+         4 -- disassembly, and source (with pc-centric view).
+         5 -- disassembly, source (pc-centric) and opcodes.  */
 
 void
-mi_cmd_disassemble (char *command, char **argv, int argc)
+mi_cmd_disassemble (const char *command, char **argv, int argc)
 {
   struct gdbarch *gdbarch = get_current_arch ();
   struct ui_out *uiout = current_uiout;
   CORE_ADDR start;
 
-  int mode, disasm_flags;
+  int mode;
+  gdb_disassembly_flags disasm_flags;
   struct symtab *s;
 
   /* Which options have we processed ... */
@@ -66,6 +67,7 @@ mi_cmd_disassemble (char *command, char **argv, int argc)
   int num_seen = 0;
   int start_seen = 0;
   int end_seen = 0;
+  int addr_seen = 0;
 
   /* ... and their corresponding value. */
   char *file_string = NULL;
@@ -73,14 +75,14 @@ mi_cmd_disassemble (char *command, char **argv, int argc)
   int how_many = -1;
   CORE_ADDR low = 0;
   CORE_ADDR high = 0;
-  struct cleanup *cleanups = make_cleanup (null_cleanup, NULL);
+  CORE_ADDR addr = 0;
 
   /* Options processing stuff.  */
   int oind = 0;
   char *oarg;
   enum opt
   {
-    FILE_OPT, LINE_OPT, NUM_OPT, START_OPT, END_OPT
+    FILE_OPT, LINE_OPT, NUM_OPT, START_OPT, END_OPT, ADDR_OPT
   };
   static const struct mi_opt opts[] =
     {
@@ -89,6 +91,7 @@ mi_cmd_disassemble (char *command, char **argv, int argc)
       {"n", NUM_OPT, 1},
       {"s", START_OPT, 1},
       {"e", END_OPT, 1},
+      {"a", ADDR_OPT, 1},
       { 0, 0, 0 }
     };
 
@@ -103,9 +106,8 @@ mi_cmd_disassemble (char *command, char **argv, int argc)
       switch ((enum opt) opt)
        {
        case FILE_OPT:
-         file_string = xstrdup (oarg);
+         file_string = oarg;
          file_seen = 1;
-         make_cleanup (xfree, file_string);
          break;
        case LINE_OPT:
          line_num = atoi (oarg);
@@ -123,35 +125,60 @@ mi_cmd_disassemble (char *command, char **argv, int argc)
          high = parse_and_eval_address (oarg);
          end_seen = 1;
          break;
+       case ADDR_OPT:
+         addr = parse_and_eval_address (oarg);
+         addr_seen = 1;
+         break;
        }
     }
   argv += oind;
   argc -= oind;
 
   /* Allow only filename + linenum (with how_many which is not
-     required) OR start_addr + end_addr.  */
+     required) OR start_addr + end_addr OR addr.  */
+
+  if (!(
+          ( line_seen &&  file_seen &&              !start_seen && !end_seen
+                                                               && !addr_seen)
 
-  if (!((line_seen && file_seen && num_seen && !start_seen && !end_seen)
-       || (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."));
+       || (!line_seen && !file_seen && !num_seen &&  start_seen &&  end_seen
+                                                               && !addr_seen)
 
-  if (argc != 1)
-    error (_("-data-disassemble: Usage: [-f filename -l linenum "
-            "[-n howmany]] [-s startaddr -e endaddr] [--] mode."));
+       || (!line_seen && !file_seen && !num_seen && !start_seen && !end_seen
+                                                               &&  addr_seen))
+      || argc != 1)
+    error (_("-data-disassemble: Usage: ( [-f filename -l linenum "
+            "[-n howmany]] | [-s startaddr -e endaddr] | [-a addr] ) [--] mode."));
 
   mode = atoi (argv[0]);
-  if (mode < 0 || mode > 3)
-    error (_("-data-disassemble: Mode argument must be 0, 1, 2, or 3."));
+  if (mode < 0 || mode > 5)
+    error (_("-data-disassemble: Mode argument must be in the range 0-5."));
 
   /* Convert the mode into a set of disassembly flags.  */
 
-  disasm_flags = 0;
-  if (mode & 0x1)
-    disasm_flags |= DISASSEMBLY_SOURCE;
-  if (mode & 0x2)
-    disasm_flags |= DISASSEMBLY_RAW_INSN;
+  disasm_flags = 0;  /* Initialize here for -Wall.  */
+  switch (mode)
+    {
+    case 0:
+      break;
+    case 1:
+      disasm_flags |= DISASSEMBLY_SOURCE_DEPRECATED;
+      break;
+    case 2:
+      disasm_flags |= DISASSEMBLY_RAW_INSN;
+      break;
+    case 3:
+      disasm_flags |= DISASSEMBLY_SOURCE_DEPRECATED | DISASSEMBLY_RAW_INSN;
+      break;
+    case 4:
+      disasm_flags |= DISASSEMBLY_SOURCE;
+      break;
+    case 5:
+      disasm_flags |= DISASSEMBLY_SOURCE | DISASSEMBLY_RAW_INSN;
+      break;
+    default:
+      gdb_assert_not_reached ("bad disassembly mode");
+    }
 
   /* We must get the function beginning and end where line_num is
      contained.  */
@@ -167,11 +194,14 @@ mi_cmd_disassemble (char *command, char **argv, int argc)
        error (_("-data-disassemble: "
                 "No function contains specified address"));
     }
+  else if (addr_seen)
+    {
+      if (find_pc_partial_function (addr, NULL, &low, &high) == 0)
+        error (_("-data-disassemble: "
+                 "No function contains specified address"));
+    }
 
   gdb_disassembly (gdbarch, uiout,
-                  file_string,
                   disasm_flags,
                   how_many, low, high);
-
-  do_cleanups (cleanups);
 }