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

* inlined a few funcs, inlined the non threaded part of inc/declocked. The lock prefixed one

Browse Source 
remains a separate proc, as it is slow anyway.

git-svn-id: trunk@1339 -
This commit is contained in:
marco 2005-10-09 10:57:29 +00:00
parent 9e7d550455
commit 5c92d88da8
2 changed files with 60 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
rtl/i386/i386.inc
View File

@ -1073,7 +1073,7 @@ end;
{ do a thread save inc/dec } { do a thread save inc/dec }
{$define FPC_SYSTEM_HAS_DECLOCKED_LONGINT} {$define FPC_SYSTEM_HAS_DECLOCKED_LONGINT}
function declocked(var l : longint) : boolean;assembler; function cpudeclocked(var l : longint) : boolean;assembler;
asm asm
{$ifndef REGCALL} {$ifndef REGCALL}
@ -1081,19 +1081,13 @@ function declocked(var l : longint) : boolean;assembler;
{$endif} {$endif}
{ this check should be done because a lock takes a lot } { this check should be done because a lock takes a lot }
{ of time! } { of time! }
cmpb $0,IsMultithread
jz .Ldeclockednolock
lock lock
decl (%eax) decl (%eax)
jmp .Ldeclockedend
.Ldeclockednolock:
decl (%eax);
.Ldeclockedend:
setzb %al setzb %al
end; end;
{$define FPC_SYSTEM_HAS_INCLOCKED_LONGINT} {$define FPC_SYSTEM_HAS_INCLOCKED_LONGINT}
procedure inclocked(var l : longint);assembler; procedure cpuinclocked(var l : longint);assembler;
asm asm
{$ifndef REGCALL} {$ifndef REGCALL}
@ -1111,6 +1105,30 @@ procedure inclocked(var l : longint);assembler;
.Linclockedend: .Linclockedend:
end; end;
// inline SMP check and normal lock.
// the locked one is so slow, inlining doesn't matter.
function declocked(var l : longint) : boolean; inline;
begin
if not ismultithread then
begin
dec(l);
declocked:=l=0;
end
else
declocked:=cpudeclocked(l);
end;
procedure inclocked(var l : longint); inline;
begin
if not ismultithread then
inc(l)
else
cpuinclocked(l);
end;
{**************************************************************************** {****************************************************************************
FPU FPU
****************************************************************************} ****************************************************************************}

67
rtl/inc/astrings.inc
View File

@ -52,7 +52,7 @@ Const
Function NewAnsiString(Len : SizeInt) : Pointer; Function NewAnsiString(Len : SizeInt) : Pointer;
{ {
Allocate a new AnsiString on the heap. Allocate a new AnsiString on the heap.
initialize it to zero length and reference count 1. initialize it to zero length and reference count 1.
@ -73,7 +73,7 @@ begin
end; end;
Procedure DisposeAnsiString(Var S : Pointer); Procedure DisposeAnsiString(Var S : Pointer); inline;
{ {
Deallocates a AnsiString From the heap. Deallocates a AnsiString From the heap.
} }
@ -85,8 +85,7 @@ begin
S:=Nil; S:=Nil;
end; end;
Procedure fpc_AnsiStr_Decr_Ref (Var S : Pointer); [Public,Alias:'FPC_ANSISTR_DECR_REF']; compilerproc; inline;
Procedure fpc_AnsiStr_Decr_Ref (Var S : Pointer); [Public,Alias:'FPC_ANSISTR_DECR_REF']; compilerproc;
{ {
Decreases the ReferenceCount of a non constant ansistring; Decreases the ReferenceCount of a non constant ansistring;
If the reference count is zero, deallocate the string; If the reference count is zero, deallocate the string;
@ -101,7 +100,6 @@ Begin
{ check for constant strings ...} { check for constant strings ...}
l:=@PANSIREC(S-FirstOff)^.Ref; l:=@PANSIREC(S-FirstOff)^.Ref;
If l^<0 then exit; If l^<0 then exit;
{ declocked does a MT safe dec and returns true, if the counter is 0 } { declocked does a MT safe dec and returns true, if the counter is 0 }
If declocked(l^) then If declocked(l^) then
{ Ref count dropped to zero } { Ref count dropped to zero }
@ -111,7 +109,7 @@ end;
{ also define alias for internal use in the system unit } { also define alias for internal use in the system unit }
Procedure fpc_AnsiStr_Decr_Ref (Var S : Pointer); [external name 'FPC_ANSISTR_DECR_REF']; Procedure fpc_AnsiStr_Decr_Ref (Var S : Pointer); [external name 'FPC_ANSISTR_DECR_REF'];
Procedure fpc_AnsiStr_Incr_Ref (S : Pointer); [Public,Alias:'FPC_ANSISTR_INCR_REF']; compilerproc; Procedure fpc_AnsiStr_Incr_Ref (S : Pointer); [Public,Alias:'FPC_ANSISTR_INCR_REF']; compilerproc; inline;
Begin Begin
If S=Nil then If S=Nil then
exit; exit;
@ -412,21 +410,13 @@ end;
Public functions, In interface. Public functions, In interface.
*****************************************************************************} *****************************************************************************}
function fpc_truely_ansistr_unique(Var S : Pointer): Pointer;
Function fpc_ansistr_Unique(Var S : Pointer): Pointer; [Public,Alias : 'FPC_ANSISTR_UNIQUE']; compilerproc;
{
Make sure reference count of S is 1,
using copy-on-write semantics.
}
Var Var
SNew : Pointer; SNew : Pointer;
L : SizeInt; L : SizeInt;
begin begin
pointer(result) := pointer(s);
If Pointer(S)=Nil then
exit;
if PAnsiRec(Pointer(S)-Firstoff)^.Ref<>1 then
begin
L:=PAnsiRec(Pointer(S)-FirstOff)^.len; L:=PAnsiRec(Pointer(S)-FirstOff)^.len;
SNew:=NewAnsiString (L); SNew:=NewAnsiString (L);
Move (Pointer(S)^,SNew^,L+1); Move (Pointer(S)^,SNew^,L+1);
@ -434,17 +424,31 @@ begin
fpc_ansistr_decr_ref (Pointer(S)); { Thread safe } fpc_ansistr_decr_ref (Pointer(S)); { Thread safe }
pointer(S):=SNew; pointer(S):=SNew;
pointer(result):=SNew; pointer(result):=SNew;
end;
end; end;
Procedure fpc_ansistr_append_char(Var S : AnsiString;c : char); [Public,Alias : 'FPC_ANSISTR_APPEND_CHAR']; compilerproc; // MV: inline the basic checks for case that S is already unique.
// Rest is too complex to inline, so factor that out as a call.
Function fpc_ansistr_Unique(Var S : Pointer): Pointer; [Public,Alias : 'FPC_ANSISTR_UNIQUE']; compilerproc; inline;
{
Make sure reference count of S is 1,
using copy-on-write semantics.
}
begin
pointer(result) := pointer(s);
If Pointer(S)=Nil then
exit;
if PAnsiRec(Pointer(S)-Firstoff)^.Ref<>1 then
fpc_truely_ansistr_unique(s);
end;
Procedure fpc_ansistr_append_char(Var S : AnsiString;c : char); [Public,Alias : 'FPC_ANSISTR_APPEND_CHAR']; compilerproc; inline;
begin begin
SetLength(S,length(S)+1); SetLength(S,length(S)+1);
S[length(S)]:=c; S[length(S)]:=c;
PByte(Pointer(S)+length(S))^:=0; { Terminating Zero } PByte(Pointer(S)+length(S))^:=0; { Terminating Zero }
end; end;
Procedure fpc_ansistr_append_shortstring(Var S : AnsiString;Str : ShortString); [Public,Alias : 'FPC_ANSISTR_APPEND_SHORTSTRING']; compilerproc; Procedure fpc_ansistr_append_shortstring(Var S : AnsiString;Str : ShortString); [Public,Alias : 'FPC_ANSISTR_APPEND_SHORTSTRING']; compilerproc;
var var
ofs : SizeInt; ofs : SizeInt;
begin begin
@ -571,7 +575,7 @@ begin
end; end;
Function fpc_Val_Real_AnsiStr(Const S : AnsiString; Var Code : ValSInt): ValReal; [public, alias:'FPC_VAL_REAL_ANSISTR']; compilerproc; Function fpc_Val_Real_AnsiStr(Const S : AnsiString; Var Code : ValSInt): ValReal; [public, alias:'FPC_VAL_REAL_ANSISTR']; compilerproc; inline;
Var Var
SS : String; SS : String;
begin begin
@ -586,7 +590,7 @@ begin
end; end;
Function fpc_Val_UInt_AnsiStr (Const S : AnsiString; Var Code : ValSInt): ValUInt; [public, alias:'FPC_VAL_UINT_ANSISTR']; compilerproc; Function fpc_Val_UInt_AnsiStr (Const S : AnsiString; Var Code : ValSInt): ValUInt; [public, alias:'FPC_VAL_UINT_ANSISTR']; compilerproc; inline;
Var Var
SS : ShortString; SS : ShortString;
begin begin
@ -601,7 +605,7 @@ begin
end; end;
Function fpc_Val_SInt_AnsiStr (DestSize: SizeInt; Const S : AnsiString; Var Code : ValSInt): ValSInt; [public, alias:'FPC_VAL_SINT_ANSISTR']; compilerproc; Function fpc_Val_SInt_AnsiStr (DestSize: SizeInt; Const S : AnsiString; Var Code : ValSInt): ValSInt; [public, alias:'FPC_VAL_SINT_ANSISTR']; compilerproc; inline;
Var Var
SS : ShortString; SS : ShortString;
begin begin
@ -618,7 +622,7 @@ end;
{$ifndef CPU64} {$ifndef CPU64}
Function fpc_Val_qword_AnsiStr (Const S : AnsiString; Var Code : ValSInt): qword; [public, alias:'FPC_VAL_QWORD_ANSISTR']; compilerproc; Function fpc_Val_qword_AnsiStr (Const S : AnsiString; Var Code : ValSInt): qword; [public, alias:'FPC_VAL_QWORD_ANSISTR']; compilerproc; inline;
Var Var
SS : ShortString; SS : ShortString;
begin begin
@ -633,7 +637,7 @@ begin
end; end;
Function fpc_Val_int64_AnsiStr (Const S : AnsiString; Var Code : ValSInt): Int64; [public, alias:'FPC_VAL_INT64_ANSISTR']; compilerproc; Function fpc_Val_int64_AnsiStr (Const S : AnsiString; Var Code : ValSInt): Int64; [public, alias:'FPC_VAL_INT64_ANSISTR']; compilerproc; inline;
Var Var
SS : ShortString; SS : ShortString;
begin begin
@ -650,7 +654,7 @@ end;
{$endif CPU64} {$endif CPU64}
procedure fpc_AnsiStr_Float(d : ValReal;len,fr,rt : SizeInt;var s : ansistring);[public,alias:'FPC_ANSISTR_FLOAT']; compilerproc; procedure fpc_AnsiStr_Float(d : ValReal;len,fr,rt : SizeInt;var s : ansistring);[public,alias:'FPC_ANSISTR_FLOAT']; compilerproc; inline;
var var
ss: ShortString; ss: ShortString;
begin begin
@ -659,7 +663,7 @@ begin
end; end;
Procedure fpc_AnsiStr_UInt(v : ValUInt;Len : SizeInt; Var S : AnsiString);[Public,Alias : 'FPC_ANSISTR_VALUINT']; compilerproc; Procedure fpc_AnsiStr_UInt(v : ValUInt;Len : SizeInt; Var S : AnsiString);[Public,Alias : 'FPC_ANSISTR_VALUINT']; compilerproc; inline;
Var Var
SS : ShortString; SS : ShortString;
begin begin
@ -669,7 +673,7 @@ end;
Procedure fpc_AnsiStr_SInt(v : ValSInt;Len : SizeInt; Var S : AnsiString);[Public,Alias : 'FPC_ANSISTR_VALSINT']; compilerproc; Procedure fpc_AnsiStr_SInt(v : ValSInt;Len : SizeInt; Var S : AnsiString);[Public,Alias : 'FPC_ANSISTR_VALSINT']; compilerproc; inline;
Var Var
SS : ShortString; SS : ShortString;
begin begin
@ -680,7 +684,7 @@ end;
{$ifndef CPU64} {$ifndef CPU64}
Procedure fpc_AnsiStr_QWord(v : QWord;Len : SizeInt; Var S : AnsiString);[Public,Alias : 'FPC_ANSISTR_QWORD']; compilerproc; Procedure fpc_AnsiStr_QWord(v : QWord;Len : SizeInt; Var S : AnsiString);[Public,Alias : 'FPC_ANSISTR_QWORD']; compilerproc; inline;
Var Var
SS : ShortString; SS : ShortString;
begin begin
@ -688,9 +692,7 @@ begin
S:=SS; S:=SS;
end; end;
Procedure fpc_AnsiStr_Int64(v : Int64; Len : SizeInt; Var S : AnsiString);[Public,Alias : 'FPC_ANSISTR_INT64']; compilerproc; inline;
Procedure fpc_AnsiStr_Int64(v : Int64; Len : SizeInt; Var S : AnsiString);[Public,Alias : 'FPC_ANSISTR_INT64']; compilerproc;
Var Var
SS : ShortString; SS : ShortString;
begin begin
@ -700,7 +702,6 @@ end;
{$endif CPU64} {$endif CPU64}
Procedure Delete (Var S : AnsiString; Index,Size: SizeInt); Procedure Delete (Var S : AnsiString; Index,Size: SizeInt);
Var Var
LS : SizeInt; LS : SizeInt;
@ -750,7 +751,7 @@ begin
FillChar(Pointer(StringOfChar)^,Length(StringOfChar),c); FillChar(Pointer(StringOfChar)^,Length(StringOfChar),c);
end; end;
Procedure SetString (Var S : AnsiString; Buf : PChar; Len : SizeInt); Procedure SetString (Var S : AnsiString; Buf : PChar; Len : SizeInt); inline;
begin begin
SetLength(S,Len); SetLength(S,Len);
If (Buf<>Nil) then If (Buf<>Nil) then