X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Ftarget.c;h=d3d40853843f77e94fb80839a8ab48f020e86a22;hb=74fcbef986dc97a4025125c6ef7c5a5b0db9dd07;hp=2cf7055bb14060e139f346c3a53606f3efe03ee1;hpb=c378d69dffc04b96a99e08f8df7a117ac0e57dbf;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/target.c b/gdb/target.c index 2cf7055bb1..d3d4085384 100644 --- a/gdb/target.c +++ b/gdb/target.c @@ -55,6 +55,8 @@ static int default_watchpoint_addr_within_range (struct target_ops *, static int default_region_ok_for_hw_watchpoint (struct target_ops *, CORE_ADDR, int); +static void default_rcmd (struct target_ops *, char *, struct ui_file *); + static void tcomplain (void) ATTRIBUTE_NORETURN; static int nomemory (CORE_ADDR, char *, int, int, struct target_ops *); @@ -589,7 +591,7 @@ update_current_target (void) /* Do not inherit to_open. */ /* Do not inherit to_close. */ /* Do not inherit to_attach. */ - INHERIT (to_post_attach, t); + /* Do not inherit to_post_attach. */ INHERIT (to_attach_no_wait, t); /* Do not inherit to_detach. */ /* Do not inherit to_disconnect. */ @@ -597,30 +599,30 @@ update_current_target (void) /* Do not inherit to_wait. */ /* Do not inherit to_fetch_registers. */ /* Do not inherit to_store_registers. */ - INHERIT (to_prepare_to_store, t); + /* Do not inherit to_prepare_to_store. */ INHERIT (deprecated_xfer_memory, t); - INHERIT (to_files_info, t); + /* Do not inherit to_files_info. */ /* Do not inherit to_insert_breakpoint. */ /* Do not inherit to_remove_breakpoint. */ - INHERIT (to_can_use_hw_breakpoint, t); - INHERIT (to_insert_hw_breakpoint, t); - INHERIT (to_remove_hw_breakpoint, t); + /* Do not inherit to_can_use_hw_breakpoint. */ + /* Do not inherit to_insert_hw_breakpoint. */ + /* Do not inherit to_remove_hw_breakpoint. */ /* Do not inherit to_ranged_break_num_registers. */ - INHERIT (to_insert_watchpoint, t); - INHERIT (to_remove_watchpoint, t); + /* Do not inherit to_insert_watchpoint. */ + /* Do not inherit to_remove_watchpoint. */ /* Do not inherit to_insert_mask_watchpoint. */ /* Do not inherit to_remove_mask_watchpoint. */ /* Do not inherit to_stopped_data_address. */ INHERIT (to_have_steppable_watchpoint, t); INHERIT (to_have_continuable_watchpoint, t); /* Do not inherit to_stopped_by_watchpoint. */ - INHERIT (to_watchpoint_addr_within_range, t); - INHERIT (to_region_ok_for_hw_watchpoint, t); - INHERIT (to_can_accel_watchpoint_condition, t); + /* Do not inherit to_watchpoint_addr_within_range. */ + /* Do not inherit to_region_ok_for_hw_watchpoint. */ + /* Do not inherit to_can_accel_watchpoint_condition. */ /* Do not inherit to_masked_watch_num_registers. */ - INHERIT (to_terminal_init, t); - INHERIT (to_terminal_inferior, t); - INHERIT (to_terminal_ours_for_output, t); + /* Do not inherit to_terminal_init. */ + /* Do not inherit to_terminal_inferior. */ + /* Do not inherit to_terminal_ours_for_output. */ INHERIT (to_terminal_ours, t); INHERIT (to_terminal_save_ours, t); INHERIT (to_terminal_info, t); @@ -648,7 +650,7 @@ update_current_target (void) INHERIT (to_thread_name, t); INHERIT (to_stop, t); /* Do not inherit to_xfer_partial. */ - INHERIT (to_rcmd, t); + /* Do not inherit to_rcmd. */ INHERIT (to_pid_to_exec_file, t); INHERIT (to_log_command, t); INHERIT (to_stratum, t); @@ -728,55 +730,10 @@ update_current_target (void) de_fault (to_close, (void (*) (struct target_ops *)) target_ignore); - de_fault (to_post_attach, - (void (*) (struct target_ops *, int)) - target_ignore); - de_fault (to_prepare_to_store, - (void (*) (struct target_ops *, struct regcache *)) - noprocess); de_fault (deprecated_xfer_memory, (int (*) (CORE_ADDR, gdb_byte *, int, int, struct mem_attrib *, struct target_ops *)) nomemory); - de_fault (to_files_info, - (void (*) (struct target_ops *)) - target_ignore); - de_fault (to_can_use_hw_breakpoint, - (int (*) (struct target_ops *, int, int, int)) - return_zero); - de_fault (to_insert_hw_breakpoint, - (int (*) (struct target_ops *, struct gdbarch *, - struct bp_target_info *)) - return_minus_one); - de_fault (to_remove_hw_breakpoint, - (int (*) (struct target_ops *, struct gdbarch *, - struct bp_target_info *)) - return_minus_one); - de_fault (to_insert_watchpoint, - (int (*) (struct target_ops *, CORE_ADDR, int, int, - struct expression *)) - return_minus_one); - de_fault (to_remove_watchpoint, - (int (*) (struct target_ops *, CORE_ADDR, int, int, - struct expression *)) - return_minus_one); - de_fault (to_watchpoint_addr_within_range, - default_watchpoint_addr_within_range); - de_fault (to_region_ok_for_hw_watchpoint, - default_region_ok_for_hw_watchpoint); - de_fault (to_can_accel_watchpoint_condition, - (int (*) (struct target_ops *, CORE_ADDR, int, int, - struct expression *)) - return_zero); - de_fault (to_terminal_init, - (void (*) (struct target_ops *)) - target_ignore); - de_fault (to_terminal_inferior, - (void (*) (struct target_ops *)) - target_ignore); - de_fault (to_terminal_ours_for_output, - (void (*) (struct target_ops *)) - target_ignore); de_fault (to_terminal_ours, (void (*) (struct target_ops *)) target_ignore); @@ -827,9 +784,6 @@ update_current_target (void) de_fault (to_stop, (void (*) (struct target_ops *, ptid_t)) target_ignore); - de_fault (to_rcmd, - (void (*) (struct target_ops *, char *, struct ui_file *)) - tcomplain); de_fault (to_pid_to_exec_file, (char *(*) (struct target_ops *, int)) return_null); @@ -924,13 +878,15 @@ update_current_target (void) (void (*) (struct target_ops *)) target_ignore); de_fault (to_static_tracepoint_marker_at, - (int (*) (CORE_ADDR, struct static_tracepoint_marker *)) + (int (*) (struct target_ops *, + CORE_ADDR, struct static_tracepoint_marker *)) return_zero); de_fault (to_static_tracepoint_markers_by_strid, - (VEC(static_tracepoint_marker_p) * (*) (const char *)) + (VEC(static_tracepoint_marker_p) * (*) (struct target_ops *, + const char *)) tcomplain); de_fault (to_traceframe_info, - (struct traceframe_info * (*) (void)) + (struct traceframe_info * (*) (struct target_ops *)) return_null); de_fault (to_supports_evaluation_of_breakpoint_conditions, (int (*) (struct target_ops *)) @@ -939,13 +895,13 @@ update_current_target (void) (int (*) (struct target_ops *)) return_zero); de_fault (to_use_agent, - (int (*) (int)) + (int (*) (struct target_ops *, int)) tcomplain); de_fault (to_can_use_agent, - (int (*) (void)) + (int (*) (struct target_ops *)) return_zero); de_fault (to_augmented_libraries_svr4_read, - (int (*) (void)) + (int (*) (struct target_ops *)) return_zero); de_fault (to_execution_direction, default_execution_direction); @@ -2688,19 +2644,10 @@ target_detach (const char *args, int from_tty) prepare_for_detach (); - for (t = current_target.beneath; t != NULL; t = t->beneath) - { - if (t->to_detach != NULL) - { - t->to_detach (t, args, from_tty); - if (targetdebug) - fprintf_unfiltered (gdb_stdlog, "target_detach (%s, %d)\n", - args, from_tty); - return; - } - } - - internal_error (__FILE__, __LINE__, _("could not find a target to detach")); + current_target.to_detach (¤t_target, args, from_tty); + if (targetdebug) + fprintf_unfiltered (gdb_stdlog, "target_detach (%s, %d)\n", + args, from_tty); } void @@ -3813,9 +3760,6 @@ init_dummy_target (void) dummy_target.to_shortname = "None"; dummy_target.to_longname = "None"; dummy_target.to_doc = ""; - dummy_target.to_attach = find_default_attach; - dummy_target.to_detach = - (void (*)(struct target_ops *, const char *, int))target_ignore; dummy_target.to_create_inferior = find_default_create_inferior; dummy_target.to_supports_non_stop = find_default_supports_non_stop; dummy_target.to_supports_disable_randomization @@ -3862,22 +3806,10 @@ target_close (struct target_ops *targ) void target_attach (char *args, int from_tty) { - struct target_ops *t; - - for (t = current_target.beneath; t != NULL; t = t->beneath) - { - if (t->to_attach != NULL) - { - t->to_attach (t, args, from_tty); - if (targetdebug) - fprintf_unfiltered (gdb_stdlog, "target_attach (%s, %d)\n", - args, from_tty); - return; - } - } - - internal_error (__FILE__, __LINE__, - _("could not find a target to attach")); + current_target.to_attach (¤t_target, args, from_tty); + if (targetdebug) + fprintf_unfiltered (gdb_stdlog, "target_attach (%s, %d)\n", + args, from_tty); } int @@ -4197,7 +4129,7 @@ target_enable_btrace (ptid_t ptid) for (t = current_target.beneath; t != NULL; t = t->beneath) if (t->to_enable_btrace != NULL) - return t->to_enable_btrace (ptid); + return t->to_enable_btrace (t, ptid); tcomplain (); return NULL; @@ -4213,7 +4145,7 @@ target_disable_btrace (struct btrace_target_info *btinfo) for (t = current_target.beneath; t != NULL; t = t->beneath) if (t->to_disable_btrace != NULL) { - t->to_disable_btrace (btinfo); + t->to_disable_btrace (t, btinfo); return; } @@ -4230,7 +4162,7 @@ target_teardown_btrace (struct btrace_target_info *btinfo) for (t = current_target.beneath; t != NULL; t = t->beneath) if (t->to_teardown_btrace != NULL) { - t->to_teardown_btrace (btinfo); + t->to_teardown_btrace (t, btinfo); return; } @@ -4248,7 +4180,7 @@ target_read_btrace (VEC (btrace_block_s) **btrace, for (t = current_target.beneath; t != NULL; t = t->beneath) if (t->to_read_btrace != NULL) - return t->to_read_btrace (btrace, btinfo, type); + return t->to_read_btrace (t, btrace, btinfo, type); tcomplain (); return BTRACE_ERR_NOT_SUPPORTED; @@ -4264,7 +4196,7 @@ target_stop_recording (void) for (t = current_target.beneath; t != NULL; t = t->beneath) if (t->to_stop_recording != NULL) { - t->to_stop_recording (); + t->to_stop_recording (t); return; } @@ -4281,7 +4213,7 @@ target_info_record (void) for (t = current_target.beneath; t != NULL; t = t->beneath) if (t->to_info_record != NULL) { - t->to_info_record (); + t->to_info_record (t); return; } @@ -4298,7 +4230,7 @@ target_save_record (const char *filename) for (t = current_target.beneath; t != NULL; t = t->beneath) if (t->to_save_record != NULL) { - t->to_save_record (filename); + t->to_save_record (t, filename); return; } @@ -4329,7 +4261,7 @@ target_delete_record (void) for (t = current_target.beneath; t != NULL; t = t->beneath) if (t->to_delete_record != NULL) { - t->to_delete_record (); + t->to_delete_record (t); return; } @@ -4345,7 +4277,7 @@ target_record_is_replaying (void) for (t = current_target.beneath; t != NULL; t = t->beneath) if (t->to_record_is_replaying != NULL) - return t->to_record_is_replaying (); + return t->to_record_is_replaying (t); return 0; } @@ -4360,7 +4292,7 @@ target_goto_record_begin (void) for (t = current_target.beneath; t != NULL; t = t->beneath) if (t->to_goto_record_begin != NULL) { - t->to_goto_record_begin (); + t->to_goto_record_begin (t); return; } @@ -4377,7 +4309,7 @@ target_goto_record_end (void) for (t = current_target.beneath; t != NULL; t = t->beneath) if (t->to_goto_record_end != NULL) { - t->to_goto_record_end (); + t->to_goto_record_end (t); return; } @@ -4394,7 +4326,7 @@ target_goto_record (ULONGEST insn) for (t = current_target.beneath; t != NULL; t = t->beneath) if (t->to_goto_record != NULL) { - t->to_goto_record (insn); + t->to_goto_record (t, insn); return; } @@ -4411,7 +4343,7 @@ target_insn_history (int size, int flags) for (t = current_target.beneath; t != NULL; t = t->beneath) if (t->to_insn_history != NULL) { - t->to_insn_history (size, flags); + t->to_insn_history (t, size, flags); return; } @@ -4428,7 +4360,7 @@ target_insn_history_from (ULONGEST from, int size, int flags) for (t = current_target.beneath; t != NULL; t = t->beneath) if (t->to_insn_history_from != NULL) { - t->to_insn_history_from (from, size, flags); + t->to_insn_history_from (t, from, size, flags); return; } @@ -4445,7 +4377,7 @@ target_insn_history_range (ULONGEST begin, ULONGEST end, int flags) for (t = current_target.beneath; t != NULL; t = t->beneath) if (t->to_insn_history_range != NULL) { - t->to_insn_history_range (begin, end, flags); + t->to_insn_history_range (t, begin, end, flags); return; } @@ -4462,7 +4394,7 @@ target_call_history (int size, int flags) for (t = current_target.beneath; t != NULL; t = t->beneath) if (t->to_call_history != NULL) { - t->to_call_history (size, flags); + t->to_call_history (t, size, flags); return; } @@ -4479,7 +4411,7 @@ target_call_history_from (ULONGEST begin, int size, int flags) for (t = current_target.beneath; t != NULL; t = t->beneath) if (t->to_call_history_from != NULL) { - t->to_call_history_from (begin, size, flags); + t->to_call_history_from (t, begin, size, flags); return; } @@ -4496,7 +4428,7 @@ target_call_history_range (ULONGEST begin, ULONGEST end, int flags) for (t = current_target.beneath; t != NULL; t = t->beneath) if (t->to_call_history_range != NULL) { - t->to_call_history_range (begin, end, flags); + t->to_call_history_range (t, begin, end, flags); return; } @@ -5075,17 +5007,16 @@ static char targ_desc[] = stack of targets currently in use (including the exec-file,\n\ core-file, and process, if any), as well as the symbol file name."; +static void +default_rcmd (struct target_ops *self, char *command, struct ui_file *output) +{ + error (_("\"monitor\" command not supported by this target.")); +} + static void do_monitor_command (char *cmd, int from_tty) { - if ((current_target.to_rcmd - == (void (*) (struct target_ops *, char *, struct ui_file *)) tcomplain) - || (current_target.to_rcmd == debug_to_rcmd - && (debug_target.to_rcmd - == (void (*) (struct target_ops *, - char *, struct ui_file *)) tcomplain))) - error (_("\"monitor\" command not supported by this target.")); target_rcmd (cmd, gdb_stdtarg); }