* fixes compilation of win32 system unit with -dSYSTEMEXCEPTIONDEBUG

git-svn-id: trunk@14717 -
This commit is contained in:
florian 2010-01-17 15:12:02 +00:00
parent 3747454aeb
commit 2c823f5935

View File

@ -113,12 +113,12 @@ const
Dll_Thread_Detach_Hook : TDLL_Entry_Hook = nil; Dll_Thread_Detach_Hook : TDLL_Entry_Hook = nil;
Const Const
{ it can be discussed whether fmShareDenyNone means read and write or read, write and delete, see { it can be discussed whether fmShareDenyNone means read and write or read, write and delete, see
also http://bugs.freepascal.org/view.php?id=8898, this allows users to configure the used also http://bugs.freepascal.org/view.php?id=8898, this allows users to configure the used
value value
} }
fmShareDenyNoneFlags : DWord = 3; fmShareDenyNoneFlags : DWord = 3;
implementation implementation
var var
@ -620,13 +620,13 @@ var
resetFPU : array[0..MaxExceptionLevel-1] of Boolean; resetFPU : array[0..MaxExceptionLevel-1] of Boolean;
{$ifdef SYSTEMEXCEPTIONDEBUG} {$ifdef SYSTEMEXCEPTIONDEBUG}
procedure DebugHandleErrorAddrFrame(error, addr, frame : longint); procedure DebugHandleErrorAddrFrame(error : longint; addr, frame : pointer);
begin begin
if IsConsole then if IsConsole then
begin begin
write(stderr,'HandleErrorAddrFrame(error=',error); write(stderr,'HandleErrorAddrFrame(error=',error);
write(stderr,',addr=',hexstr(addr,8)); write(stderr,',addr=',hexstr(ptruint(addr),8));
writeln(stderr,',frame=',hexstr(frame,8),')'); writeln(stderr,',frame=',hexstr(ptruint(frame),8),')');
end; end;
HandleErrorAddrFrame(error,addr,frame); HandleErrorAddrFrame(error,addr,frame);
end; end;
@ -777,7 +777,7 @@ function syswin32_i386_exception_handler(excep : PExceptionPointers) : Longint;s
writeln(stderr,'Exception Continue Exception set at ', writeln(stderr,'Exception Continue Exception set at ',
hexstr(exceptEip[exceptLevel],8)); hexstr(exceptEip[exceptLevel],8));
writeln(stderr,'Eip changed to ', writeln(stderr,'Eip changed to ',
hexstr(longint(@JumpToHandleErrorFrame),8), ' error=', error); hexstr(longint(@JumpToHandleErrorFrame),8), ' error=', err);
end; end;
{$endif SYSTEMEXCEPTIONDEBUG} {$endif SYSTEMEXCEPTIONDEBUG}
end; end;