s/ui_out_list/ui_out_tupple/

[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 1937eb05c01f1891c53e2e0806931e7b955f2e6b..021ee5e6d9468d5407b6499d26d17e9ef7457417 100644 (file)
--- a/gdb/mi/mi-cmd-disas.c
+++ b/gdb/mi/mi-cmd-disas.c
@@ -364,7 +364,7 @@ mi_cmd_disassemble (char *command, char **argv, int argc)
          for that line.  */
 
       next_line = 0;           /* Force out first line */
-      ui_out_list_begin (uiout, "asm_insns");
+      ui_out_tuple_begin (uiout, "asm_insns");
       num_displayed = 0;
       for (i = 0; i < newlines; i++)
        {
@@ -377,7 +377,7 @@ mi_cmd_disassemble (char *command, char **argv, int argc)
                  /* Just one line to print. */
                  if (next_line == mle[i].line)
                    {
-                     ui_out_list_begin (uiout, "src_and_asm_line");
+                     ui_out_tuple_begin (uiout, "src_and_asm_line");
                      print_source_lines (symtab, next_line, mle[i].line + 1, 0);
                    }
                  else
@@ -385,26 +385,26 @@ mi_cmd_disassemble (char *command, char **argv, int argc)
                      /* Several source lines w/o asm instructions associated. */
                      for (; next_line < mle[i].line; next_line++)
                        {
-                         ui_out_list_begin (uiout, "src_and_asm_line");
+                         ui_out_tuple_begin (uiout, "src_and_asm_line");
                          print_source_lines (symtab, next_line, mle[i].line + 1, 0);
-                         ui_out_list_begin (uiout, "line_asm_insn");
-                         ui_out_list_end (uiout);
-                         ui_out_list_end (uiout);
+                         ui_out_tuple_begin (uiout, "line_asm_insn");
+                         ui_out_tuple_end (uiout);
+                         ui_out_tuple_end (uiout);
                        }
                      /* Print the last line and leave list open for
                         asm instructions to be added. */
-                     ui_out_list_begin (uiout, "src_and_asm_line");
+                     ui_out_tuple_begin (uiout, "src_and_asm_line");
                      print_source_lines (symtab, next_line, mle[i].line + 1, 0);
                    }
                }
              else
                {
-                 ui_out_list_begin (uiout, "src_and_asm_line");
+                 ui_out_tuple_begin (uiout, "src_and_asm_line");
                  print_source_lines (symtab, mle[i].line, mle[i].line + 1, 0);
                }
 
              next_line = mle[i].line + 1;
-             ui_out_list_begin (uiout, "line_asm_insn");
+             ui_out_tuple_begin (uiout, "line_asm_insn");
              if (i + 1 < newlines && mle[i + 1].line <= mle[i].line)
                close_list = 0;
            }
@@ -418,7 +418,7 @@ mi_cmd_disassemble (char *command, char **argv, int argc)
                  else
                    num_displayed++;
                }
-             ui_out_list_begin (uiout, NULL);
+             ui_out_tuple_begin (uiout, NULL);
              ui_out_field_core_addr (uiout, "address", pc);
 
              if (!build_address_symbolic (pc, 0, &name, &offset, &filename, &line, &unmapped))
@@ -437,24 +437,24 @@ mi_cmd_disassemble (char *command, char **argv, int argc)
              pc += (*tm_print_insn) (pc, &di);
              ui_out_field_stream (uiout, "inst", stb);
              ui_file_rewind (stb->stream);
-             ui_out_list_end (uiout);
+             ui_out_tuple_end (uiout);
            }
          if (close_list)
            {
-             ui_out_list_end (uiout);
-             ui_out_list_end (uiout);
+             ui_out_tuple_end (uiout);
+             ui_out_tuple_end (uiout);
              close_list = 0;
            }
          if (how_many >= 0)
            if (num_displayed >= how_many)
              break;
        }
-      ui_out_list_end (uiout);
+      ui_out_tuple_end (uiout);
     }
   else
     {
     assembly_only:
-      ui_out_list_begin (uiout, "asm_insns");
+      ui_out_tuple_begin (uiout, "asm_insns");
       num_displayed = 0;
       for (pc = low; pc < high;)
        {
@@ -466,7 +466,7 @@ mi_cmd_disassemble (char *command, char **argv, int argc)
              else
                num_displayed++;
            }
-         ui_out_list_begin (uiout, NULL);
+         ui_out_tuple_begin (uiout, NULL);
          ui_out_field_core_addr (uiout, "address", pc);
 
          if (!build_address_symbolic (pc, 0, &name, &offset, &filename, &line, &unmapped))
@@ -485,9 +485,9 @@ mi_cmd_disassemble (char *command, char **argv, int argc)
          pc += (*tm_print_insn) (pc, &di);
          ui_out_field_stream (uiout, "inst", stb);
          ui_file_rewind (stb->stream);
-         ui_out_list_end (uiout);
+         ui_out_tuple_end (uiout);
        }
-      ui_out_list_end (uiout);
+      ui_out_tuple_end (uiout);
     }
   gdb_flush (gdb_stdout);