system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-16 01:59:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use exceptions instead of ctx_debug_call.

Browse source
This commit is contained in:
Alexandre Julliard 1999-06-18 18:25:59 +00:00
parent 55e1af93b5
commit 94eedf1df0
1 changed files with 28 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
loader/dos/dosvm.c
View file

@ -30,6 +30,7 @@
#include "ldt.h" #include "ldt.h"
#include "dosexe.h" #include "dosexe.h"
#include "dosmod.h" #include "dosmod.h"
#include "stackframe.h"
#include "debugtools.h" #include "debugtools.h"
DECLARE_DEBUG_CHANNEL(int) DECLARE_DEBUG_CHANNEL(int)
@ -49,6 +50,27 @@ DECLARE_DEBUG_CHANNEL(relay)
#undef TRY_PICRETURN #undef TRY_PICRETURN
static void do_exception( int signal, CONTEXT *context )
{
EXCEPTION_RECORD rec;
extern void WINAPI REGS_FUNC(RtlRaiseException)( EXCEPTION_RECORD *rec,
CONTEXT *context );
if ((signal == SIGTRAP) || (signal == SIGHUP))
{
rec.ExceptionCode = EXCEPTION_BREAKPOINT;
rec.ExceptionFlags = EXCEPTION_CONTINUABLE;
}
else
{
rec.ExceptionCode = EXCEPTION_ILLEGAL_INSTRUCTION; /* generic error */
rec.ExceptionFlags = EH_NONCONTINUABLE;
}
rec.ExceptionRecord = NULL;
rec.ExceptionAddress = (LPVOID)EIP_reg(context);
rec.NumberParameters = 0;
REGS_FUNC(RtlRaiseException)( &rec, context );
}
static void DOSVM_Dump( LPDOSTASK lpDosTask, int fn, int sig, static void DOSVM_Dump( LPDOSTASK lpDosTask, int fn, int sig,
struct vm86plus_struct*VM86 ) struct vm86plus_struct*VM86 )
{ {
@ -219,8 +241,7 @@ static int DOSVM_Process( LPDOSTASK lpDosTask, int fn, int sig,
#define CP(x,y) y##_sig(&sigcontext) = VM86->regs.x #define CP(x,y) y##_sig(&sigcontext) = VM86->regs.x
CV; CV;
#undef CP #undef CP
if (fnINSTR_EmulateInstruction) ret=fnINSTR_EmulateInstruction(&sigcontext); ret=INSTR_EmulateInstruction(&sigcontext);
else ERR_(module)("fnINSTR_EmulateInstruction is not initialized!\n");
#define CP(x,y) VM86->regs.x = y##_sig(&sigcontext) #define CP(x,y) VM86->regs.x = y##_sig(&sigcontext)
CV; CV;
#undef CP #undef CP
@ -259,12 +280,9 @@ static int DOSVM_Process( LPDOSTASK lpDosTask, int fn, int sig,
CLR_PEND(&context); CLR_PEND(&context);
} }
if (sig==SIGUSR2) lpDosTask->sig_sent--; if (sig==SIGUSR2) lpDosTask->sig_sent--;
} else }
if (sig==SIGHUP) { else if ((sig==SIGHUP) || (sig==SIGILL) || (sig==SIGSEGV)) {
if (ctx_debug_call) ctx_debug_call(SIGTRAP,&context); do_exception( sig, &context );
} else
if ((sig==SIGILL)||(sig==SIGSEGV)) {
if (ctx_debug_call) ctx_debug_call(SIGILL,&context);
} else { } else {
DOSVM_Dump(lpDosTask,fn,sig,VM86); DOSVM_Dump(lpDosTask,fn,sig,VM86);
ret=-1; ret=-1;
@ -272,7 +290,7 @@ static int DOSVM_Process( LPDOSTASK lpDosTask, int fn, int sig,
break; break;
case VM86_UNKNOWN: /* unhandled GPF */ case VM86_UNKNOWN: /* unhandled GPF */
DOSVM_Dump(lpDosTask,fn,sig,VM86); DOSVM_Dump(lpDosTask,fn,sig,VM86);
if (ctx_debug_call) ctx_debug_call(SIGSEGV,&context); else ret=-1; do_exception( SIGSEGV, &context );
break; break;
case VM86_INTx: case VM86_INTx:
if (TRACE_ON(relay)) if (TRACE_ON(relay))
@ -287,7 +305,7 @@ static int DOSVM_Process( LPDOSTASK lpDosTask, int fn, int sig,
DOSVM_SendQueuedEvents(&context,lpDosTask); DOSVM_SendQueuedEvents(&context,lpDosTask);
break; break;
case VM86_TRAP: case VM86_TRAP:
if (ctx_debug_call) ctx_debug_call(SIGTRAP,&context); do_exception( SIGTRAP, &context );
break; break;
default: default:
DOSVM_Dump(lpDosTask,fn,sig,VM86); DOSVM_Dump(lpDosTask,fn,sig,VM86);