X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Fgdbserver%2Fwin32-low.c;h=49c6cf1b7c9d68f735f5f24a8990e8f2989aa8c4;hb=268a13a5a3f7c6b9b6ffc5ac2d1b24eb41f3fbdc;hp=fecab84b2f1f8b114ccb124155de8c7414d7f52f;hpb=8dc7b443a6295da4b3d7ba22f3a7695990bf4f39;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/gdbserver/win32-low.c b/gdb/gdbserver/win32-low.c index fecab84b2f..49c6cf1b7c 100644 --- a/gdb/gdbserver/win32-low.c +++ b/gdb/gdbserver/win32-low.c @@ -1,5 +1,5 @@ /* Low level interface to Windows debugging, for gdbserver. - Copyright (C) 2006-2017 Free Software Foundation, Inc. + Copyright (C) 2006-2019 Free Software Foundation, Inc. Contributed by Leo Zayas. Based on "win32-nat.c" from GDB. @@ -32,8 +32,8 @@ #include #include #include -#include "gdb_tilde_expand.h" -#include "common-inferior.h" +#include "gdbsupport/gdb_tilde_expand.h" +#include "gdbsupport/common-inferior.h" #ifndef USE_WIN32API #include @@ -120,7 +120,7 @@ current_thread_ptid (void) static ptid_t debug_event_ptid (DEBUG_EVENT *event) { - return ptid_build (event->dwProcessId, event->dwThreadId, 0); + return ptid_t (event->dwProcessId, event->dwThreadId, 0); } /* Get the thread context of the thread associated with TH. */ @@ -208,7 +208,7 @@ static win32_thread_info * child_add_thread (DWORD pid, DWORD tid, HANDLE h, void *tlb) { win32_thread_info *th; - ptid_t ptid = ptid_build (pid, tid, 0); + ptid_t ptid = ptid_t (pid, tid, 0); if ((th = thread_rec (ptid, FALSE))) return th; @@ -339,7 +339,7 @@ child_xfer_memory (CORE_ADDR memaddr, char *our, int len, static void child_init_thread_list (void) { - for_each_inferior (&all_threads, delete_thread_info); + for_each_thread (delete_thread_info); } /* Zero during the child initialization phase, and nonzero otherwise. */ @@ -556,7 +556,6 @@ create_process (const char *program, char *args, DWORD flags, PROCESS_INFORMATION *pi) { const char *inferior_cwd = get_inferior_cwd (); - std::string expanded_infcwd = gdb_tilde_expand (inferior_cwd); BOOL ret; #ifdef _WIN32_WCE @@ -576,6 +575,7 @@ create_process (const char *program, char *args, if (inferior_cwd != NULL) { + std::string expanded_infcwd = gdb_tilde_expand (inferior_cwd); std::replace (expanded_infcwd.begin (), expanded_infcwd.end (), '/', '\\'); wcwd = alloca ((expanded_infcwd.size () + 1) * sizeof (wchar_t)); @@ -607,7 +607,10 @@ Could not convert the expanded inferior cwd to wide-char.")); TRUE, /* inherit handles */ flags, /* start flags */ NULL, /* environment */ - expanded_infcwd.c_str (), /* current directory */ + /* current directory */ + (inferior_cwd == NULL + ? NULL + : gdb_tilde_expand (inferior_cwd).c_str()), &si, /* start info */ pi); /* proc info */ #endif @@ -624,14 +627,13 @@ static int win32_create_inferior (const char *program, const std::vector &program_args) { + client_state &cs = get_client_state (); #ifndef USE_WIN32API char real_path[PATH_MAX]; char *orig_path, *new_path, *path_ptr; #endif BOOL ret; DWORD flags; - int argslen; - int argc; PROCESS_INFORMATION pi; DWORD err; std::string str_program_args = stringify_argv (program_args); @@ -701,6 +703,10 @@ win32_create_inferior (const char *program, do_initial_child_stuff (pi.hProcess, pi.dwProcessId, 0); + /* Wait till we are at 1st instruction in program, return new pid + (assuming success). */ + cs.last_ptid = win32_wait (ptid_t (current_process_id), &cs.last_status, 0); + return current_process_id; } @@ -793,19 +799,15 @@ win32_clear_inferiors (void) if (current_process_handle != NULL) CloseHandle (current_process_handle); - for_each_inferior (&all_threads, delete_thread_info); + for_each_thread (delete_thread_info); clear_inferiors (); } -/* Kill all inferiors. */ +/* Implementation of target_ops::kill. */ + static int -win32_kill (int pid) +win32_kill (process_info *process) { - struct process_info *process; - - if (current_process_handle == NULL) - return -1; - TerminateProcess (current_process_handle, 0); for (;;) { @@ -821,16 +823,15 @@ win32_kill (int pid) win32_clear_inferiors (); - process = find_process_pid (pid); remove_process (process); return 0; } -/* Detach from inferior PID. */ +/* Implementation of target_ops::detach. */ + static int -win32_detach (int pid) +win32_detach (process_info *process) { - struct process_info *process; winapi_DebugActiveProcessStop DebugActiveProcessStop = NULL; winapi_DebugSetProcessKillOnExit DebugSetProcessKillOnExit = NULL; #ifdef _WIN32_WCE @@ -857,7 +858,6 @@ win32_detach (int pid) return -1; DebugSetProcessKillOnExit (FALSE); - process = find_process_pid (pid); remove_process (process); win32_clear_inferiors (); @@ -870,7 +870,8 @@ win32_mourn (struct process_info *process) remove_process (process); } -/* Wait for inferiors to end. */ +/* Implementation of target_ops::join. */ + static void win32_join (int pid) { @@ -906,7 +907,7 @@ win32_resume (struct thread_resume *resume_info, size_t n) /* This handles the very limited set of resume packets that GDB can currently produce. */ - if (n == 1 && ptid_equal (resume_info[0].thread, minus_one_ptid)) + if (n == 1 && resume_info[0].thread == minus_one_ptid) tid = -1; else if (n > 1) tid = -1; @@ -915,7 +916,7 @@ win32_resume (struct thread_resume *resume_info, size_t n) the Windows resume code do the right thing for thread switching. */ tid = current_event.dwThreadId; - if (!ptid_equal (resume_info[0].thread, minus_one_ptid)) + if (resume_info[0].thread != minus_one_ptid) { sig = gdb_signal_from_host (resume_info[0].sig); step = resume_info[0].kind == resume_step; @@ -1362,7 +1363,7 @@ fake_breakpoint_event (void) current_event.u.Exception.ExceptionRecord.ExceptionCode = EXCEPTION_BREAKPOINT; - for_each_inferior (&all_threads, suspend_one_thread); + for_each_thread (suspend_one_thread); } #ifdef _WIN32_WCE @@ -1604,7 +1605,7 @@ win32_wait (ptid_t ptid, struct target_waitstatus *ourstatus, int options) OUTMSG2 (("Child exited with retcode = %x\n", ourstatus->value.integer)); win32_clear_inferiors (); - return pid_to_ptid (current_event.dwProcessId); + return ptid_t (current_event.dwProcessId); case TARGET_WAITKIND_STOPPED: case TARGET_WAITKIND_LOADED: OUTMSG2 (("Child Stopped with signal = %d \n", @@ -1842,7 +1843,6 @@ static struct target_ops win32_target_ops = { NULL, /* get_min_fast_tracepoint_insn_len */ NULL, /* qxfer_libraries_svr4 */ NULL, /* support_agent */ - NULL, /* support_btrace */ NULL, /* enable_btrace */ NULL, /* disable_btrace */ NULL, /* read_btrace */