OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* top.c (gdb_readline): Allow CRLF line termination on systems 

which define CRLF_SOURCE_FILES.
* win32-nat.c: 1) Add thread support, 2) fix ability to attach to
a running process, and 3) implement limited support for cygwin
signals.
(thread_rec): New function.
(child_add_thread): Ditto.
(child_init_thread_list): Ditto.
(child_delete_thread): Ditto.
(do_child_fetch_inferior_registers): Ditto.
(do_child_store_inferior_registers): Ditto.
(handle_output_debug_string): Ditto.
(child_fetch_inferior_registers): Use do_* function to perform
operation.
(child_store_inferior_registers): Ditto.
(child_continue): Ditto.
(child_thread_alive): Ditto.
(cygwin_pid_to_str): Ditto.
(handle_load_dll): Reorganize, add first attempt at reading
dll names from attached processes.  Change info messages to provide
more information when dll is already loaded.
(handle_exception): Changes mandated by new thread-aware structures.
(child_wait): Track thread creation/destruction.  Handle cygwin
signals.
(child_create_inferior): Ditto.
(child_resume): Ditto.
(child_kill_inferior): Ditto.  Close child process handle to avoid a
handle leak.
(child_ops): Fill out child_ops fields that deal with threads.
* config/i386/tm-cygwin32.h: Declare function and macro needed
for converting a cygwin "pid" to a string.
* config/i386/xm-cygwin32.h: define HAVE_SIGSETMASK as 0 since
sigsetmask is not defined in cygwin.
This commit is contained in:
Christopher Faylor 1998-11-05 14:08:48 +00:00
parent 8015bd27ec
commit 3cee93ac7a
6 changed files with 2535 additions and 2290 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
gdb/ChangeLog
View File

@ -1,3 +1,39 @@
Thu Nov 5 08:41:33 1998 Christopher Faylor <cgf@cygnus.com>
* top.c (gdb_readline): Allow CRLF line termination on systems
which define CRLF_SOURCE_FILES.
* win32-nat.c: 1) Add thread support, 2) fix ability to attach to
a running process, and 3) implement limited support for cygwin
signals.
(thread_rec): New function.
(child_add_thread): Ditto.
(child_init_thread_list): Ditto.
(child_delete_thread): Ditto.
(do_child_fetch_inferior_registers): Ditto.
(do_child_store_inferior_registers): Ditto.
(handle_output_debug_string): Ditto.
(child_fetch_inferior_registers): Use do_* function to perform
operation.
(child_store_inferior_registers): Ditto.
(child_continue): Ditto.
(child_thread_alive): Ditto.
(cygwin_pid_to_str): Ditto.
(handle_load_dll): Reorganize, add first attempt at reading
dll names from attached processes. Change info messages to provide
more information when dll is already loaded.
(handle_exception): Changes mandated by new thread-aware structures.
(child_wait): Track thread creation/destruction. Handle cygwin
signals.
(child_create_inferior): Ditto.
(child_resume): Ditto.
(child_kill_inferior): Ditto. Close child process handle to avoid a
handle leak.
(child_ops): Fill out child_ops fields that deal with threads.
* config/i386/tm-cygwin32.h: Declare function and macro needed
for converting a cygwin "pid" to a string.
* config/i386/xm-cygwin32.h: define HAVE_SIGSETMASK as 0 since
sigsetmask is not defined in cygwin.
Thu Nov 5 08:38:18 1998 Christopher Faylor <cgf@cygnus.com>
* win32-nat.c: Remove obsolete PPC conditionals.

4
gdb/config/i386/tm-cygwin32.h
View File

@ -119,7 +119,9 @@ double_to_i387 PARAMS ((char *, char *));
#define NAMES_HAVE_UNDERSCORE
#define IN_SOLIB_CALL_TRAMPOLINE(pc, name) skip_trampoline_code (pc, name)
#define SKIP_TRAMPOLINE_CODE(pc) skip_trampoline_code (pc, 0)
extern CORE_ADDR skip_trampoline_code PARAMS ((CORE_ADDR pc, char *name));
extern char *cygwin_pid_to_str PARAMS ((int pid));
#define target_pid_to_str(PID) cygwin_pid_to_str (PID)

2
gdb/config/i386/xm-cygwin32.h
View File

@ -34,3 +34,5 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
/* Define this if source files use \r\n rather than just \n. */
#define CRLF_SOURCE_FILES
#define HAVE_SIGSETMASK 0

4032
gdb/doc/gdbint.texinfo
View File

File diff suppressed because it is too large Load Diff

8
gdb/top.c
View File

@ -1447,7 +1447,15 @@ gdb_readline (prrompt)
}
if (c == '\n')
#ifndef CRLF_SOURCE_FILES
break;
#else
{
if (input_index > 0 && result[input_index - 1] == '\r')
input_index--;
break;
}
#endif
result[input_index++] = c;
while (input_index >= result_size)

613
gdb/win32-nat.c
View File

@ -21,7 +21,7 @@
/* by Steve Chamberlain, sac@cygnus.com */
/* We assume we're being built with and will be used for cygwin32. */
/* We assume we're being built with and will be used for cygwin. */
#include "defs.h"
#include "frame.h" /* required by inferior.h */
@ -50,6 +50,10 @@
#include <sys/param.h>
#include <unistd.h>
/* The string sent by cygwin when it processes a signal.
FIXME: This should be in a cygwin include file. */
#define CYGWIN_SIGNAL_STRING "cygwin: signal"
#define CHECK(x) check (x, __FILE__,__LINE__)
#define DEBUG_EXEC(x) if (debug_exec) printf x
#define DEBUG_EVENTS(x) if (debug_events) printf x
@ -60,18 +64,32 @@
extern struct target_ops child_ops;
static void child_stop PARAMS ((void));
static int child_thread_alive PARAMS ((int));
/* The most recently read context. Inspect ContextFlags to see what
bits are valid. */
static int last_sig = 0; /* Set if a signal was received from the
debugged process */
static CONTEXT context;
/* Thread information structure used to track information that is
not available in gdb's thread structure. */
typedef struct thread_info_struct
{
struct thread_info_struct *next;
DWORD id;
HANDLE h;
char *name;
int suspend_count;
CONTEXT context;
} thread_info;
static thread_info thread_head = {NULL};
/* The process and thread handles for the above context. */
static HANDLE current_process;
static HANDLE current_thread;
static int current_process_id;
static int current_thread_id;
static DEBUG_EVENT current_event; /* The current debug event from
WaitForDebugEvent */
static HANDLE current_process_handle; /* Currently executing process */
static thread_info *current_thread; /* Info on currently selected thread */
static DWORD main_thread_id; /* Thread ID of the main thread */
/* Counts of things. */
static int exception_count = 0;
@ -98,40 +116,33 @@ static int debug_exceptions = 0; /* show target exceptions */
the other regs of the group, and then we copy the info in and set
out bit. */
struct regmappings
{
char *incontext;
int mask;
};
static const struct regmappings mappings[] =
#define context_offset(x) ((int)&(((CONTEXT *)NULL)->x))
static const int mappings[] =
{
#ifdef i386
{(char *) &context.Eax, CONTEXT_INTEGER},
{(char *) &context.Ecx, CONTEXT_INTEGER},
{(char *) &context.Edx, CONTEXT_INTEGER},
{(char *) &context.Ebx, CONTEXT_INTEGER},
{(char *) &context.Esp, CONTEXT_CONTROL},
{(char *) &context.Ebp, CONTEXT_CONTROL},
{(char *) &context.Esi, CONTEXT_INTEGER},
{(char *) &context.Edi, CONTEXT_INTEGER},
{(char *) &context.Eip, CONTEXT_CONTROL},
{(char *) &context.EFlags, CONTEXT_CONTROL},
{(char *) &context.SegCs, CONTEXT_SEGMENTS},
{(char *) &context.SegSs, CONTEXT_SEGMENTS},
{(char *) &context.SegDs, CONTEXT_SEGMENTS},
{(char *) &context.SegEs, CONTEXT_SEGMENTS},
{(char *) &context.SegFs, CONTEXT_SEGMENTS},
{(char *) &context.SegGs, CONTEXT_SEGMENTS},
{&context.FloatSave.RegisterArea[0 * 10], CONTEXT_FLOATING_POINT},
{&context.FloatSave.RegisterArea[1 * 10], CONTEXT_FLOATING_POINT},
{&context.FloatSave.RegisterArea[2 * 10], CONTEXT_FLOATING_POINT},
{&context.FloatSave.RegisterArea[3 * 10], CONTEXT_FLOATING_POINT},
{&context.FloatSave.RegisterArea[4 * 10], CONTEXT_FLOATING_POINT},
{&context.FloatSave.RegisterArea[5 * 10], CONTEXT_FLOATING_POINT},
{&context.FloatSave.RegisterArea[6 * 10], CONTEXT_FLOATING_POINT},
{&context.FloatSave.RegisterArea[7 * 10], CONTEXT_FLOATING_POINT},
#endif
context_offset(Eax),
context_offset(Ecx),
context_offset(Edx),
context_offset(Ebx),
context_offset(Esp),
context_offset(Ebp),
context_offset(Esi),
context_offset(Edi),
context_offset(Eip),
context_offset(EFlags),
context_offset(SegCs),
context_offset(SegSs),
context_offset(SegDs),
context_offset(SegEs),
context_offset(SegFs),
context_offset(SegGs),
context_offset(FloatSave.RegisterArea[0 * 10]),
context_offset(FloatSave.RegisterArea[1 * 10]),
context_offset(FloatSave.RegisterArea[2 * 10]),
context_offset(FloatSave.RegisterArea[3 * 10]),
context_offset(FloatSave.RegisterArea[4 * 10]),
context_offset(FloatSave.RegisterArea[5 * 10]),
context_offset(FloatSave.RegisterArea[6 * 10]),
context_offset(FloatSave.RegisterArea[7 * 10]),
};
/* This vector maps the target's idea of an exception (extracted
@ -153,6 +164,94 @@ static const struct xlate_exception
{EXCEPTION_SINGLE_STEP, TARGET_SIGNAL_TRAP},
{-1, -1}};
/* Find a thread record given a thread id.
If get_context then also retrieve the context for this
thread. */
static thread_info *
thread_rec (DWORD id, int get_context)
{
thread_info *th;
for (th = &thread_head; (th = th->next) != NULL; )
if (th->id == id)
{
if (!th->suspend_count && get_context)
{
if (get_context > 0)
th->suspend_count = SuspendThread (th->h) + 1;
else if (get_context < 0)
th->suspend_count = -1;
th->context.ContextFlags = CONTEXT_DEBUGGER;
GetThreadContext (th->h, &th->context);
}
return th;
}
return NULL;
}
/* Add a thread to the thread list */
static thread_info *
child_add_thread(DWORD id, HANDLE h)
{
thread_info *th;
if ((th = thread_rec (id, FALSE)))
return th;
th = (thread_info *) xmalloc (sizeof (*th));
memset(th, 0, sizeof (*th));
th->id = id;
th->h = h;
th->next = thread_head.next;
thread_head.next = th;
add_thread (id);
return th;
}
/* Clear out any old thread list and reintialize it to a
pristine state. */
static void
child_init_thread_list ()
{
thread_info *th = &thread_head;
DEBUG_EVENTS (("gdb: child_init_thread_list\n"));
init_thread_list ();
while (th->next != NULL)
{
thread_info *here = th->next;
th->next = here->next;
(void) CloseHandle (here->h);
free (here);
}
}
/* Delete a thread from the list of threads */
static void
child_delete_thread (DWORD id)
{
thread_info *th;
if (info_verbose)
printf_unfiltered ("[Deleting %s]\n", target_pid_to_str (id));
delete_thread (id);
for (th = &thread_head;
th->next != NULL && th->next->id != id;
th = th->next)
continue;
if (th->next != NULL)
{
thread_info *here = th->next;
th->next = here->next;
CloseHandle (here->h);
free (here);
}
}
static void
check (BOOL ok, const char *file, int line)
{
@ -161,64 +260,103 @@ check (BOOL ok, const char *file, int line)
}
static void
child_fetch_inferior_registers (int r)
do_child_fetch_inferior_registers (int r)
{
if (r < 0)
{
for (r = 0; r < NUM_REGS; r++)
child_fetch_inferior_registers (r);
}
if (r >= 0)
supply_register (r, ((char *) &current_thread->context) + mappings[r]);
else
{
supply_register (r, mappings[r].incontext);
for (r = 0; r < NUM_REGS; r++)
do_child_fetch_inferior_registers (r);
}
}
static void
child_store_inferior_registers (int r)
child_fetch_inferior_registers (int r)
{
if (r < 0)
{
for (r = 0; r < NUM_REGS; r++)
child_store_inferior_registers (r);
}
current_thread = thread_rec (inferior_pid, TRUE);
do_child_fetch_inferior_registers (r);
}
static void
do_child_store_inferior_registers (int r)
{
if (r >= 0)
read_register_gen (r, ((char *) &current_thread->context) + mappings[r]);
else
{
read_register_gen (r, mappings[r].incontext);
for (r = 0; r < NUM_REGS; r++)
do_child_store_inferior_registers (r);
}
}
/* Store a new register value into the current thread context */
static void
child_store_inferior_registers (int r)
{
current_thread = thread_rec (inferior_pid, TRUE);
do_child_store_inferior_registers (r);
}
/* Wait for child to do something. Return pid of child, or -1 in case
of error; store status through argument pointer OURSTATUS. */
static int
handle_load_dll (char *eventp)
handle_load_dll (char *dummy)
{
DEBUG_EVENT * event = (DEBUG_EVENT *)eventp;
LOAD_DLL_DEBUG_INFO * event = &current_event.u.LoadDll;
DWORD dll_name_ptr;
DWORD done;
char dll_buf[MAX_PATH + 1];
char *p, *dll_name = NULL, *dll_basename;
struct objfile *objfile;
MEMORY_BASIC_INFORMATION minfo;
ReadProcessMemory (current_process,
(DWORD) event->u.LoadDll.lpImageName,
dll_buf[0] = dll_buf[sizeof(dll_buf) - 1] = '\0';
/* The following code attempts to find the name of the dll by reading the
name from the processes memory. Unfortunately it doesn't work right.
Doing this the "right way" for Windows is very difficult. FIXME */
#ifdef DOESNT_WORK
memset (&minfo, 0, sizeof minfo);
if (VirtualQueryEx (current_process_handle, (LPCVOID) event->lpBaseOfDll,
&minfo, sizeof(minfo)) && minfo.BaseAddress) {
DWORD len;
IMAGE_DOS_HEADER *hmm0 = (IMAGE_DOS_HEADER *) minfo.BaseAddress;
HMODULE hmm = (HMODULE) (((DWORD) hmm0) + hmm0->e_lfanew);
if ((len = GetModuleFileName (hmm, dll_buf, MAX_PATH)))
{
dll_name = dll_buf;
dll_name[len] = '\0';
}
}
#endif
/* Attempt to read the name of the dll that was detected.
This is documented to work only when actively debugging
a program. It will not work for attached processes. */
if (dll_name == NULL || *dll_name == '\0')
{
int size = event->fUnicode ? sizeof (WCHAR) : sizeof (char);
int len = 0;
char b[2];
ReadProcessMemory (current_process_handle,
(LPCVOID) event->lpImageName,
(char *) &dll_name_ptr,
sizeof (dll_name_ptr), &done);
/* See if we could read the address of a string, and that the
address isn't null. */
if (done == sizeof (dll_name_ptr) && dll_name_ptr)
{
char *dll_name, *dll_basename;
struct objfile *objfile;
char unix_dll_name[MAX_PATH];
int size = event->u.LoadDll.fUnicode ? sizeof (WCHAR) : sizeof (char);
int len = 0;
char b[2];
if (done != sizeof (dll_name_ptr) || !dll_name_ptr)
return 1;
do
{
ReadProcessMemory (current_process,
dll_name_ptr + len * size,
ReadProcessMemory (current_process_handle,
(LPCVOID) (dll_name_ptr + len * size),
&b,
size,
&done);
@ -228,11 +366,11 @@ handle_load_dll (char *eventp)
dll_name = alloca (len);
if (event->u.LoadDll.fUnicode)
if (event->fUnicode)
{
WCHAR *unicode_dll_name = (WCHAR *) alloca (len * sizeof (WCHAR));
ReadProcessMemory (current_process,
dll_name_ptr,
ReadProcessMemory (current_process_handle,
(LPCVOID) dll_name_ptr,
unicode_dll_name,
len * sizeof (WCHAR),
&done);
@ -243,211 +381,273 @@ handle_load_dll (char *eventp)
}
else
{
ReadProcessMemory (current_process,
dll_name_ptr,
ReadProcessMemory (current_process_handle,
(LPCVOID) dll_name_ptr,
dll_name,
len,
&done);
}
}
/* FIXME: Can we delete this call? */
cygwin32_conv_to_posix_path (dll_name, unix_dll_name);
if (!dll_name)
return 1;
while ((p = strchr (dll_name, '\\')))
*p = '/';
/* FIXME!! It would be nice to define one symbol which pointed to the
front of the dll if we can't find any symbols. */
if (!(dll_basename = strrchr(dll_name, '\\')))
dll_basename = strrchr(dll_name, '/');
if (!(dll_basename = strrchr(dll_name, '/')))
dll_basename = dll_name;
else
dll_basename++;
ALL_OBJFILES(objfile)
{
char *objfile_basename;
if (!(objfile_basename = strrchr(objfile->name, '\\')))
objfile_basename = strrchr(objfile->name, '/');
if (dll_basename && objfile_basename &&
strcmp(dll_basename+1, objfile_basename+1) == 0)
if (objfile_basename &&
strcmp(dll_basename, objfile_basename + 1) == 0)
{
printf_unfiltered ("%s (symbols previously loaded)\n",
dll_basename + 1);
return 1;
printf_unfiltered ("%x:%s (symbols previously loaded)\n",
event->lpBaseOfDll, dll_name);
goto out;
}
}
context.ContextFlags = CONTEXT_FULL | CONTEXT_FLOATING_POINT;
GetThreadContext (current_thread, &context);
/* The symbols in a dll are offset by 0x1000, which is the
the offset from 0 of the first byte in an image - because
of the file header and the section alignment.
FIXME: Is this the real reason that we need the 0x1000 ? */
printf_unfiltered ("%x:%s", event->lpBaseOfDll, dll_name);
symbol_file_add (dll_name, 0, (int) event->lpBaseOfDll + 0x1000, 0, 0, 0);
printf_unfiltered ("\n");
symbol_file_add (unix_dll_name, 0,
(int) event->u.LoadDll.lpBaseOfDll + 0x1000, 0, 0, 0);
printf_unfiltered ("%x:%s\n", event->u.LoadDll.lpBaseOfDll,
unix_dll_name);
}
out:
return 1;
}
/* Handle DEBUG_STRING output from child process.
Cygwin prepends its messages with a "cygwin:". Interpret this as
a Cygwin signal. Otherwise just print the string as a warning. */
static int
handle_output_debug_string (struct target_waitstatus *ourstatus)
{
char *s;
int gotasig = FALSE;
if (!target_read_string
((CORE_ADDR) current_event.u.DebugString.lpDebugStringData, &s, 1024, 0)
|| !s || !*s)
return gotasig;
if (strncmp(s, CYGWIN_SIGNAL_STRING, sizeof(CYGWIN_SIGNAL_STRING) - 1))
{
warning (s);
}
else
{
char *p;
/*last_sig = */strtol(s + sizeof(CYGWIN_SIGNAL_STRING) - 1, &p, 0);
if (gotasig = (ourstatus->value.sig = target_signal_from_host (last_sig)))
ourstatus->kind = TARGET_WAITKIND_STOPPED;
}
free (s);
return gotasig;
}
static int
handle_exception (DEBUG_EVENT * event, struct target_waitstatus *ourstatus)
handle_exception (struct target_waitstatus *ourstatus)
{
int i;
int done = 0;
thread_info *th;
ourstatus->kind = TARGET_WAITKIND_STOPPED;
/* Record the context of the current thread */
th = thread_rec (current_event.dwThreadId, -1);
switch (event->u.Exception.ExceptionRecord.ExceptionCode)
switch (current_event.u.Exception.ExceptionRecord.ExceptionCode)
{
case EXCEPTION_ACCESS_VIOLATION:
DEBUG_EXCEPT (("gdb: Target exception ACCESS_VIOLATION at 0x%08x\n",
event->u.Exception.ExceptionRecord.ExceptionAddress));
current_event.u.Exception.ExceptionRecord.ExceptionAddress));
ourstatus->value.sig = TARGET_SIGNAL_SEGV;
break;
case STATUS_STACK_OVERFLOW:
DEBUG_EXCEPT (("gdb: Target exception STACK_OVERFLOW at 0x%08x\n",
event->u.Exception.ExceptionRecord.ExceptionAddress));
current_event.u.Exception.ExceptionRecord.ExceptionAddress));
ourstatus->value.sig = TARGET_SIGNAL_SEGV;
break;
case EXCEPTION_BREAKPOINT:
DEBUG_EXCEPT (("gdb: Target exception BREAKPOINT at 0x%08x\n",
event->u.Exception.ExceptionRecord.ExceptionAddress));
current_event.u.Exception.ExceptionRecord.ExceptionAddress));
ourstatus->value.sig = TARGET_SIGNAL_TRAP;
break;
case DBG_CONTROL_C:
DEBUG_EXCEPT (("gdb: Target exception CONTROL_C at 0x%08x\n",
event->u.Exception.ExceptionRecord.ExceptionAddress));
current_event.u.Exception.ExceptionRecord.ExceptionAddress));
ourstatus->value.sig = TARGET_SIGNAL_INT;
/* User typed CTRL-C. Continue with this status */
last_sig = SIGINT; /* FIXME - should check pass state */
break;
case EXCEPTION_SINGLE_STEP:
DEBUG_EXCEPT (("gdb: Target exception SINGLE_STEP at 0x%08x\n",
event->u.Exception.ExceptionRecord.ExceptionAddress));
current_event.u.Exception.ExceptionRecord.ExceptionAddress));
ourstatus->value.sig = TARGET_SIGNAL_TRAP;
break;
default:
/* This may be a structured exception handling exception. In
that case, we want to let the program try to handle it, and
only break if we see the exception a second time. */
if (event->u.Exception.dwFirstChance)
if (current_event.u.Exception.dwFirstChance)
return 0;
printf_unfiltered ("gdb: unknown target exception 0x%08x at 0x%08x\n",
event->u.Exception.ExceptionRecord.ExceptionCode,
event->u.Exception.ExceptionRecord.ExceptionAddress);
current_event.u.Exception.ExceptionRecord.ExceptionCode,
current_event.u.Exception.ExceptionRecord.ExceptionAddress);
ourstatus->value.sig = TARGET_SIGNAL_UNKNOWN;
break;
}
context.ContextFlags = CONTEXT_FULL | CONTEXT_FLOATING_POINT;
GetThreadContext (current_thread, &context);
exception_count++;
return 1;
}
/* Resume all artificially suspended threads if we are continuing
execution */
static BOOL
child_continue (DWORD continue_status, int id)
{
int i;
thread_info *th;
BOOL res;
DEBUG_EVENTS (("ContinueDebugEvent (cpid=%d, ctid=%d, DBG_CONTINUE);\n",
current_event.dwProcessId, current_event.dwThreadId));
if (res = ContinueDebugEvent (current_event.dwProcessId,
current_event.dwThreadId,
continue_status))
for (th = &thread_head; (th = th->next) != NULL; )
if (((id == -1) || (id == th->id)) && th->suspend_count)
{
for (i = 0; i < th->suspend_count; i++)
(void) ResumeThread (th->h);
th->suspend_count = 0;
}
return res;
}
static int
child_wait (int pid, struct target_waitstatus *ourstatus)
{
/* We loop when we get a non-standard exception rather than return
with a SPURIOUS because resume can try and step or modify things,
which needs a current_thread. But some of these exceptions mark
which needs a current_thread->h. But some of these exceptions mark
the birth or death of threads, which mean that the current thread
isn't necessarily what you think it is. */
while (1)
{
DEBUG_EVENT event;
BOOL t = WaitForDebugEvent (&event, INFINITE);
char *p;
DWORD continue_status;
BOOL t = WaitForDebugEvent (&current_event, INFINITE);
char *p;
thread_info *th;
int sig;
event_count++;
current_thread_id = event.dwThreadId;
current_process_id = event.dwProcessId;
continue_status = DBG_CONTINUE;
switch (event.dwDebugEventCode)
switch (current_event.dwDebugEventCode)
{
case CREATE_THREAD_DEBUG_EVENT:
DEBUG_EVENTS (("gdb: kernel event for pid=%d tid=%d code=%s)\n",
event.dwProcessId, event.dwThreadId,
DEBUG_EVENTS (("gdb: kernel event for pid=%d tid=%x code=%s)\n",
current_event.dwProcessId, current_event.dwThreadId,
"CREATE_THREAD_DEBUG_EVENT"));
/* Record the existence of this thread */
child_add_thread (current_event.dwThreadId,
current_event.u.CreateThread.hThread);
if (info_verbose)
printf_unfiltered ("[New %s]\n",
target_pid_to_str (current_event.dwThreadId));
break;
case EXIT_THREAD_DEBUG_EVENT:
DEBUG_EVENTS (("gdb: kernel event for pid=%d tid=%d code=%s)\n",
event.dwProcessId, event.dwThreadId,
current_event.dwProcessId, current_event.dwThreadId,
"EXIT_THREAD_DEBUG_EVENT"));
child_delete_thread (current_event.dwThreadId);
break;
case CREATE_PROCESS_DEBUG_EVENT:
DEBUG_EVENTS (("gdb: kernel event for pid=%d tid=%d code=%s)\n",
event.dwProcessId, event.dwThreadId,
current_event.dwProcessId, current_event.dwThreadId,
"CREATE_PROCESS_DEBUG_EVENT"));
current_process_handle = current_event.u.CreateProcessInfo.hProcess;
main_thread_id = inferior_pid = current_event.dwThreadId;
/* Add the main thread */
current_thread = child_add_thread (inferior_pid,
current_event.u.CreateProcessInfo.hThread);
break;
case EXIT_PROCESS_DEBUG_EVENT:
DEBUG_EVENTS (("gdb: kernel event for pid=%d tid=%d code=%s)\n",
event.dwProcessId, event.dwThreadId,
current_event.dwProcessId, current_event.dwThreadId,
"EXIT_PROCESS_DEBUG_EVENT"));
ourstatus->kind = TARGET_WAITKIND_EXITED;
ourstatus->value.integer = event.u.ExitProcess.dwExitCode;
CloseHandle (current_process);
CloseHandle (current_thread);
return current_process_id;
ourstatus->value.integer = current_event.u.ExitProcess.dwExitCode;
CloseHandle (current_process_handle);
return current_event.dwProcessId;
break;
case LOAD_DLL_DEBUG_EVENT:
DEBUG_EVENTS (("gdb: kernel event for pid=%d tid=%d code=%s)\n",
event.dwProcessId, event.dwThreadId,
current_event.dwProcessId, current_event.dwThreadId,
"LOAD_DLL_DEBUG_EVENT"));
catch_errors (handle_load_dll,
(char*) &event,
"\n[failed reading symbols from DLL]\n",
RETURN_MASK_ALL);
catch_errors (handle_load_dll, NULL, "", RETURN_MASK_ALL);
registers_changed(); /* mark all regs invalid */
break;
case UNLOAD_DLL_DEBUG_EVENT:
DEBUG_EVENTS (("gdb: kernel event for pid=%d tid=%d code=%s)\n",
event.dwProcessId, event.dwThreadId,
current_event.dwProcessId, current_event.dwThreadId,
"UNLOAD_DLL_DEBUG_EVENT"));
break; /* FIXME: don't know what to do here */
case EXCEPTION_DEBUG_EVENT:
DEBUG_EVENTS (("gdb: kernel event for pid=%d tid=%d code=%s)\n",
event.dwProcessId, event.dwThreadId,
current_event.dwProcessId, current_event.dwThreadId,
"EXCEPTION_DEBUG_EVENT"));
if (handle_exception (&event, ourstatus))
return current_process_id;
if (handle_exception (ourstatus))
return current_event.dwThreadId;
continue_status = DBG_EXCEPTION_NOT_HANDLED;
break;
case OUTPUT_DEBUG_STRING_EVENT: /* message from the kernel */
DEBUG_EVENTS (("gdb: kernel event for pid=%d tid=%d code=%s)\n",
event.dwProcessId, event.dwThreadId,
current_event.dwProcessId, current_event.dwThreadId,
"OUTPUT_DEBUG_STRING_EVENT"));
if (target_read_string
((CORE_ADDR) event.u.DebugString.lpDebugStringData,
&p, 1024, 0) && p && *p)
{
warning(p);
free(p);
}
if (handle_output_debug_string (ourstatus))
return main_thread_id;
break;
default:
printf_unfiltered ("gdb: kernel event for pid=%d tid=%d\n",
event.dwProcessId, event.dwThreadId);
current_event.dwProcessId,
current_event.dwThreadId);
printf_unfiltered (" unknown event code %d\n",
event.dwDebugEventCode);
current_event.dwDebugEventCode);
break;
}
DEBUG_EVENTS (("ContinueDebugEvent (cpid=%d, ctid=%d, DBG_CONTINUE);\n",
current_process_id, current_thread_id));
CHECK (ContinueDebugEvent (current_process_id,
current_thread_id,
continue_status));
CHECK (child_continue (continue_status, -1));
}
}
@ -463,9 +663,9 @@ child_attach (args, from_tty)
if (!args)
error_no_arg ("process-id to attach");
current_process_id = strtoul (args, 0, 0);
current_event.dwProcessId = strtoul (args, 0, 0);
ok = DebugActiveProcess (current_process_id);
ok = DebugActiveProcess (current_event.dwProcessId);
if (!ok)
error ("Can't attach to process.");
@ -479,15 +679,14 @@ child_attach (args, from_tty)
if (exec_file)
printf_unfiltered ("Attaching to program `%s', %s\n", exec_file,
target_pid_to_str (current_process_id));
target_pid_to_str (current_event.dwProcessId));
else
printf_unfiltered ("Attaching to %s\n",
target_pid_to_str (current_process_id));
target_pid_to_str (current_event.dwProcessId));
gdb_flush (gdb_stdout);
}
inferior_pid = current_process_id;
push_target (&child_ops);
}
@ -560,7 +759,7 @@ child_create_inferior (exec_file, allargs, env)
memset (&si, 0, sizeof (si));
si.cb = sizeof (si);
cygwin32_conv_to_win32_path (exec_file, real_path);
cygwin_conv_to_win32_path (exec_file, real_path);
flags = DEBUG_ONLY_THIS_PROCESS;
@ -606,9 +805,9 @@ child_create_inferior (exec_file, allargs, env)
len = strlen (conv_path_names[j]);
if (strncmp (conv_path_names[j], env[i], len) == 0)
{
if (cygwin32_posix_path_list_p (env[i] + len))
if (cygwin_posix_path_list_p (env[i] + len))
envlen += len
+ cygwin32_posix_to_win32_path_list_buf_size (env[i] + len);
+ cygwin_posix_to_win32_path_list_buf_size (env[i] + len);
else
envlen += strlen (env[i]) + 1;
break;
@ -630,10 +829,10 @@ child_create_inferior (exec_file, allargs, env)
len = strlen (conv_path_names[j]);
if (strncmp (conv_path_names[j], env[i], len) == 0)
{
if (cygwin32_posix_path_list_p (env[i] + len))
if (cygwin_posix_path_list_p (env[i] + len))
{
memcpy (temp, env[i], len);
cygwin32_posix_to_win32_path_list (env[i] + len, temp + len);
cygwin_posix_to_win32_path_list (env[i] + len, temp + len);
}
else
strcpy (temp, env[i]);
@ -666,13 +865,12 @@ child_create_inferior (exec_file, allargs, env)
exception_count = 0;
event_count = 0;
inferior_pid = pi.dwProcessId;
current_process = pi.hProcess;
current_thread = pi.hThread;
current_process_id = pi.dwProcessId;
current_thread_id = pi.dwThreadId;
current_process_handle = pi.hProcess;
current_event.dwProcessId = pi.dwProcessId;
memset (&current_event, 0, sizeof (current_event));
inferior_pid = current_event.dwThreadId = pi.dwThreadId;
push_target (&child_ops);
init_thread_list ();
child_init_thread_list ();
init_wait_for_inferior ();
clear_proceed_status ();
target_terminal_init ();
@ -687,9 +885,7 @@ child_create_inferior (exec_file, allargs, env)
static void
child_mourn_inferior ()
{
(void) ContinueDebugEvent (current_process_id,
current_thread_id,
DBG_CONTINUE);
(void) child_continue (DBG_CONTINUE, -1);
unpush_target (&child_ops);
generic_mourn_inferior ();
}
@ -714,14 +910,16 @@ child_xfer_memory (CORE_ADDR memaddr, char *our, int len,
{
DEBUG_MEM (("gdb: write target memory, %d bytes at 0x%08x\n",
len, memaddr));
WriteProcessMemory (current_process, memaddr, our, len, &done);
FlushInstructionCache (current_process, memaddr, len);
WriteProcessMemory (current_process_handle, (LPVOID) memaddr, our,
len, &done);
FlushInstructionCache (current_process_handle, (LPCVOID) memaddr, len);
}
else
{
DEBUG_MEM (("gdb: read target memory, %d bytes at 0x%08x\n",
len, memaddr));
ReadProcessMemory (current_process, memaddr, our, len, &done);
ReadProcessMemory (current_process_handle, (LPCVOID) memaddr, our, len,
&done);
}
return done;
}
@ -729,59 +927,60 @@ child_xfer_memory (CORE_ADDR memaddr, char *our, int len,
void
child_kill_inferior (void)
{
CHECK (TerminateProcess (current_process, 0));
CHECK (TerminateProcess (current_process_handle, 0));
for (;;)
{
DEBUG_EVENT event;
if (!ContinueDebugEvent (current_process_id,
current_thread_id,
DBG_CONTINUE))
if (!child_continue (DBG_CONTINUE, -1))
break;
if (!WaitForDebugEvent (&event, INFINITE))
if (!WaitForDebugEvent (&current_event, INFINITE))
break;
current_thread_id = event.dwThreadId;
current_process_id = event.dwProcessId;
if (event.dwDebugEventCode == EXIT_PROCESS_DEBUG_EVENT)
if (current_event.dwDebugEventCode == EXIT_PROCESS_DEBUG_EVENT)
break;
}
CHECK (CloseHandle (current_process));
CHECK (CloseHandle (current_thread));
CHECK (CloseHandle (current_process_handle));
/* this may fail in an attached process so don't check. */
(void) CloseHandle (current_thread->h);
target_mourn_inferior(); /* or just child_mourn_inferior? */
}
void
child_resume (int pid, int step, enum target_signal signal)
child_resume (int pid, int step, enum target_signal sig)
{
DEBUG_EXEC (("gdb: child_resume (pid=%d, step=%d, signal=%d);\n",
pid, step, signal));
int i;
thread_info *th;
DWORD continue_status = last_sig > 0 && last_sig < NSIG ?
DBG_EXCEPTION_NOT_HANDLED : DBG_CONTINUE;
DEBUG_EXEC (("gdb: child_resume (pid=%d, step=%d, sig=%d);\n",
pid, step, sig));
/* Get context for currently selected thread */
th = thread_rec (current_event.dwThreadId, FALSE);
if (step)
{
#ifdef i386
/* Single step by setting t bit */
child_fetch_inferior_registers (PS_REGNUM);
context.EFlags |= FLAG_TRACE_BIT;
th->context.EFlags |= FLAG_TRACE_BIT;
#endif
}
if (context.ContextFlags)
if (th->context.ContextFlags)
{
CHECK (SetThreadContext (current_thread, &context));
context.ContextFlags = 0;
CHECK (SetThreadContext (th->h, &th->context));
th->context.ContextFlags = 0;
}
if (signal)
{
fprintf_unfiltered (gdb_stderr, "Can't send signals to the child.\n");
}
/* Allow continuing with the same signal that interrupted us.
Otherwise complain. */
if (sig && sig != last_sig)
fprintf_unfiltered (gdb_stderr, "Can't send signals to the child. signal %d\n", sig);
DEBUG_EVENTS (("gdb: ContinueDebugEvent (cpid=%d, ctid=%d, DBG_CONTINUE);\n",
current_process_id, current_thread_id));
CHECK (ContinueDebugEvent (current_process_id,
current_thread_id,
DBG_CONTINUE));
last_sig = 0;
child_continue (continue_status, pid);
}
static void
@ -834,7 +1033,7 @@ static void init_child_ops(void)
child_ops.to_mourn_inferior = child_mourn_inferior;
child_ops.to_can_run = child_can_run;
child_ops.to_notice_signals = 0;
child_ops.to_thread_alive = 0;
child_ops.to_thread_alive = child_thread_alive;
child_ops.to_stop = child_stop;
child_ops.to_stratum = process_stratum;
child_ops.DONT_USE = 0;
@ -898,3 +1097,25 @@ _initialize_inftarg ()
add_target (&child_ops);
}
/* Determine if the thread referenced by "pid" is alive
by "polling" it. If WaitForSingleObject returns WAIT_OBJECT_0
it means that the pid has died. Otherwise it is assumed to be alive. */
static int
child_thread_alive (int pid)
{
return WaitForSingleObject(thread_rec (pid, FALSE)->h, 0) == WAIT_OBJECT_0 ?
FALSE : TRUE;
}
/* Convert pid to printable format. */
char *
cygwin_pid_to_str (int pid)
{
static char buf[80];
if (pid == current_event.dwProcessId)
sprintf (buf, "process %d", pid);
else
sprintf (buf, "thread %d.0x%x", current_event.dwProcessId, pid);
return buf;
}