mirror of
https://gitlab.com/freepascal.org/fpc/source.git
synced 2025-09-21 00:31:42 +02:00
* fixed NODEBUG
* set default target to the default target of the compiler
This commit is contained in:
peter
parent
d99267e326
commit
25eb483cfe
@ -14,6 +14,12 @@
|
||||
|
||||
**********************************************************************}
|
||||
unit FPDebug;
|
||||
{$ifdef NODEBUG}
|
||||
interface
|
||||
implementation
|
||||
end.
|
||||
{$else}
|
||||
|
||||
interface
|
||||
|
||||
{$i globdir.inc}
|
||||
@ -3655,10 +3661,15 @@ begin
|
||||
end;
|
||||
|
||||
end.
|
||||
{$endif}
|
||||
|
||||
{
|
||||
$Log$
|
||||
Revision 1.58 2004-12-19 18:39:50 florian
|
||||
Revision 1.59 2004-12-22 15:24:06 peter
|
||||
* fixed NODEBUG
|
||||
* set default target to the default target of the compiler
|
||||
|
||||
Revision 1.58 2004/12/19 18:39:50 florian
|
||||
* made 64 bit safe
|
||||
|
||||
Revision 1.57 2004/12/06 20:39:25 peter
|
||||
|
||||
@ -350,6 +350,7 @@ begin
|
||||
end;
|
||||
hcCompilerMessagesWindow:
|
||||
W:=CompilerMessageWindow;
|
||||
{$ifndef NODEBUG}
|
||||
hcGDBWindow:
|
||||
begin
|
||||
InitGDBWindow;
|
||||
@ -405,6 +406,7 @@ begin
|
||||
end;
|
||||
W:=BreakpointsWindow;
|
||||
end;
|
||||
{$endif NODEBUG}
|
||||
hcASCIITableWindow:
|
||||
begin
|
||||
if ASCIIChart=nil then
|
||||
@ -944,7 +946,11 @@ end;
|
||||
END.
|
||||
{
|
||||
$Log$
|
||||
Revision 1.11 2004-11-11 15:20:52 florian
|
||||
Revision 1.12 2004-12-22 15:24:07 peter
|
||||
* fixed NODEBUG
|
||||
* set default target to the default target of the compiler
|
||||
|
||||
Revision 1.11 2004/11/11 15:20:52 florian
|
||||
* applied Peter's patch from yesterday
|
||||
|
||||
Revision 1.10 2004/11/08 20:28:26 peter
|
||||
|
||||
@ -801,9 +801,11 @@ begin
|
||||
{ Leave the messages window in the bottom }
|
||||
if assigned(MessagesWindow) and (MessagesWindow^.GetState(sfVisible)) then
|
||||
R.B.Y:=Min(MessagesWindow^.Origin.Y,R.B.Y);
|
||||
{$ifndef NODEBUG}
|
||||
{ Leave the watch window in the bottom }
|
||||
if assigned(WatchesWindow) and (WatchesWindow^.GetState(sfVisible)) then
|
||||
R.B.Y:=Min(WatchesWindow^.Origin.Y,R.B.Y);
|
||||
{$endif NODEBUG}
|
||||
end;
|
||||
|
||||
|
||||
@ -1241,7 +1243,11 @@ end;
|
||||
END.
|
||||
{
|
||||
$Log$
|
||||
Revision 1.34 2004-12-19 20:38:35 hajny
|
||||
Revision 1.35 2004-12-22 15:24:07 peter
|
||||
* fixed NODEBUG
|
||||
* set default target to the default target of the compiler
|
||||
|
||||
Revision 1.34 2004/12/19 20:38:35 hajny
|
||||
+ confirmation box after video mode switch (bug 2933)
|
||||
|
||||
Revision 1.33 2004/11/20 14:21:19 florian
|
||||
|
||||
@ -14,6 +14,11 @@
|
||||
|
||||
**********************************************************************}
|
||||
unit FPRegs;
|
||||
{$ifdef NODEBUG}
|
||||
interface
|
||||
implementation
|
||||
end.
|
||||
{$else}
|
||||
|
||||
interface
|
||||
|
||||
@ -1066,10 +1071,15 @@ begin
|
||||
end;
|
||||
|
||||
end.
|
||||
{$endif}
|
||||
|
||||
{
|
||||
$Log$
|
||||
Revision 1.4 2004-11-11 15:20:52 florian
|
||||
Revision 1.5 2004-12-22 15:24:07 peter
|
||||
* fixed NODEBUG
|
||||
* set default target to the default target of the compiler
|
||||
|
||||
Revision 1.4 2004/11/11 15:20:52 florian
|
||||
* applied Peter's patch from yesterday
|
||||
|
||||
Revision 1.3 2004/02/06 21:34:43 jonas
|
||||
|
||||
@ -932,34 +932,6 @@ begin
|
||||
for t:=low(tsystem) to high(tsystem) do
|
||||
if assigned(targetinfos[t]) then
|
||||
AddSelectItem(targetinfos[t]^.name,targetinfos[t]^.shortname,idNone);
|
||||
{$ifdef dummy}
|
||||
{$ifdef I386}
|
||||
{AddSelectItem('DOS (GO32V~1~)','go32v1',idNone);}
|
||||
AddSelectItem('~D~OS (GO32V2)','go32v2',idNone);
|
||||
AddSelectItem('~F~reeBSD','freebsd',idNone);
|
||||
AddSelectItem('~L~inux','linux',idNone);
|
||||
AddSelectItem('~N~etBSD','netbsd',idNone);
|
||||
AddSelectItem('~O~S/2','os2',idNone);
|
||||
AddSelectItem('~W~IN32','win32',idNone);
|
||||
AddSelectItem('N~e~tWare Clib','netware',idNone);
|
||||
AddSelectItem('O~p~enBSD','openbsd',idNone);
|
||||
AddSelectItem('Netware Lib~c~','netwlibc',idNone);
|
||||
{$endif I386}
|
||||
{$ifdef M68K}
|
||||
AddSelectItem('~A~miga','amiga',idNone);
|
||||
AddSelectItem('A~t~ari','atari',idNone);
|
||||
AddSelectItem('~L~inux','linux',idNone);
|
||||
AddSelectItem('~N~etBSD','netbsd',idNone);
|
||||
AddSelectItem('~P~alm OS','palmos',idNone);
|
||||
{AddSelectItem('~M~ac OS','macos',idNone); }
|
||||
{$endif M68K}
|
||||
{$ifdef powerpc}
|
||||
AddSelectItem('~L~inux','linux',idNone);
|
||||
AddSelectItem('~N~etBSD','netbsd',idNone);
|
||||
AddSelectItem('~M~ac OS','macos',idNone);
|
||||
AddSelectItem('Macos ~X~(Darwin)','darwin',idNone);
|
||||
{$endif powerpc}
|
||||
{$endif dummy}
|
||||
end;
|
||||
New(AsmReaderSwitches,InitSelect('R'));
|
||||
with AsmReaderSwitches^ do
|
||||
@ -1113,49 +1085,7 @@ begin
|
||||
end;
|
||||
end;
|
||||
{ set appriopriate default target }
|
||||
{$ifdef i386}
|
||||
{$ifdef go32v2}
|
||||
TargetSwitches^.SetCurrSelParam('go32v2');
|
||||
{$endif}
|
||||
{$ifdef linux}
|
||||
TargetSwitches^.SetCurrSelParam('linux');
|
||||
{$endif}
|
||||
{$ifdef freebsd}
|
||||
TargetSwitches^.SetCurrSelParam('freebsd');
|
||||
{$endif}
|
||||
{$ifdef os2}
|
||||
TargetSwitches^.SetCurrSelParam('os2');
|
||||
{$endif}
|
||||
{$ifdef win32}
|
||||
TargetSwitches^.SetCurrSelParam('win32');
|
||||
{$endif}
|
||||
{$ifdef netwlibc}
|
||||
TargetSwitches^.SetCurrSelParam('netwlibc');
|
||||
{$else}
|
||||
{$ifdef netware}
|
||||
TargetSwitches^.SetCurrSelParam('netware');
|
||||
{$endif}
|
||||
{$endif}
|
||||
{$ifdef netbsd}
|
||||
TargetSwitches^.SetCurrSelParam('netbsd');
|
||||
{$endif}
|
||||
{$ifdef openbsd}
|
||||
TargetSwitches^.SetCurrSelParam('openbsd');
|
||||
{$endif}
|
||||
{$endif i386}
|
||||
{$ifdef m68k}
|
||||
{$ifdef linux}
|
||||
TargetSwitches^.SetCurrSelParam('linux');
|
||||
{$endif linux}
|
||||
{$endif m68k}
|
||||
{$ifdef powerpc}
|
||||
{$ifdef linux}
|
||||
TargetSwitches^.SetCurrSelParam('linux');
|
||||
{$endif linux}
|
||||
{$ifdef Darwin}
|
||||
TargetSwitches^.SetCurrSelParam('darwin');
|
||||
{$endif}
|
||||
{$endif powerpc}
|
||||
TargetSwitches^.SetCurrSelParam(target_info.shortname);
|
||||
end;
|
||||
SwitchesMode:=OldSwitchesMode;
|
||||
end;
|
||||
@ -1282,7 +1212,11 @@ end;
|
||||
end.
|
||||
{
|
||||
$Log$
|
||||
Revision 1.20 2004-11-20 10:10:32 florian
|
||||
Revision 1.21 2004-12-22 15:24:07 peter
|
||||
* fixed NODEBUG
|
||||
* set default target to the default target of the compiler
|
||||
|
||||
Revision 1.20 2004/11/20 10:10:32 florian
|
||||
* renamed Delphi 2 extensions on to Object pascal support
|
||||
|
||||
Revision 1.19 2004/11/14 21:45:29 florian
|
||||
|
||||
@ -59,14 +59,16 @@ const ClipboardWindow : PClipboardWindow = nil;
|
||||
PrevMainFile : string = '';
|
||||
EXEFile : string = '';
|
||||
CompilationPhase : TCompPhase = cpNothing;
|
||||
{$ifndef NODEBUG}
|
||||
GDBWindow : PGDBWindow = nil;
|
||||
DisassemblyWindow : PDisassemblyWindow = nil;
|
||||
BreakpointsWindow : PBreakpointsWindow = nil;
|
||||
WatchesWindow : PWatchesWindow = nil;
|
||||
UserScreenWindow : PScreenWindow = nil;
|
||||
StackWindow : PStackWindow = nil;
|
||||
RegistersWindow : PRegistersWindow = nil;
|
||||
FPUWindow : PFPUWindow = nil;
|
||||
{$endif NODEBUG}
|
||||
UserScreenWindow : PScreenWindow = nil;
|
||||
|
||||
HeapView : PFPHeapView = nil;
|
||||
ClockView : PFPClockView = nil;
|
||||
@ -125,7 +127,11 @@ implementation
|
||||
END.
|
||||
{
|
||||
$Log$
|
||||
Revision 1.9 2004-11-08 20:28:28 peter
|
||||
Revision 1.10 2004-12-22 15:24:07 peter
|
||||
* fixed NODEBUG
|
||||
* set default target to the default target of the compiler
|
||||
|
||||
Revision 1.9 2004/11/08 20:28:28 peter
|
||||
* Breakpoints are now deleted when removed from source, disabling is
|
||||
still possible from the breakpoint list
|
||||
* COMPILER_1_0, FVISION, GABOR defines removed, only support new
|
||||
|
||||
@ -129,8 +129,10 @@ type
|
||||
PScrollBar; AIndicator: PIndicator;const AFileName: string);
|
||||
CompileStamp : longint;
|
||||
CodeCompleteTip: PFPToolTip;
|
||||
{$ifndef NODEBUG}
|
||||
private
|
||||
ShouldHandleBreakpoints : boolean;
|
||||
{$endif NODEBUG}
|
||||
public
|
||||
{ Syntax highlight }
|
||||
function IsReservedWord(const S: string): boolean; virtual;
|
||||
@ -187,6 +189,7 @@ type
|
||||
destructor Done; virtual;
|
||||
end;
|
||||
|
||||
{$ifndef NODEBUG}
|
||||
PGDBSourceEditor = ^TGDBSourceEditor;
|
||||
TGDBSourceEditor = object(TSourceEditor)
|
||||
function InsertNewLine : Sw_integer;virtual;
|
||||
@ -265,6 +268,7 @@ type
|
||||
function GetPalette: PPalette;virtual;
|
||||
destructor Done; virtual;
|
||||
end;
|
||||
{$endif NODEBUG}
|
||||
|
||||
PClipboardWindow = ^TClipboardWindow;
|
||||
TClipboardWindow = object(TSourceWindow)
|
||||
@ -434,7 +438,9 @@ function FirstEditorWindow: PSourceWindow;
|
||||
function EditorWindowFile(const Name : String): PSourceWindow;
|
||||
procedure AskToReloadAllModifiedFiles;
|
||||
|
||||
{$ifndef NODEBUG}
|
||||
function InDisassemblyWindow :boolean;
|
||||
{$endif NODEBUG}
|
||||
|
||||
function NewTabItem(AView: PView; ANext: PTabItem): PTabItem;
|
||||
procedure DisposeTabItem(P: PTabItem);
|
||||
@ -558,18 +564,6 @@ const
|
||||
Store: @TFPDesktop.Store
|
||||
);
|
||||
|
||||
RGDBSourceEditor: TStreamRec = (
|
||||
ObjType: 1507;
|
||||
VmtLink: Ofs(TypeOf(TGDBSourceEditor)^);
|
||||
Load: @TGDBSourceEditor.Load;
|
||||
Store: @TGDBSourceEditor.Store
|
||||
);
|
||||
RGDBWindow: TStreamRec = (
|
||||
ObjType: 1508;
|
||||
VmtLink: Ofs(TypeOf(TGDBWindow)^);
|
||||
Load: @TGDBWindow.Load;
|
||||
Store: @TGDBWindow.Store
|
||||
);
|
||||
RFPASCIIChart: TStreamRec = (
|
||||
ObjType: 1509;
|
||||
VmtLink: Ofs(TypeOf(TFPASCIIChart)^);
|
||||
@ -582,6 +576,19 @@ const
|
||||
Load: @TFPDlgWindow.Load;
|
||||
Store: @TFPDlgWindow.Store
|
||||
);
|
||||
{$ifndef NODEBUG}
|
||||
RGDBWindow: TStreamRec = (
|
||||
ObjType: 1508;
|
||||
VmtLink: Ofs(TypeOf(TGDBWindow)^);
|
||||
Load: @TGDBWindow.Load;
|
||||
Store: @TGDBWindow.Store
|
||||
);
|
||||
RGDBSourceEditor: TStreamRec = (
|
||||
ObjType: 1507;
|
||||
VmtLink: Ofs(TypeOf(TGDBSourceEditor)^);
|
||||
Load: @TGDBSourceEditor.Load;
|
||||
Store: @TGDBSourceEditor.Store
|
||||
);
|
||||
RDisassemblyEditor: TStreamRec = (
|
||||
ObjType: 1512;
|
||||
VmtLink: Ofs(TypeOf(TDisassemblyEditor)^);
|
||||
@ -594,6 +601,7 @@ const
|
||||
Load: @TDisassemblyWindow.Load;
|
||||
Store: @TDisassemblyWindow.Store
|
||||
);
|
||||
{$endif NODEBUG}
|
||||
const
|
||||
GlobalNoNameCount : integer = 0;
|
||||
var
|
||||
@ -717,6 +725,8 @@ begin
|
||||
EditorWindowFile:=pointer(Desktop^.FirstThat(@EditorWindow));
|
||||
end;
|
||||
|
||||
|
||||
{$ifndef NODEBUG}
|
||||
function InDisassemblyWindow :boolean;
|
||||
var
|
||||
PW : PWindow;
|
||||
@ -734,6 +744,8 @@ begin
|
||||
InDisassemblyWindow:=Assigned(PW) and
|
||||
(TypeOf(PW^)=TypeOf(TDisassemblyWindow));
|
||||
end;
|
||||
{$endif NODEBUG}
|
||||
|
||||
|
||||
function GetEditorCurWord(Editor: PEditor; ValidSpecChars: TCharSet): string;
|
||||
var S: string;
|
||||
@ -1445,16 +1457,23 @@ end;
|
||||
procedure TSourceEditor.DeleteLine(I: sw_integer);
|
||||
begin
|
||||
inherited DeleteLine(I);
|
||||
{$ifndef NODEBUG}
|
||||
If ShouldHandleBreakpoints then
|
||||
BreakpointsCollection^.AdaptBreakpoints(@Self,I,-1);
|
||||
{$endif NODEBUG}
|
||||
end;
|
||||
|
||||
procedure TSourceEditor.BackSpace;
|
||||
{$ifndef NODEBUG}
|
||||
var
|
||||
MoveBreakpointToPreviousLine,WasEnabled : boolean;
|
||||
PBStart,PBEnd : PBreakpoint;
|
||||
I : longint;
|
||||
{$endif NODEBUG}
|
||||
begin
|
||||
{$ifdef NODEBUG}
|
||||
inherited Backspace;
|
||||
{$else}
|
||||
MoveBreakpointToPreviousLine:=(CurPos.X=0) and (CurPos.Y>0);
|
||||
If MoveBreakpointToPreviousLine then
|
||||
begin
|
||||
@ -1493,13 +1512,19 @@ begin
|
||||
end;
|
||||
BreakpointsCollection^.AdaptBreakpoints(@Self,I,-1);
|
||||
end;
|
||||
{$endif NODEBUG}
|
||||
end;
|
||||
|
||||
function TSourceEditor.InsertNewLine : Sw_integer;
|
||||
{$ifndef NODEBUG}
|
||||
var
|
||||
MoveBreakpointToNextLine : boolean;
|
||||
I : longint;
|
||||
{$endif NODEBUG}
|
||||
begin
|
||||
{$ifdef NODEBUG}
|
||||
InsertNewLine:=inherited InsertNewLine;
|
||||
{$else}
|
||||
ShouldHandleBreakpoints:=false;
|
||||
MoveBreakpointToNextLine:=Cursor.x<Length(RTrim(GetDisplayText(CurPos.Y)));
|
||||
I:=CurPos.Y+1;
|
||||
@ -1509,19 +1534,23 @@ begin
|
||||
else
|
||||
BreakpointsCollection^.AdaptBreakpoints(@Self,I,1);
|
||||
ShouldHandleBreakpoints:=true;
|
||||
{$endif NODEBUG}
|
||||
end;
|
||||
|
||||
procedure TSourceEditor.DelChar;
|
||||
var
|
||||
S: string;
|
||||
I,CI : sw_integer;
|
||||
{$ifndef NODEBUG}
|
||||
PBStart,PBEnd : PBreakpoint;
|
||||
MoveBreakpointOneLineUp,WasEnabled : boolean;
|
||||
{$endif NODEBUG}
|
||||
begin
|
||||
if IsReadOnly then Exit;
|
||||
S:=GetLineText(CurPos.Y);
|
||||
I:=CurPos.Y+1;
|
||||
CI:=LinePosToCharIdx(CurPos.Y,CurPos.X);
|
||||
{$ifndef NODEBUG}
|
||||
if ((CI>length(S)) or (S='')) and (CurPos.Y<GetLineCount-1) then
|
||||
begin
|
||||
MoveBreakpointOneLineUp:=true;
|
||||
@ -1531,7 +1560,9 @@ begin
|
||||
end
|
||||
else
|
||||
MoveBreakpointOneLineUp:=false;
|
||||
{$endif NODEBUG}
|
||||
Inherited DelChar;
|
||||
{$ifndef NODEBUG}
|
||||
if MoveBreakpointOneLineUp then
|
||||
begin
|
||||
ShouldHandleBreakpoints:=true;
|
||||
@ -1561,20 +1592,25 @@ begin
|
||||
end;
|
||||
BreakpointsCollection^.AdaptBreakpoints(@Self,I,-1);
|
||||
end;
|
||||
{$endif NODEBUG}
|
||||
end;
|
||||
|
||||
procedure TSourceEditor.DelSelect;
|
||||
{$ifndef NODEBUG}
|
||||
var
|
||||
MoveBreakpointToFirstLine,WasEnabled : boolean;
|
||||
PBStart,PBEnd : PBreakpoint;
|
||||
I,J : longint;
|
||||
{$endif NODEBUG}
|
||||
begin
|
||||
{$ifdef NODEBUG}
|
||||
inherited DelSelect;
|
||||
{$else}
|
||||
ShouldHandleBreakpoints:=false;
|
||||
J:=SelEnd.Y-SelStart.Y;
|
||||
MoveBreakpointToFirstLine:=J>0;
|
||||
PBEnd:=BreakpointsCollection^.FindBreakpointAt(@Self,SelEnd.Y);
|
||||
PBStart:=BreakpointsCollection^.FindBreakpointAt(@Self,SelEnd.Y);
|
||||
|
||||
I:=SelStart.Y;
|
||||
inherited DelSelect;
|
||||
if MoveBreakpointToFirstLine and assigned(PBEnd) then
|
||||
@ -1603,20 +1639,25 @@ begin
|
||||
end;
|
||||
BreakpointsCollection^.AdaptBreakpoints(@Self,I,-J);
|
||||
ShouldHandleBreakpoints:=true;
|
||||
{$endif NODEBUG}
|
||||
end;
|
||||
|
||||
|
||||
function TSourceEditor.InsertLine(LineNo: sw_integer; const S: string): PCustomLine;
|
||||
begin
|
||||
InsertLine := inherited InsertLine(LineNo,S);
|
||||
{$ifndef NODEBUG}
|
||||
If ShouldHandleBreakpoints then
|
||||
BreakpointsCollection^.AdaptBreakpoints(@Self,LineNo,1);
|
||||
{$endif NODEBUG}
|
||||
end;
|
||||
|
||||
procedure TSourceEditor.AddLine(const S: string);
|
||||
begin
|
||||
inherited AddLine(S);
|
||||
{$ifndef NODEBUG}
|
||||
BreakpointsCollection^.AdaptBreakpoints(@Self,GetLineCount,1);
|
||||
{$endif NODEBUG}
|
||||
end;
|
||||
|
||||
|
||||
@ -2040,8 +2081,10 @@ begin
|
||||
end;
|
||||
end;
|
||||
Insert(Editor);
|
||||
{$ifndef NODEBUG}
|
||||
If assigned(BreakpointsCollection) then
|
||||
BreakpointsCollection^.ShowBreakpoints(@Self);
|
||||
{$endif NODEBUG}
|
||||
UpdateTitle;
|
||||
end;
|
||||
|
||||
@ -2146,8 +2189,10 @@ begin
|
||||
inherited Load(S);
|
||||
GetSubViewPtr(S,Indicator);
|
||||
GetSubViewPtr(S,Editor);
|
||||
{$ifndef NODEBUG}
|
||||
If assigned(BreakpointsCollection) then
|
||||
BreakpointsCollection^.ShowBreakpoints(@Self);
|
||||
{$endif NODEBUG}
|
||||
PopStatus;
|
||||
end;
|
||||
|
||||
@ -2180,6 +2225,9 @@ begin
|
||||
PopStatus;
|
||||
end;
|
||||
|
||||
|
||||
{$ifndef NODEBUG}
|
||||
|
||||
function TGDBSourceEditor.Valid(Command: Word): Boolean;
|
||||
var OK: boolean;
|
||||
begin
|
||||
@ -2723,6 +2771,7 @@ begin
|
||||
DisassemblyWindow:=nil;
|
||||
inherited Done;
|
||||
end;
|
||||
{$endif NODEBUG}
|
||||
|
||||
|
||||
|
||||
@ -4429,17 +4478,23 @@ begin
|
||||
RegisterType(RClipboardWindow);
|
||||
RegisterType(RMessageListBox);
|
||||
RegisterType(RFPDesktop);
|
||||
RegisterType(RGDBSourceEditor);
|
||||
RegisterType(RGDBWindow);
|
||||
RegisterType(RFPASCIIChart);
|
||||
RegisterType(RFPDlgWindow);
|
||||
{$ifndef NODEBUG}
|
||||
RegisterType(RGDBWindow);
|
||||
RegisterType(RGDBSourceEditor);
|
||||
{$endif NODEBUG}
|
||||
end;
|
||||
|
||||
|
||||
END.
|
||||
{
|
||||
$Log$
|
||||
Revision 1.52 2004-12-19 13:55:42 florian
|
||||
Revision 1.53 2004-12-22 15:24:07 peter
|
||||
* fixed NODEBUG
|
||||
* set default target to the default target of the compiler
|
||||
|
||||
Revision 1.52 2004/12/19 13:55:42 florian
|
||||
* x86_64 compilation fixed
|
||||
|
||||
Revision 1.51 2004/11/20 14:21:19 florian
|
||||
|
||||
Loading…
Reference in New Issue
Block a user