Get rid of DPRINTF.

This commit is contained in:
Diego Pettenò 2005-01-03 20:04:54 +00:00 committed by Alexandre Julliard
parent bd1bbc1768
commit e07a95688d
3 changed files with 33 additions and 45 deletions

View File

@ -528,27 +528,21 @@ static WINE_EXCEPTION_FILTER(exception_handler)
switch(rec->ExceptionCode) {
case EXCEPTION_VM86_INTx:
if (TRACE_ON(relay)) {
DPRINTF("Call DOS int 0x%02x ret=%04lx:%04lx\n",
arg, context->SegCs, context->Eip );
DPRINTF(" eax=%08lx ebx=%08lx ecx=%08lx edx=%08lx esi=%08lx edi=%08lx\n",
context->Eax, context->Ebx, context->Ecx, context->Edx,
context->Esi, context->Edi );
DPRINTF(" ebp=%08lx esp=%08lx ds=%04lx es=%04lx fs=%04lx gs=%04lx flags=%08lx\n",
context->Ebp, context->Esp, context->SegDs, context->SegEs,
context->SegFs, context->SegGs, context->EFlags );
}
TRACE_(relay)("Call DOS int 0x%02x ret=%04lx:%04lx\n"
" eax=%08lx ebx=%08lx ecx=%08lx edx=%08lx esi=%08lx edi=%08lx\n"
" ebp=%08lx esp=%08lx ds=%04lx es=%04lx fs=%04lx gs=%04lx flags=%08lx\n",
arg, context->SegCs, context->Eip,
context->Eax, context->Ebx, context->Ecx, context->Edx, context->Esi, context->Edi,
context->Ebp, context->Esp, context->SegDs, context->SegEs, context->SegFs, context->SegGs,
context->EFlags );
ret = DOSVM_EmulateInterruptRM( context, arg );
if (TRACE_ON(relay)) {
DPRINTF("Ret DOS int 0x%02x ret=%04lx:%04lx\n",
arg, context->SegCs, context->Eip );
DPRINTF(" eax=%08lx ebx=%08lx ecx=%08lx edx=%08lx esi=%08lx edi=%08lx\n",
context->Eax, context->Ebx, context->Ecx, context->Edx,
context->Esi, context->Edi );
DPRINTF(" ebp=%08lx esp=%08lx ds=%04lx es=%04lx fs=%04lx gs=%04lx flags=%08lx\n",
context->Ebp, context->Esp, context->SegDs, context->SegEs,
context->SegFs, context->SegGs, context->EFlags );
}
TRACE_(relay)("Ret DOS int 0x%02x ret=%04lx:%04lx\n"
" eax=%08lx ebx=%08lx ecx=%08lx edx=%08lx esi=%08lx edi=%08lx\n"
" ebp=%08lx esp=%08lx ds=%04lx es=%04lx fs=%04lx gs=%04lx flags=%08lx\n",
arg, context->SegCs, context->Eip,
context->Eax, context->Ebx, context->Ecx, context->Edx, context->Esi, context->Edi,
context->Ebp, context->Esp, context->SegDs, context->SegEs,
context->SegFs, context->SegGs, context->EFlags );
return ret ? EXCEPTION_CONTINUE_EXECUTION : EXCEPTION_EXECUTE_HANDLER;
case EXCEPTION_VM86_STI:

View File

@ -243,18 +243,15 @@ static void DOSVM_PushFlags( CONTEXT86 *context, BOOL islong, BOOL isstub )
*/
void WINAPI DOSVM_EmulateInterruptPM( CONTEXT86 *context, BYTE intnum )
{
if (TRACE_ON(relay))
{
DPRINTF( "Call DOS int 0x%02x ret=%04lx:%08lx\n",
intnum, context->SegCs, context->Eip );
DPRINTF( " eax=%08lx ebx=%08lx ecx=%08lx edx=%08lx\n",
context->Eax, context->Ebx, context->Ecx, context->Edx );
DPRINTF( " esi=%08lx edi=%08lx ebp=%08lx esp=%08lx \n",
context->Esi, context->Edi, context->Ebp, context->Esp );
DPRINTF( " ds=%04lx es=%04lx fs=%04lx gs=%04lx ss=%04lx flags=%08lx\n",
context->SegDs, context->SegEs, context->SegFs, context->SegGs,
context->SegSs, context->EFlags );
}
TRACE_(relay)("Call DOS int 0x%02x ret=%04lx:%08lx\n"
" eax=%08lx ebx=%08lx ecx=%08lx edx=%08lx\n"
" esi=%08lx edi=%08lx ebp=%08lx esp=%08lx \n"
" ds=%04lx es=%04lx fs=%04lx gs=%04lx ss=%04lx flags=%08lx\n",
intnum, context->SegCs, context->Eip,
context->Eax, context->Ebx, context->Ecx, context->Edx,
context->Esi, context->Edi, context->Ebp, context->Esp,
context->SegDs, context->SegEs, context->SegFs, context->SegGs,
context->SegSs, context->EFlags );
if (context->SegCs == DOSVM_dpmi_segments->dpmi_sel)
{
@ -425,18 +422,15 @@ void DOSVM_HardwareInterruptPM( CONTEXT86 *context, BYTE intnum )
*/
BOOL WINAPI DOSVM_EmulateInterruptRM( CONTEXT86 *context, BYTE intnum )
{
if (TRACE_ON(relay))
{
DPRINTF( "Call DOS int 0x%02x ret=%04lx:%08lx\n",
intnum, context->SegCs, context->Eip );
DPRINTF( " eax=%08lx ebx=%08lx ecx=%08lx edx=%08lx\n",
context->Eax, context->Ebx, context->Ecx, context->Edx );
DPRINTF( " esi=%08lx edi=%08lx ebp=%08lx esp=%08lx \n",
context->Esi, context->Edi, context->Ebp, context->Esp );
DPRINTF( " ds=%04lx es=%04lx fs=%04lx gs=%04lx flags=%08lx\n",
context->SegDs, context->SegEs,
context->SegFs, context->SegGs, context->EFlags );
}
TRACE_(relay)("Call DOS int 0x%02x ret=%04lx:%08lx\n"
" eax=%08lx ebx=%08lx ecx=%08lx edx=%08lx\n"
" esi=%08lx edi=%08lx ebp=%08lx esp=%08lx \n"
" ds=%04lx es=%04lx fs=%04lx gs=%04lx ss=%04lx flags=%08lx\n",
intnum, context->SegCs, context->Eip,
context->Eax, context->Ebx, context->Ecx, context->Edx,
context->Esi, context->Edi, context->Ebp, context->Esp,
context->SegDs, context->SegEs, context->SegFs, context->SegGs,
context->SegSs, context->EFlags );
/* check for our real-mode hooks */
if (intnum == 0x31)

View File

@ -50,7 +50,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(vxd);
#define W32S_WINE2APP(addr) ((addr)? (DWORD)(addr) - W32S_offset : 0)
#define VXD_BARF(context,name) \
DPRINTF( "vxd %s: unknown/not implemented parameters:\n" \
TRACE( "vxd %s: unknown/not implemented parameters:\n" \
"vxd %s: AX %04x, BX %04x, CX %04x, DX %04x, " \
"SI %04x, DI %04x, DS %04x, ES %04x\n", \
(name), (name), AX_reg(context), BX_reg(context), \