X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Ftarget.c;h=937b26a560378e25f3a8e83f96befd136470b18e;hb=117de6a92498c0dd715fa0fdec577697433f3c5e;hp=0f9e42afb6bae0202a862312ad6d3b09a60cba3c;hpb=0fb0cc7590113e9b459dfcc48dc71c9d419d9580;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/target.c b/gdb/target.c index 0f9e42afb6..937b26a560 100644 --- a/gdb/target.c +++ b/gdb/target.c @@ -97,16 +97,8 @@ static struct target_ops debug_target; static void debug_to_open (char *, int); -static void debug_to_close (int); - -static void debug_to_attach (struct target_ops *ops, char *, int); - -static void debug_to_detach (struct target_ops *ops, char *, int); - static void debug_to_resume (ptid_t, int, enum target_signal); -static ptid_t debug_to_wait (ptid_t, struct target_waitstatus *); - static void debug_to_fetch_registers (struct regcache *, int); static void debug_to_store_registers (struct regcache *, int); @@ -156,8 +148,6 @@ static void debug_to_load (char *, int); static int debug_to_lookup_symbol (char *, CORE_ADDR *); -static void debug_to_mourn_inferior (struct target_ops *); - static int debug_to_can_run (void); static void debug_to_notice_signals (ptid_t); @@ -281,8 +271,9 @@ target_load (char *arg, int from_tty) (*current_target.to_load) (arg, from_tty); } -void target_create_inferior (char *exec_file, char *args, - char **env, int from_tty) +void +target_create_inferior (char *exec_file, char *args, + char **env, int from_tty) { struct target_ops *t; for (t = current_target.beneath; t != NULL; t = t->beneath) @@ -290,6 +281,10 @@ void target_create_inferior (char *exec_file, char *args, if (t->to_create_inferior != NULL) { t->to_create_inferior (t, exec_file, args, env, from_tty); + if (targetdebug) + fprintf_unfiltered (gdb_stdlog, + "target_create_inferior (%s, %s, xxx, %d)\n", + exec_file, args, from_tty); return; } } @@ -418,7 +413,7 @@ update_current_target (void) /* Do not inherit to_detach. */ /* Do not inherit to_disconnect. */ INHERIT (to_resume, t); - INHERIT (to_wait, t); + /* Do not inherit to_wait. */ INHERIT (to_fetch_registers, t); INHERIT (to_store_registers, t); INHERIT (to_prepare_to_store, t); @@ -457,12 +452,12 @@ update_current_target (void) INHERIT (to_insert_exec_catchpoint, t); INHERIT (to_remove_exec_catchpoint, t); INHERIT (to_has_exited, t); - /* Do no inherit to_mourn_inferiour. */ + /* Do not inherit to_mourn_inferiour. */ INHERIT (to_can_run, t); INHERIT (to_notice_signals, t); INHERIT (to_thread_alive, t); INHERIT (to_find_new_threads, t); - INHERIT (to_pid_to_str, t); + /* Do not inherit to_pid_to_str. */ INHERIT (to_extra_thread_info, t); INHERIT (to_stop, t); /* Do not inherit to_xfer_partial. */ @@ -484,7 +479,7 @@ update_current_target (void) INHERIT (to_async_mask, t); INHERIT (to_find_memory_regions, t); INHERIT (to_make_corefile_notes, t); - INHERIT (to_get_thread_local_address, t); + /* Do not inherit to_get_thread_local_address. */ INHERIT (to_can_execute_reverse, t); /* Do not inherit to_read_description. */ INHERIT (to_get_ada_task_ptid, t); @@ -517,9 +512,6 @@ update_current_target (void) de_fault (to_resume, (void (*) (ptid_t, int, enum target_signal)) noprocess); - de_fault (to_wait, - (ptid_t (*) (ptid_t, struct target_waitstatus *)) - noprocess); de_fault (to_fetch_registers, (void (*) (struct regcache *, int)) target_ignore); @@ -856,8 +848,17 @@ CORE_ADDR target_translate_tls_address (struct objfile *objfile, CORE_ADDR offset) { volatile CORE_ADDR addr = 0; + struct target_ops *target; + + for (target = current_target.beneath; + target != NULL; + target = target->beneath) + { + if (target->to_get_thread_local_address != NULL) + break; + } - if (target_get_thread_local_address_p () + if (target != NULL && gdbarch_fetch_tls_load_module_address_p (target_gdbarch)) { ptid_t ptid = inferior_ptid; @@ -875,7 +876,7 @@ target_translate_tls_address (struct objfile *objfile, CORE_ADDR offset) throw_error (TLS_LOAD_MODULE_NOT_FOUND_ERROR, _("TLS load module not found")); - addr = target_get_thread_local_address (ptid, lm_addr, offset); + addr = target->to_get_thread_local_address (target, ptid, lm_addr, offset); } /* If an error occurred, print TLS related messages here. Otherwise, throw the error to some higher catcher. */ @@ -1200,11 +1201,12 @@ target_xfer_partial (struct target_ops *ops, const unsigned char *myaddr = NULL; fprintf_unfiltered (gdb_stdlog, - "%s:target_xfer_partial (%d, %s, 0x%lx, 0x%lx, %s, %s) = %s", + "%s:target_xfer_partial (%d, %s, %s, %s, %s, %s) = %s", ops->to_shortname, (int) object, (annex ? annex : "(null)"), - (long) readbuf, (long) writebuf, + host_address_to_string (readbuf), + host_address_to_string (writebuf), core_addr_to_string_nz (offset), plongest (len), plongest (retval)); @@ -1219,7 +1221,7 @@ target_xfer_partial (struct target_ops *ops, fputs_unfiltered (", bytes =", gdb_stdlog); for (i = 0; i < retval; i++) { - if ((((long) &(myaddr[i])) & 0xf) == 0) + if ((((intptr_t) &(myaddr[i])) & 0xf) == 0) { if (targetdebug < 2 && i > 0) { @@ -1352,21 +1354,6 @@ target_flash_done (void) tcomplain (); } -#ifndef target_stopped_data_address_p -int -target_stopped_data_address_p (struct target_ops *target) -{ - if (target->to_stopped_data_address - == (int (*) (struct target_ops *, CORE_ADDR *)) return_zero) - return 0; - if (target->to_stopped_data_address == debug_to_stopped_data_address - && (debug_target.to_stopped_data_address - == (int (*) (struct target_ops *, CORE_ADDR *)) return_zero)) - return 0; - return 1; -} -#endif - static void show_trust_readonly (struct ui_file *file, int from_tty, struct cmd_list_element *c, const char *value) @@ -1825,6 +1812,9 @@ target_detach (char *args, int from_tty) 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; } } @@ -1855,6 +1845,50 @@ target_disconnect (char *args, int from_tty) tcomplain (); } +ptid_t +target_wait (ptid_t ptid, struct target_waitstatus *status) +{ + struct target_ops *t; + + for (t = current_target.beneath; t != NULL; t = t->beneath) + { + if (t->to_wait != NULL) + { + ptid_t retval = (*t->to_wait) (t, ptid, status); + + if (targetdebug) + { + char *status_string; + + status_string = target_waitstatus_to_string (status); + fprintf_unfiltered (gdb_stdlog, + "target_wait (%d, status) = %d, %s\n", + PIDGET (ptid), PIDGET (retval), + status_string); + xfree (status_string); + } + + return retval; + } + } + + noprocess (); +} + +char * +target_pid_to_str (ptid_t ptid) +{ + struct target_ops *t; + + for (t = current_target.beneath; t != NULL; t = t->beneath) + { + if (t->to_pid_to_str != NULL) + return (*t->to_pid_to_str) (t, ptid); + } + + return normal_pid_to_str (ptid); +} + void target_resume (ptid_t ptid, int step, enum target_signal signal) { @@ -1897,6 +1931,8 @@ target_mourn_inferior (void) if (t->to_mourn_inferior != NULL) { t->to_mourn_inferior (t); + if (targetdebug) + fprintf_unfiltered (gdb_stdlog, "target_mourn_inferior ()\n"); return; } } @@ -2230,18 +2266,18 @@ target_get_osdata (const char *type) char *document; struct target_ops *t; - if (target_can_run (¤t_target)) - t = ¤t_target; + /* If we're already connected to something that can get us OS + related data, use it. Otherwise, try using the native + target. */ + if (current_target.to_stratum >= process_stratum) + t = current_target.beneath; else t = find_default_run_target ("get OS data"); if (!t) return NULL; - document = target_read_stralloc (t, - TARGET_OBJECT_OSDATA, - type); - return document; + return target_read_stralloc (t, TARGET_OBJECT_OSDATA, type); } static int @@ -2487,6 +2523,12 @@ normal_pid_to_str (ptid_t ptid) return buf; } +char * +dummy_pid_to_str (struct target_ops *ops, ptid_t ptid) +{ + return normal_pid_to_str (ptid); +} + /* Error-catcher for target_find_memory_regions */ static int dummy_find_memory_regions (int (*ignore1) (), void *ignore2) { @@ -2517,7 +2559,7 @@ init_dummy_target (void) dummy_target.to_can_async_p = find_default_can_async_p; dummy_target.to_is_async_p = find_default_is_async_p; dummy_target.to_supports_non_stop = find_default_supports_non_stop; - dummy_target.to_pid_to_str = normal_pid_to_str; + dummy_target.to_pid_to_str = dummy_pid_to_str; dummy_target.to_stratum = dummy_stratum; dummy_target.to_find_memory_regions = dummy_find_memory_regions; dummy_target.to_make_corefile_notes = dummy_make_corefile_notes; @@ -2533,13 +2575,6 @@ debug_to_open (char *args, int from_tty) fprintf_unfiltered (gdb_stdlog, "target_open (%s, %d)\n", args, from_tty); } -static void -debug_to_close (int quitting) -{ - target_close (&debug_target, quitting); - fprintf_unfiltered (gdb_stdlog, "target_close (%d)\n", quitting); -} - void target_close (struct target_ops *targ, int quitting) { @@ -2547,6 +2582,9 @@ target_close (struct target_ops *targ, int quitting) targ->to_xclose (targ, quitting); else if (targ->to_close != NULL) targ->to_close (quitting); + + if (targetdebug) + fprintf_unfiltered (gdb_stdlog, "target_close (%d)\n", quitting); } void @@ -2558,6 +2596,9 @@ target_attach (char *args, int from_tty) 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; } } @@ -2566,16 +2607,6 @@ target_attach (char *args, int from_tty) "could not find a target to attach"); } - -static void -debug_to_attach (struct target_ops *ops, char *args, int from_tty) -{ - debug_target.to_attach (&debug_target, args, from_tty); - - fprintf_unfiltered (gdb_stdlog, "target_attach (%s, %d)\n", args, from_tty); -} - - static void debug_to_post_attach (int pid) { @@ -2584,14 +2615,6 @@ debug_to_post_attach (int pid) fprintf_unfiltered (gdb_stdlog, "target_post_attach (%d)\n", pid); } -static void -debug_to_detach (struct target_ops *ops, char *args, int from_tty) -{ - debug_target.to_detach (&debug_target, args, from_tty); - - fprintf_unfiltered (gdb_stdlog, "target_detach (%s, %d)\n", args, from_tty); -} - static void debug_to_resume (ptid_t ptid, int step, enum target_signal siggnal) { @@ -2602,52 +2625,46 @@ debug_to_resume (ptid_t ptid, int step, enum target_signal siggnal) target_signal_to_name (siggnal)); } -static ptid_t -debug_to_wait (ptid_t ptid, struct target_waitstatus *status) -{ - ptid_t retval; +/* Return a pretty printed form of target_waitstatus. + Space for the result is malloc'd, caller must free. */ - retval = debug_target.to_wait (ptid, status); +char * +target_waitstatus_to_string (const struct target_waitstatus *ws) +{ + const char *kind_str = "status->kind = "; - fprintf_unfiltered (gdb_stdlog, - "target_wait (%d, status) = %d, ", PIDGET (ptid), - PIDGET (retval)); - fprintf_unfiltered (gdb_stdlog, "status->kind = "); - switch (status->kind) + switch (ws->kind) { case TARGET_WAITKIND_EXITED: - fprintf_unfiltered (gdb_stdlog, "exited, status = %d\n", - status->value.integer); - break; + return xstrprintf ("%sexited, status = %d", + kind_str, ws->value.integer); case TARGET_WAITKIND_STOPPED: - fprintf_unfiltered (gdb_stdlog, "stopped, signal = %s\n", - target_signal_to_name (status->value.sig)); - break; + return xstrprintf ("%sstopped, signal = %s", + kind_str, target_signal_to_name (ws->value.sig)); case TARGET_WAITKIND_SIGNALLED: - fprintf_unfiltered (gdb_stdlog, "signalled, signal = %s\n", - target_signal_to_name (status->value.sig)); - break; + return xstrprintf ("%ssignalled, signal = %s", + kind_str, target_signal_to_name (ws->value.sig)); case TARGET_WAITKIND_LOADED: - fprintf_unfiltered (gdb_stdlog, "loaded\n"); - break; + return xstrprintf ("%sloaded", kind_str); case TARGET_WAITKIND_FORKED: - fprintf_unfiltered (gdb_stdlog, "forked\n"); - break; + return xstrprintf ("%sforked", kind_str); case TARGET_WAITKIND_VFORKED: - fprintf_unfiltered (gdb_stdlog, "vforked\n"); - break; + return xstrprintf ("%svforked", kind_str); case TARGET_WAITKIND_EXECD: - fprintf_unfiltered (gdb_stdlog, "execd\n"); - break; + return xstrprintf ("%sexecd", kind_str); + case TARGET_WAITKIND_SYSCALL_ENTRY: + return xstrprintf ("%ssyscall-entry", kind_str); + case TARGET_WAITKIND_SYSCALL_RETURN: + return xstrprintf ("%ssyscall-return", kind_str); case TARGET_WAITKIND_SPURIOUS: - fprintf_unfiltered (gdb_stdlog, "spurious\n"); - break; + return xstrprintf ("%sspurious", kind_str); + case TARGET_WAITKIND_IGNORE: + return xstrprintf ("%signore", kind_str); + case TARGET_WAITKIND_NO_HISTORY: + return xstrprintf ("%sno-history", kind_str); default: - fprintf_unfiltered (gdb_stdlog, "unknown???\n"); - break; + return xstrprintf ("%sunknown???", kind_str); } - - return retval; } static void @@ -2717,9 +2734,9 @@ deprecated_debug_xfer_memory (CORE_ADDR memaddr, bfd_byte *myaddr, int len, attrib, target); fprintf_unfiltered (gdb_stdlog, - "target_xfer_memory (0x%x, xxx, %d, %s, xxx) = %d", - (unsigned int) memaddr, /* possable truncate long long */ - len, write ? "write" : "read", retval); + "target_xfer_memory (%s, xxx, %d, %s, xxx) = %d", + paddress (memaddr), len, write ? "write" : "read", + retval); if (retval > 0) { @@ -2728,7 +2745,7 @@ deprecated_debug_xfer_memory (CORE_ADDR memaddr, bfd_byte *myaddr, int len, fputs_unfiltered (", bytes =", gdb_stdlog); for (i = 0; i < retval; i++) { - if ((((long) &(myaddr[i])) & 0xf) == 0) + if ((((intptr_t) &(myaddr[i])) & 0xf) == 0) { if (targetdebug < 2 && i > 0) { @@ -2989,17 +3006,6 @@ debug_to_lookup_symbol (char *name, CORE_ADDR *addrp) return retval; } -static void -debug_to_create_inferior (struct target_ops *ops, - char *exec_file, char *args, char **env, - int from_tty) -{ - debug_target.to_create_inferior (ops, exec_file, args, env, from_tty); - - fprintf_unfiltered (gdb_stdlog, "target_create_inferior (%s, %s, xxx, %d)\n", - exec_file, args, from_tty); -} - static void debug_to_post_startup_inferior (ptid_t ptid) { @@ -3097,14 +3103,6 @@ debug_to_has_exited (int pid, int wait_status, int *exit_status) return has_exited; } -static void -debug_to_mourn_inferior (struct target_ops *ops) -{ - debug_target.to_mourn_inferior (&debug_target); - - fprintf_unfiltered (gdb_stdlog, "target_mourn_inferior ()\n"); -} - static int debug_to_can_run (void) { @@ -3183,12 +3181,8 @@ setup_target_debug (void) memcpy (&debug_target, ¤t_target, sizeof debug_target); current_target.to_open = debug_to_open; - current_target.to_close = debug_to_close; - current_target.to_attach = debug_to_attach; current_target.to_post_attach = debug_to_post_attach; - current_target.to_detach = debug_to_detach; current_target.to_resume = debug_to_resume; - current_target.to_wait = debug_to_wait; current_target.to_fetch_registers = debug_to_fetch_registers; current_target.to_store_registers = debug_to_store_registers; current_target.to_prepare_to_store = debug_to_prepare_to_store; @@ -3214,7 +3208,6 @@ setup_target_debug (void) current_target.to_kill = debug_to_kill; current_target.to_load = debug_to_load; current_target.to_lookup_symbol = debug_to_lookup_symbol; - current_target.to_create_inferior = debug_to_create_inferior; current_target.to_post_startup_inferior = debug_to_post_startup_inferior; current_target.to_acknowledge_created_inferior = debug_to_acknowledge_created_inferior; current_target.to_insert_fork_catchpoint = debug_to_insert_fork_catchpoint; @@ -3224,7 +3217,6 @@ setup_target_debug (void) current_target.to_insert_exec_catchpoint = debug_to_insert_exec_catchpoint; current_target.to_remove_exec_catchpoint = debug_to_remove_exec_catchpoint; current_target.to_has_exited = debug_to_has_exited; - current_target.to_mourn_inferior = debug_to_mourn_inferior; current_target.to_can_run = debug_to_can_run; current_target.to_notice_signals = debug_to_notice_signals; current_target.to_thread_alive = debug_to_thread_alive;