ReceiveTempSMS/Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ntdll: Fixed some exception codes and parameters.

Browse Source
This commit is contained in:
Alexandre Julliard 2007-03-14 12:02:43 +01:00
parent 0963b84603
commit cdb833bf33
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
dlls/ntdll/signal_i386.c
View File

@ -772,7 +772,7 @@ void set_cpu_context( const CONTEXT *context )
* Check if the fault location is a privileged instruction. * Check if the fault location is a privileged instruction.
* Based on the instruction emulation code in dlls/kernel/instr.c. * Based on the instruction emulation code in dlls/kernel/instr.c.
*/ */
static inline int is_privileged_instr( CONTEXT86 *context ) static inline DWORD is_privileged_instr( CONTEXT86 *context )
{ {
const BYTE *instr; const BYTE *instr;
unsigned int prefix_count = 0; unsigned int prefix_count = 0;
@ -794,7 +794,7 @@ static inline int is_privileged_instr( CONTEXT86 *context )
case 0xf0: /* lock */ case 0xf0: /* lock */
case 0xf2: /* repne */ case 0xf2: /* repne */
case 0xf3: /* repe */ case 0xf3: /* repe */
if (++prefix_count >= 15) return 0; if (++prefix_count >= 15) return EXCEPTION_ILLEGAL_INSTRUCTION;
instr++; instr++;
continue; continue;
@ -805,7 +805,7 @@ static inline int is_privileged_instr( CONTEXT86 *context )
case 0x21: /* mov drX, reg */ case 0x21: /* mov drX, reg */
case 0x22: /* mov reg, crX */ case 0x22: /* mov reg, crX */
case 0x23: /* mov reg drX */ case 0x23: /* mov reg drX */
return 1; return EXCEPTION_PRIV_INSTRUCTION;
} }
return 0; return 0;
case 0x6c: /* insb (%dx) */ case 0x6c: /* insb (%dx) */
@ -824,7 +824,7 @@ static inline int is_privileged_instr( CONTEXT86 *context )
case 0xf4: /* hlt */ case 0xf4: /* hlt */
case 0xfa: /* cli */ case 0xfa: /* cli */
case 0xfb: /* sti */ case 0xfb: /* sti */
return 1; return EXCEPTION_PRIV_INSTRUCTION;
default: default:
return 0; return 0;
} }
@ -1144,16 +1144,17 @@ static void segv_handler( int signal, siginfo_t *siginfo, void *sigcontext )
case TRAP_x86_SEGNPFLT: /* Segment not present exception */ case TRAP_x86_SEGNPFLT: /* Segment not present exception */
case TRAP_x86_PROTFLT: /* General protection fault */ case TRAP_x86_PROTFLT: /* General protection fault */
case TRAP_x86_UNKNOWN: /* Unknown fault code */ case TRAP_x86_UNKNOWN: /* Unknown fault code */
if (!get_error_code(context) && is_privileged_instr( get_exception_context(rec) ))
rec->ExceptionCode = EXCEPTION_PRIV_INSTRUCTION;
else
{ {
WORD err = get_error_code(context); WORD err = get_error_code(context);
if (!err && (rec->ExceptionCode = is_privileged_instr( get_exception_context(rec) ))) break;
rec->ExceptionCode = EXCEPTION_ACCESS_VIOLATION; rec->ExceptionCode = EXCEPTION_ACCESS_VIOLATION;
rec->NumberParameters = 2; rec->NumberParameters = 2;
rec->ExceptionInformation[0] = 0; rec->ExceptionInformation[0] = 0;
/* if error contains a LDT selector, use that as fault address */ /* if error contains a LDT selector, use that as fault address */
rec->ExceptionInformation[1] = (err & 7) == 4 ? (err & ~7) : 0xffffffff; if ((err & 7) == 4 && !wine_ldt_is_system( err | 7 ))
rec->ExceptionInformation[1] = err & ~7;
else
rec->ExceptionInformation[1] = 0xffffffff;
} }
break; break;
case TRAP_x86_PAGEFLT: /* Page fault */ case TRAP_x86_PAGEFLT: /* Page fault */

2
dlls/ntdll/tests/exception.c
View File

@ -118,7 +118,7 @@ static const struct exception
/* test overlong instruction (limit is 16 bytes) */ /* test overlong instruction (limit is 16 bytes) */
{ { 0x64,0x64,0x64,0x64,0x64,0x64,0x64,0x64,0x64,0x64,0x64,0x64,0x64,0x64,0x64,0xfa,0xc3 }, { { 0x64,0x64,0x64,0x64,0x64,0x64,0x64,0x64,0x64,0x64,0x64,0x64,0x64,0x64,0x64,0xfa,0xc3 },
0, 16, STATUS_ACCESS_VIOLATION, 2, { 0, 0xffffffff } }, 0, 16, STATUS_ILLEGAL_INSTRUCTION, 0 },
{ { 0x64,0x64,0x64,0x64,0x64,0x64,0x64,0x64,0x64,0x64,0x64,0x64,0x64,0x64,0xfa,0xc3 }, { { 0x64,0x64,0x64,0x64,0x64,0x64,0x64,0x64,0x64,0x64,0x64,0x64,0x64,0x64,0xfa,0xc3 },
0, 15, STATUS_PRIVILEGED_INSTRUCTION, 0 }, 0, 15, STATUS_PRIVILEGED_INSTRUCTION, 0 },