paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-16 16:59:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

* missing HasSignal conditionals added (needed for FPC/2)

Browse Source
This commit is contained in:
Tomas Hajny 2002-10-12 19:43:07 +00:00
parent dcb9f928c1
commit a11f0cf6b2
4 changed files with 40 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
ide/fp.pas
View File

@ -266,6 +266,7 @@ const
procedure InterceptExit; procedure InterceptExit;
begin begin
{$IFDEF HasSignal}
if StopJmpValid then if StopJmpValid then
begin begin
ExitIntercepted:=true; ExitIntercepted:=true;
@ -273,6 +274,7 @@ begin
SeenErrorAddr:=ErrorAddr; SeenErrorAddr:=ErrorAddr;
LongJmp(StopJmp,1); LongJmp(StopJmp,1);
end; end;
{$ENDIF}
end; end;
BEGIN BEGIN
@ -339,7 +341,9 @@ BEGIN
from command line PM } from command line PM }
ParseUserScreen; ParseUserScreen;
{$IFDEF HasSignal}
EnableCatchSignals; EnableCatchSignals;
{$ENDIF}
{ Update IDE } { Update IDE }
IDEApp.Update; IDEApp.Update;
IDEApp.UpdateMode; IDEApp.UpdateMode;
@ -357,8 +361,10 @@ BEGIN
ExitProc:=@InterceptExit; ExitProc:=@InterceptExit;
repeat repeat
SetJmpRes:=setjmp(StopJmp); {$IFDEF HasSignal}
StopJmpValid:=true; SetJmpRes:=setjmp(StopJmp);
StopJmpValid:=true;
{$ENDIF}
UserWantsToGoOn:=false; UserWantsToGoOn:=false;
if SetJmpRes=0 then if SetJmpRes=0 then
@ -404,7 +410,9 @@ BEGIN
CanExit:=IDEApp.AskSaveAll CanExit:=IDEApp.AskSaveAll
else else
CanExit:=IDEApp.SaveAll; CanExit:=IDEApp.SaveAll;
StopJmpValid:=false; {$IFDEF HasSignal}
StopJmpValid:=false;
{$ENDIF}
if (SetJmpRes<>0) then if (SetJmpRes<>0) then
begin begin
if (not CanExit) or UserWantsToGoOn then if (not CanExit) or UserWantsToGoOn then
@ -431,7 +439,9 @@ BEGIN
IDEApp.Done; IDEApp.Done;
WriteSwitches(SwitchesPath); WriteSwitches(SwitchesPath);
DisableCatchSignals; {$IFDEF HasSignal}
DisableCatchSignals;
{$ENDIF}
DoneCodeComplete; DoneCodeComplete;
DoneCodeTemplates; DoneCodeTemplates;
@ -470,7 +480,10 @@ BEGIN
END. END.
{ {
$Log$ $Log$
Revision 1.13 2002-09-10 12:19:14 pierre Revision 1.14 2002-10-12 19:43:07 hajny
* missing HasSignal conditionals added (needed for FPC/2)
Revision 1.13 2002/09/10 12:19:14 pierre
* use faster method for loading files by default * use faster method for loading files by default
Revision 1.12 2002/09/09 06:59:16 pierre Revision 1.12 2002/09/09 06:59:16 pierre

11
ide/fpide.pas
View File

@ -563,7 +563,11 @@ begin
{$ifdef DEBUG} {$ifdef DEBUG}
if (Event.What=evKeyDown) and (Event.KeyCode=kbAltF11) then if (Event.What=evKeyDown) and (Event.KeyCode=kbAltF11) then
begin begin
{$ifdef HasSignal}
Generate_SIGSEGV; Generate_SIGSEGV;
{$else}
Halt(1);
{$endif}
end; end;
if (Event.What=evKeyDown) and (Event.KeyCode=kbCtrlF11) then if (Event.What=evKeyDown) and (Event.KeyCode=kbCtrlF11) then
begin begin
@ -871,7 +875,9 @@ begin
{ destory all help & browser windows - we don't want to store them } { destory all help & browser windows - we don't want to store them }
{ UserScreenWindow is also not registered PM } { UserScreenWindow is also not registered PM }
DoCloseUserScreenWindow; DoCloseUserScreenWindow;
{$IFNDEF NODEBUG}
DoneDisassemblyWindow; DoneDisassemblyWindow;
{$ENDIF}
CloseHelpWindows; CloseHelpWindows;
CloseAllBrowsers; CloseAllBrowsers;
DOK:=SaveDesktop; DOK:=SaveDesktop;
@ -1217,7 +1223,10 @@ end;
END. END.
{ {
$Log$ $Log$
Revision 1.21 2002-09-13 07:16:56 pierre Revision 1.22 2002-10-12 19:43:07 hajny
* missing HasSignal conditionals added (needed for FPC/2)
Revision 1.21 2002/09/13 07:16:56 pierre
* avoid RTE 201 if closing file with position outside integer bounds * avoid RTE 201 if closing file with position outside integer bounds
Revision 1.20 2002/09/09 06:58:51 pierre Revision 1.20 2002/09/09 06:58:51 pierre

7
ide/fpmfile.inc
View File

@ -170,8 +170,10 @@ begin
if ConfirmBox(msg_confirmsourcediradd,@P,false)=cmYes then if ConfirmBox(msg_confirmsourcediradd,@P,false)=cmYes then
begin begin
SourceDirs:=SourceDirs+';'+Dir; SourceDirs:=SourceDirs+';'+Dir;
{$IFNDEF NODEBUG}
if assigned(Debugger) then if assigned(Debugger) then
Debugger^.SetDirectories; Debugger^.SetDirectories;
{$ENDIF}
end; end;
OpenEditorWindow(nil,FileName,0,0); OpenEditorWindow(nil,FileName,0,0);
end; end;
@ -221,7 +223,10 @@ end;
{ {
$Log$ $Log$
Revision 1.6 2002-09-07 15:40:43 peter Revision 1.7 2002-10-12 19:43:07 hajny
* missing HasSignal conditionals added (needed for FPC/2)
Revision 1.6 2002/09/07 15:40:43 peter
* old logs removed and tabs fixed * old logs removed and tabs fixed
Revision 1.5 2002/08/29 09:58:04 pierre Revision 1.5 2002/08/29 09:58:04 pierre

7
ide/fpmrun.inc
View File

@ -49,12 +49,14 @@ begin
begin begin
if (MessageBox(#3+'You''ve edited a file, recompile the project?',nil,mfinformation+mfyesbutton+mfnobutton)=cmYes) then if (MessageBox(#3+'You''ve edited a file, recompile the project?',nil,mfinformation+mfyesbutton+mfnobutton)=cmYes) then
begin begin
{$IFNDEF NODEBUG}
if Assigned(Debugger) then if Assigned(Debugger) then
begin begin
if Debugger^.IsRunning then if Debugger^.IsRunning then
RestartingDebugger:=true; RestartingDebugger:=true;
end; end;
DoResetDebugger; DoResetDebugger;
{$ENDIF}
DoRun; DoRun;
AskRecompileIfModified:=true; AskRecompileIfModified:=true;
end end
@ -483,7 +485,10 @@ end;
{ {
$Log$ $Log$
Revision 1.5 2002-09-07 15:40:44 peter Revision 1.6 2002-10-12 19:43:07 hajny
* missing HasSignal conditionals added (needed for FPC/2)
Revision 1.5 2002/09/07 15:40:44 peter
* old logs removed and tabs fixed * old logs removed and tabs fixed
Revision 1.4 2002/09/05 08:45:59 pierre Revision 1.4 2002/09/05 08:45:59 pierre