summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--compiler/aoptda.pas8
-rw-r--r--compiler/i386/daopt386.pas14
-rw-r--r--compiler/link.pas2
-rw-r--r--compiler/ncal.pas1
-rw-r--r--compiler/ncgflw.pas8
-rw-r--r--compiler/ncnv.pas2
-rw-r--r--compiler/powerpc/agppcmpw.pas5
-rw-r--r--compiler/powerpc/cpupi.pas3
-rw-r--r--compiler/powerpc64/cpupi.pas5
-rw-r--r--compiler/symsym.pas3
-rw-r--r--compiler/symtable.pas3
-rw-r--r--packages/fcl-image/src/fpcolhash.pas4
-rw-r--r--packages/fcl-image/src/fpreadbmp.pp2
-rw-r--r--packages/fcl-net/src/mkxmlrpc.pp4
-rw-r--r--packages/fcl-net/src/ssockets.pp4
-rw-r--r--packages/fcl-xml/src/xpath.pp5
-rw-r--r--packages/fpgtk/src/fpgtk.pp10
-rw-r--r--utils/fpdoc/dglobals.pp12
-rw-r--r--utils/fpdoc/dw_html.pp6
-rw-r--r--utils/fpdoc/dwriter.pp4
20 files changed, 56 insertions, 49 deletions
diff --git a/compiler/aoptda.pas b/compiler/aoptda.pas
index 60b1b6bdca..e7e0030ae2 100644
--- a/compiler/aoptda.pas
+++ b/compiler/aoptda.pas
@@ -36,6 +36,10 @@ Unit aoptda;
TAOptDFA = class
{ uses the same constructor as TAoptCpu = constructor from TAoptObj }
+ { How many instructions are between the current instruction and the }
+ { last one that modified the register }
+ InstrSinceLastMod: TInstrSinceLastMod;
+
{ gathers the information regarding the contents of every register }
{ at the end of every instruction }
Procedure DoDFA;
@@ -43,10 +47,6 @@ Unit aoptda;
{ handles the processor dependent dataflow analizing }
Procedure CpuDFA(p: PInstr); Virtual; Abstract;
- { How many instructions are between the current instruction and the }
- { last one that modified the register }
- InstrSinceLastMod: TInstrSinceLastMod;
-
{ convert a TInsChange value into the corresponding register }
//!!!!!!!!!! Function TCh2Reg(Ch: TInsChange): TRegister; Virtual;
{ returns whether the instruction P reads from register Reg }
diff --git a/compiler/i386/daopt386.pas b/compiler/i386/daopt386.pas
index f2e16674da..0e91c9b9c3 100644
--- a/compiler/i386/daopt386.pas
+++ b/compiler/i386/daopt386.pas
@@ -218,13 +218,6 @@ type
function getlabelwithsym(sym: tasmlabel): tai;
private
- { Walks through the list to find the lowest and highest label number, inits the }
- { labeltable and fixes/optimizes some regallocs }
- procedure initlabeltable;
-
- function initdfapass2: boolean;
- procedure dodfapass2;
-
{ asm list we're working on }
list: TAsmList;
@@ -240,6 +233,13 @@ type
{ all labels in the current block: their value mapped to their location }
lolab, hilab, labdif: longint;
labeltable: plabeltable;
+
+ { Walks through the list to find the lowest and highest label number, inits the }
+ { labeltable and fixes/optimizes some regallocs }
+ procedure initlabeltable;
+
+ function initdfapass2: boolean;
+ procedure dodfapass2;
end;
diff --git a/compiler/link.pas b/compiler/link.pas
index f6646a1bd2..68052ad457 100644
--- a/compiler/link.pas
+++ b/compiler/link.pas
@@ -100,12 +100,12 @@ interface
procedure PrintLinkerScript;
function RunLinkScript(const outputname:TCmdStr):boolean;
protected
+ linkscript : TCmdStrList;
property CObjInput:TObjInputClass read FCObjInput write FCObjInput;
property CExeOutput:TExeOutputClass read FCExeOutput write FCExeOutput;
property StaticLibraryList:TFPHashObjectList read FStaticLibraryList;
property ImportLibraryList:TFPHashObjectList read FImportLibraryList;
procedure DefaultLinkScript;virtual;abstract;
- linkscript : TCmdStrList;
public
IsSharedLibrary : boolean;
Constructor Create;override;
diff --git a/compiler/ncal.pas b/compiler/ncal.pas
index 55545bb2c9..ca432afb70 100644
--- a/compiler/ncal.pas
+++ b/compiler/ncal.pas
@@ -75,6 +75,7 @@ interface
procedure register_created_object_types;
+ private
{ inlining support }
inlinelocals : TFPObjectList;
inlineinitstatement,
diff --git a/compiler/ncgflw.pas b/compiler/ncgflw.pas
index e146778927..3726f49d00 100644
--- a/compiler/ncgflw.pas
+++ b/compiler/ncgflw.pas
@@ -31,10 +31,10 @@ interface
type
tcgwhilerepeatnode = class(twhilerepeatnode)
+ usedregvars: tusedregvars;
+
procedure pass_generate_code;override;
procedure sync_regvars(checkusedregvars: boolean);
-
- usedregvars: tusedregvars;
end;
tcgifnode = class(tifnode)
@@ -42,10 +42,10 @@ interface
end;
tcgfornode = class(tfornode)
+ usedregvars: tusedregvars;
+
procedure pass_generate_code;override;
procedure sync_regvars(checkusedregvars: boolean);
-
- usedregvars: tusedregvars;
end;
tcgexitnode = class(texitnode)
diff --git a/compiler/ncnv.pas b/compiler/ncnv.pas
index 9773dcd3ba..0f185f0598 100644
--- a/compiler/ncnv.pas
+++ b/compiler/ncnv.pas
@@ -189,13 +189,13 @@ interface
ttypeconvnodeclass = class of ttypeconvnode;
tasnode = class(tbinarynode)
+ call: tnode;
constructor create(l,r : tnode);virtual;
function pass_1 : tnode;override;
function pass_typecheck:tnode;override;
function dogetcopy: tnode;override;
function docompare(p: tnode): boolean; override;
destructor destroy; override;
- call: tnode;
end;
tasnodeclass = class of tasnode;
diff --git a/compiler/powerpc/agppcmpw.pas b/compiler/powerpc/agppcmpw.pas
index bd43997957..8c6304d6af 100644
--- a/compiler/powerpc/agppcmpw.pas
+++ b/compiler/powerpc/agppcmpw.pas
@@ -41,11 +41,12 @@ interface
procedure WriteExternals;
procedure WriteAsmFileHeader;
private
+ cur_CSECT_name: String;
+ cur_CSECT_class: String;
+
procedure WriteInstruction(hp : tai);
procedure WriteProcedureHeader(var hp:tai);
procedure WriteDataHeader(var s:string; isExported, isConst:boolean);
- cur_CSECT_name: String;
- cur_CSECT_class: String;
end;
diff --git a/compiler/powerpc/cpupi.pas b/compiler/powerpc/cpupi.pas
index b7ec2aae3d..3efec0189a 100644
--- a/compiler/powerpc/cpupi.pas
+++ b/compiler/powerpc/cpupi.pas
@@ -47,10 +47,11 @@ unit cpupi;
private
first_save_int_reg, first_save_fpu_reg: tsuperregister;
public
+ needs_frame_pointer: boolean;
+
property get_first_save_int_reg: tsuperregister read first_save_int_reg;
property get_first_save_fpu_reg: tsuperregister read first_save_fpu_reg;
- needs_frame_pointer: boolean;
end;
diff --git a/compiler/powerpc64/cpupi.pas b/compiler/powerpc64/cpupi.pas
index d21a2c8e26..b5be0df730 100644
--- a/compiler/powerpc64/cpupi.pas
+++ b/compiler/powerpc64/cpupi.pas
@@ -37,13 +37,14 @@ type
{ offset where the frame pointer from the outer procedure is stored. }
parent_framepointer_offset: longint;
+
+ needs_frame_pointer : boolean;
+
constructor create(aparent: tprocinfo); override;
procedure set_first_temp_offset; override;
function calc_stackframe_size: longint; override;
function calc_stackframe_size(numgpr, numfpr : longint): longint;
- needs_frame_pointer : boolean;
-
procedure allocate_got_register(list: TAsmList); override;
end;
diff --git a/compiler/symsym.pas b/compiler/symsym.pas
index b670f7c834..5d758d64e0 100644
--- a/compiler/symsym.pas
+++ b/compiler/symsym.pas
@@ -137,9 +137,10 @@ interface
callback:Tnotification_callback):cardinal;
procedure unregister_notification(id:cardinal);
private
- procedure setvardef(def:tdef);
_vardef : tdef;
vardefderef : tderef;
+
+ procedure setvardef(def:tdef);
public
property vardef: tdef read _vardef write setvardef;
end;
diff --git a/compiler/symtable.pas b/compiler/symtable.pas
index ca53259251..1bbe1a7294 100644
--- a/compiler/symtable.pas
+++ b/compiler/symtable.pas
@@ -91,12 +91,11 @@ interface
procedure insertdef(def:TDefEntry);override;
function is_packed: boolean;
protected
- procedure setdatasize(val: aint);
_datasize : aint;
{ size in bits of the data in case of bitpacked record. Only important during construction, }
{ no need to save in/restore from ppu file. datasize is always (databitsize+7) div 8. }
databitsize : aint;
- { bitpacked? -> all fieldvarsym offsets are in bits instead of bytes }
+ procedure setdatasize(val: aint);
public
property datasize : aint read _datasize write setdatasize;
end;
diff --git a/packages/fcl-image/src/fpcolhash.pas b/packages/fcl-image/src/fpcolhash.pas
index 6ef40e462e..3d450ce4c0 100644
--- a/packages/fcl-image/src/fpcolhash.pas
+++ b/packages/fcl-image/src/fpcolhash.pas
@@ -71,8 +71,8 @@ type
private
Root : PColHashMainNode;
AllIntegers : boolean;
- procedure FreeAllData;
FCount : longword;
+ procedure FreeAllData;
function AllocateMainNode : PColHashMainNode;
function AllocateSubNode : PColHashSubNode;
procedure DeallocateLinkedList(node : PColHashSubNode);
@@ -409,4 +409,4 @@ begin
end;
end;
-end. \ No newline at end of file
+end.
diff --git a/packages/fcl-image/src/fpreadbmp.pp b/packages/fcl-image/src/fpreadbmp.pp
index d52e0e300b..ded68c031c 100644
--- a/packages/fcl-image/src/fpreadbmp.pp
+++ b/packages/fcl-image/src/fpreadbmp.pp
@@ -32,7 +32,6 @@ uses FPImage, classes, sysutils, BMPcomn;
type
TFPReaderBMP = class (TFPCustomImageReader)
Private
- Procedure FreeBufs; // Free (and nil) buffers.
DeltaX, DeltaY : integer; // Used for the never-used delta option in RLE
TopDown : boolean; // If set, bitmap is stored top down instead of bottom up
continue : boolean; // needed for onprogress event
@@ -40,6 +39,7 @@ type
percentinterval : longword;
percentacc : longword;
Rect : TRect;
+ Procedure FreeBufs; // Free (and nil) buffers.
protected
ReadSize : Integer; // Size (in bytes) of 1 scanline.
BFI : TBitMapInfoHeader; // The header as read from the stream.
diff --git a/packages/fcl-net/src/mkxmlrpc.pp b/packages/fcl-net/src/mkxmlrpc.pp
index 10113404b3..b78633ee68 100644
--- a/packages/fcl-net/src/mkxmlrpc.pp
+++ b/packages/fcl-net/src/mkxmlrpc.pp
@@ -47,11 +47,11 @@ type
end;
TRPCList = class
+ ServerClasses: TList;
+ UsedModules: TStringList;
constructor Create;
destructor Destroy; override;
procedure AddServerClass(const AClassName: String);
- ServerClasses: TList;
- UsedModules: TStringList;
end;
var
diff --git a/packages/fcl-net/src/ssockets.pp b/packages/fcl-net/src/ssockets.pp
index 9a5c8fc80e..62d8df8a32 100644
--- a/packages/fcl-net/src/ssockets.pp
+++ b/packages/fcl-net/src/ssockets.pp
@@ -109,10 +109,10 @@ type
TInetServer = Class(TSocketServer)
Protected
FAddr : TINetSockAddr;
- Function SockToStream (ASocket : Longint) : TSocketStream;Override;
- Function Accept : Longint;override;
FPort : Word;
FHost: string;
+ Function SockToStream (ASocket : Longint) : TSocketStream;Override;
+ Function Accept : Longint;override;
Public
Procedure Bind; Override;
Constructor Create(APort: Word);
diff --git a/packages/fcl-xml/src/xpath.pp b/packages/fcl-xml/src/xpath.pp
index 507c85131f..270287b00d 100644
--- a/packages/fcl-xml/src/xpath.pp
+++ b/packages/fcl-xml/src/xpath.pp
@@ -385,11 +385,12 @@ type
TXPathContext = class
public
- constructor Create(AContextNode: TDOMNode;
- AContextPosition, AContextSize: Integer);
ContextNode: TDOMNode;
ContextPosition: Integer;
ContextSize: Integer;
+
+ constructor Create(AContextNode: TDOMNode;
+ AContextPosition, AContextSize: Integer);
end;
diff --git a/packages/fpgtk/src/fpgtk.pp b/packages/fpgtk/src/fpgtk.pp
index b2543bf8e3..7abed11420 100644
--- a/packages/fpgtk/src/fpgtk.pp
+++ b/packages/fpgtk/src/fpgtk.pp
@@ -606,9 +606,9 @@ TYPE
Protected
procedure CreateGtkObject; override;
Public
- function TheGtkObject : PGtkImage;
FMask:PGdkBitMap;
FImage:PGdkImage;
+ function TheGtkObject : PGtkImage;
property Image : PGdkImage read GetImageProp write SetImageProp;
property Mask : PGdkBitMap read GetMask write SetMask;
procedure SetImage (anImage:PGdkImage; aMask:PGdkBitmap);
@@ -629,9 +629,9 @@ TYPE
Protected
procedure CreateGtkObject; override;
Public
- function TheGtkObject : PGtkPixmap;
FMask:PGdkBitMap;
FPixMap:PGdkPixmap;
+ function TheGtkObject : PGtkPixmap;
property BuildInsensitive : longbool read GetBuildInsensitive write SetBuildInsensitive;
constructor Create;
constructor CreateFromFile (Filename:string; Window:TFPgtkWidget);
@@ -655,8 +655,8 @@ TYPE
procedure SetBorder (TheValue : integer);
function GetChildren : TFPgtkWidgetGroup;
Public
- function TheGtkObject : PGtkContainer;
FChildren:TFPgtkWidgetGroup;
+ function TheGtkObject : PGtkContainer;
property Border : integer read GetBorder write SetBorder;
procedure Add (AWidget:TFPgtkWidget; IsVisible:boolean); Overload;
procedure Add (AWidget:TFPgtkWidget); Overload;
@@ -802,8 +802,8 @@ TYPE
Protected
procedure CreateGtkObject; Override;
Public
- function TheGtkObject : PGtkRadioButton;
FGroup:TFPgtkRadioButtonGroup;
+ function TheGtkObject : PGtkRadioButton;
constructor Create (AGroup:TFPgtkRadioButtonGroup);
constructor CreateWithLabel (AGroup:TFPgtkRadioButtonGroup; aText:string);
end;
@@ -1957,8 +1957,8 @@ TYPE
procedure GtkInsert (MenuItem:TFPgtkWidget; position:integer); Override;
procedure GtkAppend (MenuItem:TFPgtkWidget); Override;
Public
- function TheGtkObject : PGtkMenu;
FDetacher:TFPgtkMenuDetachFunction;
+ function TheGtkObject : PGtkMenu;
procedure ReorderChild (MenuItem:TFPgtkWidget; position:integer);
procedure Popup (button:guint); Overload;
procedure Popup (ParentShell:TFPgtkWidget; ParentItem:TFPgtkWidget; func:TFPgtkMenuPosFunction; data:pointer; button:guint; ActivateTime:guint32); Overload;
diff --git a/utils/fpdoc/dglobals.pp b/utils/fpdoc/dglobals.pp
index 1523377175..4ada890af0 100644
--- a/utils/fpdoc/dglobals.pp
+++ b/utils/fpdoc/dglobals.pp
@@ -262,6 +262,12 @@ type
CurModule: TPasModule;
CurPackageDocNode: TDocNode;
public
+ Output: String;
+ HasContentFile: Boolean;
+ HidePrivate: Boolean; // Hide private class members in output?
+ HideProtected: Boolean; // Hide protected class members in output?
+ WarnNoNode : Boolean; // Warn if no description node found for element.
+
constructor Create;
destructor Destroy; override;
procedure SetPackageName(const APackageName: String);
@@ -295,12 +301,6 @@ type
property RootLinkNode: TLinkNode read FRootLinkNode;
property RootDocNode: TDocNode read FRootDocNode;
property Package: TPasPackage read FPackage;
-
- Output: String;
- HasContentFile: Boolean;
- HidePrivate: Boolean; // Hide private class members in output?
- HideProtected: Boolean; // Hide protected class members in output?
- WarnNoNode : Boolean; // Warn if no description node found for element.
end;
diff --git a/utils/fpdoc/dw_html.pp b/utils/fpdoc/dw_html.pp
index 0d5656279b..ca931faeb6 100644
--- a/utils/fpdoc/dw_html.pp
+++ b/utils/fpdoc/dw_html.pp
@@ -90,7 +90,6 @@ type
procedure SetOnTest(const AValue: TNotifyEvent);
protected
FAllocator: TFileAllocator;
- Procedure CreateAllocator; virtual;
CurDirectory: String; // relative to curdir of process
BaseDirectory: String; // relative path to package base directory
PageInfos: TObjectList; // list of TPageInfo objects
@@ -111,6 +110,8 @@ type
FIndexColCount : Integer;
FSearchPage : String;
FBaseImageURL : String;
+
+ Procedure CreateAllocator; virtual;
function ResolveLinkID(const Name: String): DOMString;
function ResolveLinkIDInUnit(const Name,UnitName: String): DOMString;
function ResolveLinkWithinPackage(AElement: TPasElement;
@@ -423,10 +424,11 @@ Type
{ TLinkData }
TLinkData = Class(TObject)
- Constructor Create(Const APathName,ALink,AModuleName : string);
FPathName,
FLink,
FModuleName : String;
+
+ Constructor Create(Const APathName,ALink,AModuleName : string);
end;
{ TLinkData }
diff --git a/utils/fpdoc/dwriter.pp b/utils/fpdoc/dwriter.pp
index 21368507d2..fb18a470a8 100644
--- a/utils/fpdoc/dwriter.pp
+++ b/utils/fpdoc/dwriter.pp
@@ -55,12 +55,12 @@ type
// Phony element for pas pages.
TTopicElement = Class(TPaselement)
- Constructor Create(const AName: String; AParent: TPasElement); override;
- Destructor Destroy; override;
TopicNode : TDocNode;
Previous,
Next : TPasElement;
Subtopics : TList;
+ Constructor Create(const AName: String; AParent: TPasElement); override;
+ Destructor Destroy; override;
end;
{ TFPDocWriter }
View Lorry Controller Status