Toolchain/binutils-gdb
1
0
Fork 0
forked from Imagelibrary/binutils-gdb
Code Pull Requests Activity

* win32-nat.c (handle_exception): Return a value indicating

Browse Source 
whether the exception was handled.  Don't handle random exceptions
	the first time around, so that structured exception handling
	works.
	(child_wait): Check the return value of handle_exception.  Set the
	continue_status argument to ContinueDebugEvent accordingly.
This commit is contained in:
Ian Lance Taylor
1997-08-18 21:31:51 +00:00
parent def47b537e
commit 36339ecd2b
2 changed files with 25 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
gdb/ChangeLog
View File

@@ -1,3 +1,12 @@
Mon Aug 18 17:29:54 1997 Ian Lance Taylor <ian@cygnus.com>
* win32-nat.c (handle_exception): Return a value indicating
whether the exception was handled. Don't handle random exceptions
the first time around, so that structured exception handling
works.
(child_wait): Check the return value of handle_exception. Set the
continue_status argument to ContinueDebugEvent accordingly.
start-sanitize-v850e start-sanitize-v850e
Mon Aug 18 11:14:15 1997 Nick Clifton <nickc@cygnus.com> Mon Aug 18 11:14:15 1997 Nick Clifton <nickc@cygnus.com>

20
gdb/win32-nat.c
View File

@@ -375,7 +375,7 @@ handle_load_dll (char *eventp)
} }
static void static int
handle_exception (DEBUG_EVENT * event, struct target_waitstatus *ourstatus) handle_exception (DEBUG_EVENT * event, struct target_waitstatus *ourstatus)
{ {
int i; int i;
@@ -411,6 +411,12 @@ handle_exception (DEBUG_EVENT * event, struct target_waitstatus *ourstatus)
ourstatus->value.sig = TARGET_SIGNAL_TRAP; ourstatus->value.sig = TARGET_SIGNAL_TRAP;
break; break;
default: 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)
return 0;
printf_unfiltered ("gdb: unknown target exception 0x%08x at 0x%08x\n", printf_unfiltered ("gdb: unknown target exception 0x%08x at 0x%08x\n",
event->u.Exception.ExceptionRecord.ExceptionCode, event->u.Exception.ExceptionRecord.ExceptionCode,
event->u.Exception.ExceptionRecord.ExceptionAddress); event->u.Exception.ExceptionRecord.ExceptionAddress);
@@ -420,6 +426,7 @@ handle_exception (DEBUG_EVENT * event, struct target_waitstatus *ourstatus)
context.ContextFlags = CONTEXT_FULL | CONTEXT_FLOATING_POINT; context.ContextFlags = CONTEXT_FULL | CONTEXT_FLOATING_POINT;
GetThreadContext (current_thread, &context); GetThreadContext (current_thread, &context);
exception_count++; exception_count++;
return 1;
} }
static int static int
@@ -436,12 +443,15 @@ child_wait (int pid, struct target_waitstatus *ourstatus)
DEBUG_EVENT event; DEBUG_EVENT event;
BOOL t = WaitForDebugEvent (&event, INFINITE); BOOL t = WaitForDebugEvent (&event, INFINITE);
char *p; char *p;
DWORD continue_status;
event_count++; event_count++;
current_thread_id = event.dwThreadId; current_thread_id = event.dwThreadId;
current_process_id = event.dwProcessId; current_process_id = event.dwProcessId;
continue_status = DBG_CONTINUE;
switch (event.dwDebugEventCode) switch (event.dwDebugEventCode)
{ {
case CREATE_THREAD_DEBUG_EVENT: case CREATE_THREAD_DEBUG_EVENT:
@@ -490,8 +500,10 @@ child_wait (int pid, struct target_waitstatus *ourstatus)
DEBUG_EVENTS (("gdb: kernel event for pid=%d tid=%d code=%s)\n", DEBUG_EVENTS (("gdb: kernel event for pid=%d tid=%d code=%s)\n",
event.dwProcessId, event.dwThreadId, event.dwProcessId, event.dwThreadId,
"EXCEPTION_DEBUG_EVENT")); "EXCEPTION_DEBUG_EVENT"));
handle_exception (&event, ourstatus); if (handle_exception (&event, ourstatus))
return current_process_id; return current_process_id;
continue_status = DBG_EXCEPTION_NOT_HANDLED;
break;
case OUTPUT_DEBUG_STRING_EVENT: /* message from the kernel */ case OUTPUT_DEBUG_STRING_EVENT: /* message from the kernel */
DEBUG_EVENTS (("gdb: kernel event for pid=%d tid=%d code=%s)\n", DEBUG_EVENTS (("gdb: kernel event for pid=%d tid=%d code=%s)\n",
@@ -516,7 +528,7 @@ child_wait (int pid, struct target_waitstatus *ourstatus)
current_process_id, current_thread_id)); current_process_id, current_thread_id));
CHECK (ContinueDebugEvent (current_process_id, CHECK (ContinueDebugEvent (current_process_id,
current_thread_id, current_thread_id,
DBG_CONTINUE)); continue_status));
} }
} }