X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=gdb%2Fdarwin-nat-info.c;h=fc9aeaaad735253f02d7668766f905b44ac8c0a4;hb=dc9fe180a4437b437015a8b835d05e32d64dff3d;hp=53ca1eaee9b3c3068b38c3d882986d961b7f5a6d;hpb=32d0add0a654c1204ab71dc8a55d9374538c4b33;p=external%2Fbinutils.git diff --git a/gdb/darwin-nat-info.c b/gdb/darwin-nat-info.c index 53ca1ea..fc9aeaa 100644 --- a/gdb/darwin-nat-info.c +++ b/gdb/darwin-nat-info.c @@ -1,5 +1,5 @@ /* Darwin support for GDB, the GNU debugger. - Copyright (C) 1997-2015 Free Software Foundation, Inc. + Copyright (C) 1997-2017 Free Software Foundation, Inc. Contributed by Apple Computer, Inc. @@ -118,7 +118,7 @@ get_task_from_args (char *args) { if (ptid_equal (inferior_ptid, null_ptid)) printf_unfiltered (_("No inferior running\n")); - return current_inferior ()->private->task; + return current_inferior ()->priv->task; } if (strcmp (args, "gdb") == 0) return mach_task_self (); @@ -258,32 +258,32 @@ info_mach_ports_command (char *args, int from_tty) { struct inferior *inf = current_inferior (); - if (port == inf->private->task) + if (port == inf->priv->task) printf_unfiltered (_(" inferior-task")); - else if (port == inf->private->notify_port) + else if (port == inf->priv->notify_port) printf_unfiltered (_(" inferior-notify")); else { int k; darwin_thread_t *t; - for (k = 0; k < inf->private->exception_info.count; k++) - if (port == inf->private->exception_info.ports[k]) + for (k = 0; k < inf->priv->exception_info.count; k++) + if (port == inf->priv->exception_info.ports[k]) { printf_unfiltered (_(" inferior-excp-port")); break; } - if (inf->private->threads) + if (inf->priv->threads) { for (k = 0; VEC_iterate(darwin_thread_t, - inf->private->threads, k, t); + inf->priv->threads, k, t); k++) if (port == t->gdb_port) { printf_unfiltered (_(" inferior-thread for 0x%x"), - inf->private->task); + inf->priv->task); break; } } @@ -617,37 +617,35 @@ darwin_debug_regions_recurse (task_t task) vm_region_submap_short_info_data_64_t r_info; kern_return_t kret; int ret; - struct cleanup *table_chain; struct ui_out *uiout = current_uiout; - table_chain = make_cleanup_ui_out_table_begin_end (uiout, 9, -1, "regions"); + ui_out_emit_table table_emitter (uiout, 9, -1, "regions"); if (gdbarch_addr_bit (target_gdbarch ()) <= 32) { - ui_out_table_header (uiout, 10, ui_left, "start", "Start"); - ui_out_table_header (uiout, 10, ui_left, "end", "End"); + uiout->table_header (10, ui_left, "start", "Start"); + uiout->table_header (10, ui_left, "end", "End"); } else { - ui_out_table_header (uiout, 18, ui_left, "start", "Start"); - ui_out_table_header (uiout, 18, ui_left, "end", "End"); + uiout->table_header (18, ui_left, "start", "Start"); + uiout->table_header (18, ui_left, "end", "End"); } - ui_out_table_header (uiout, 3, ui_left, "min-prot", "Min"); - ui_out_table_header (uiout, 3, ui_left, "max-prot", "Max"); - ui_out_table_header (uiout, 5, ui_left, "inheritence", "Inh"); - ui_out_table_header (uiout, 9, ui_left, "share-mode", "Shr"); - ui_out_table_header (uiout, 1, ui_left, "depth", "D"); - ui_out_table_header (uiout, 3, ui_left, "submap", "Sm"); - ui_out_table_header (uiout, 0, ui_noalign, "tag", "Tag"); + uiout->table_header (3, ui_left, "min-prot", "Min"); + uiout->table_header (3, ui_left, "max-prot", "Max"); + uiout->table_header (5, ui_left, "inheritence", "Inh"); + uiout->table_header (9, ui_left, "share-mode", "Shr"); + uiout->table_header (1, ui_left, "depth", "D"); + uiout->table_header (3, ui_left, "submap", "Sm"); + uiout->table_header (0, ui_noalign, "tag", "Tag"); - ui_out_table_body (uiout); + uiout->table_body (); r_start = 0; r_depth = 0; while (1) { const char *tag; - struct cleanup *row_chain; r_info_size = VM_REGION_SUBMAP_SHORT_INFO_COUNT_64; r_size = -1; @@ -656,39 +654,38 @@ darwin_debug_regions_recurse (task_t task) &r_info_size); if (kret != KERN_SUCCESS) break; - row_chain = make_cleanup_ui_out_tuple_begin_end (uiout, "regions-row"); - - ui_out_field_core_addr (uiout, "start", target_gdbarch (), r_start); - ui_out_field_core_addr (uiout, "end", target_gdbarch (), r_start + r_size); - ui_out_field_string (uiout, "min-prot", - unparse_protection (r_info.protection)); - ui_out_field_string (uiout, "max-prot", - unparse_protection (r_info.max_protection)); - ui_out_field_string (uiout, "inheritence", - unparse_inheritance (r_info.inheritance)); - ui_out_field_string (uiout, "share-mode", - unparse_share_mode (r_info.share_mode)); - ui_out_field_int (uiout, "depth", r_depth); - ui_out_field_string (uiout, "submap", - r_info.is_submap ? _("sm ") : _("obj")); - tag = unparse_user_tag (r_info.user_tag); - if (tag) - ui_out_field_string (uiout, "tag", tag); - else - ui_out_field_int (uiout, "tag", r_info.user_tag); - - do_cleanups (row_chain); - if (!ui_out_is_mi_like_p (uiout)) - ui_out_text (uiout, "\n"); + { + ui_out_emit_tuple tuple_emitter (uiout, "regions-row"); + + uiout->field_core_addr ("start", target_gdbarch (), r_start); + uiout->field_core_addr ("end", target_gdbarch (), r_start + r_size); + uiout->field_string ("min-prot", + unparse_protection (r_info.protection)); + uiout->field_string ("max-prot", + unparse_protection (r_info.max_protection)); + uiout->field_string ("inheritence", + unparse_inheritance (r_info.inheritance)); + uiout->field_string ("share-mode", + unparse_share_mode (r_info.share_mode)); + uiout->field_int ("depth", r_depth); + uiout->field_string ("submap", + r_info.is_submap ? _("sm ") : _("obj")); + tag = unparse_user_tag (r_info.user_tag); + if (tag) + uiout->field_string ("tag", tag); + else + uiout->field_int ("tag", r_info.user_tag); + } + + if (!uiout->is_mi_like_p ()) + uiout->text ("\n"); if (r_info.is_submap) r_depth++; else r_start += r_size; } - do_cleanups (table_chain); - } @@ -725,14 +722,13 @@ info_mach_regions_recurse_command (char *args, int from_tty) static void info_mach_region_command (char *exp, int from_tty) { - struct expression *expr; struct value *val; mach_vm_address_t address; struct inferior *inf; - expr = parse_expression (exp); - val = evaluate_expression (expr); - if (TYPE_CODE (value_type (val)) == TYPE_CODE_REF) + expression_up expr = parse_expression (exp); + val = evaluate_expression (expr.get ()); + if (TYPE_IS_REFERENCE (value_type (val))) { val = value_ind (val); } @@ -742,7 +738,7 @@ info_mach_region_command (char *exp, int from_tty) error (_("Inferior not available")); inf = current_inferior (); - darwin_debug_region (inf->private->task, address); + darwin_debug_region (inf->priv->task, address); } static void @@ -811,7 +807,7 @@ info_mach_exceptions_command (char *args, int from_tty) { if (ptid_equal (inferior_ptid, null_ptid)) printf_unfiltered (_("No inferior running\n")); - disp_exception (¤t_inferior ()->private->exception_info); + disp_exception (¤t_inferior ()->priv->exception_info); return; } else if (strcmp (args, "host") == 0) @@ -835,16 +831,13 @@ info_mach_exceptions_command (char *args, int from_tty) inf = current_inferior (); kret = task_get_exception_ports - (inf->private->task, EXC_MASK_ALL, info.masks, + (inf->priv->task, EXC_MASK_ALL, info.masks, &info.count, info.ports, info.behaviors, info.flavors); MACH_CHECK_ERROR (kret); disp_exception (&info); } } -/* -Wmissing-prototypes */ -extern initialize_file_ftype _initialize_darwin_info_commands; - void _initialize_darwin_info_commands (void) {