mirror of
https://gitlab.com/freepascal.org/fpc/source.git
synced 2025-04-08 10:48:12 +02:00
+ Removed INTERNCOPY define
git-svn-id: trunk@259 -
This commit is contained in:
parent
a20556e62d
commit
db5d9d75aa
@ -998,11 +998,7 @@ begin
|
||||
end;
|
||||
|
||||
|
||||
{$ifdef interncopy}
|
||||
procedure fpc_shortstr_assign(len:longint;sstr,dstr:pointer);[public,alias:'FPC_SHORTSTR_ASSIGN'];
|
||||
{$else}
|
||||
procedure fpc_shortstr_copy(len:longint;sstr,dstr:pointer);[public,alias:'FPC_SHORTSTR_COPY'];
|
||||
{$endif}
|
||||
begin
|
||||
asm
|
||||
pushl %eax
|
||||
|
@ -555,11 +555,7 @@ begin
|
||||
move(Str[1],S[ofs+1],length(Str)+1);
|
||||
end;
|
||||
|
||||
{$ifdef interncopy}
|
||||
Function Fpc_Ansistr_Copy (Const S : AnsiString; Index,Size : SizeInt) : AnsiString;compilerproc;
|
||||
{$else}
|
||||
Function Copy (Const S : AnsiString; Index,Size : SizeInt) : AnsiString;
|
||||
{$endif}
|
||||
var
|
||||
ResultAddress : Pointer;
|
||||
begin
|
||||
@ -584,11 +580,7 @@ begin
|
||||
PByte(ResultAddress+Size)^:=0;
|
||||
end;
|
||||
end;
|
||||
{$ifdef interncopy}
|
||||
Pointer(fpc_ansistr_Copy):=ResultAddress;
|
||||
{$else}
|
||||
Pointer(Copy):=ResultAddress;
|
||||
{$endif}
|
||||
end;
|
||||
|
||||
|
||||
|
@ -546,11 +546,7 @@ begin
|
||||
result[0]:=chr(len);
|
||||
end;
|
||||
|
||||
{$ifdef interncopy}
|
||||
procedure fpc_shortstr_assign(len:longint;sstr,dstr:pointer);[public,alias:'FPC_SHORTSTR_ASSIGN']; {$ifdef HAS_COMPILER_PROC} compilerproc; {$endif}
|
||||
{$else}
|
||||
procedure fpc_shortstr_copy(len:longint;sstr,dstr:pointer);[public,alias:'FPC_SHORTSTR_COPY']; {$ifdef HAS_COMPILER_PROC} compilerproc; {$endif}
|
||||
{$endif}
|
||||
var
|
||||
slen : byte;
|
||||
type
|
||||
|
@ -22,11 +22,7 @@ begin
|
||||
s[0]:=chr(len);
|
||||
end;
|
||||
|
||||
{$ifdef interncopy}
|
||||
function fpc_shortstr_copy(const s : shortstring;index : SizeInt;count : SizeInt): shortstring;compilerproc;
|
||||
{$else}
|
||||
function copy(const s : shortstring;index : SizeInt;count : SizeInt): shortstring;
|
||||
{$endif}
|
||||
begin
|
||||
if count<0 then
|
||||
count:=0;
|
||||
@ -39,13 +35,8 @@ begin
|
||||
else
|
||||
if count>length(s)-index then
|
||||
count:=length(s)-index;
|
||||
{$ifdef interncopy}
|
||||
fpc_shortstr_Copy[0]:=chr(Count);
|
||||
Move(s[Index+1],fpc_shortstr_Copy[1],Count);
|
||||
{$else}
|
||||
Copy[0]:=chr(Count);
|
||||
Move(s[Index+1],Copy[1],Count);
|
||||
{$endif}
|
||||
end;
|
||||
|
||||
|
||||
|
@ -462,9 +462,6 @@ function strpas(p:pchar):shortstring;external name 'FPC_PCHAR_TO_SHORTSTR';
|
||||
function strlen(p:pchar):longint;external name 'FPC_PCHAR_LENGTH';
|
||||
|
||||
{ Shortstring functions }
|
||||
{$ifndef InternCopy}
|
||||
Function Copy(const s:shortstring;index:SizeInt;count:SizeInt):shortstring;
|
||||
{$endif interncopy}
|
||||
Procedure Delete(Var s:shortstring;index:SizeInt;count:SizeInt);
|
||||
Procedure Insert(const source:shortstring;Var s:shortstring;index:SizeInt);
|
||||
Procedure Insert(source:Char;Var s:shortstring;index:SizeInt);
|
||||
@ -491,9 +488,6 @@ Function Chr(b:byte):Char;
|
||||
{$endif}
|
||||
Function upCase(c:Char):Char;
|
||||
Function lowerCase(c:Char):Char; overload;
|
||||
{$ifndef InternCopy}
|
||||
function copy(c:char;index : SizeInt;count : SizeInt): shortstring;
|
||||
{$endif interncopy}
|
||||
function pos(const substr : shortstring;c:char): SizeInt;
|
||||
|
||||
|
||||
@ -502,9 +496,6 @@ function pos(const substr : shortstring;c:char): SizeInt;
|
||||
****************************************************************************}
|
||||
|
||||
Procedure UniqueString(Var S : AnsiString);external name 'FPC_ANSISTR_UNIQUE';
|
||||
{$ifndef InternCopy}
|
||||
Function Copy (Const S : AnsiString; Index,Size : SizeInt) : AnsiString;
|
||||
{$endif interncopy}
|
||||
Function Pos (Const Substr : AnsiString; Const Source : AnsiString) : SizeInt;
|
||||
Function Pos (c : Char; Const s : AnsiString) : SizeInt;
|
||||
Procedure Insert (Const Source : AnsiString; Var S : AnsiString; Index : SizeInt);
|
||||
|
@ -16,9 +16,6 @@
|
||||
|
||||
|
||||
procedure UniqueString(Var S : WideString);external name 'FPC_WIDESTR_UNIQUE';
|
||||
{$ifndef InternCopy}
|
||||
Function Copy (Const S : WideString; Index,Size : SizeInt) : WideString;
|
||||
{$endif interncopy}
|
||||
Function Pos (Const Substr : WideString; Const Source : WideString) : SizeInt;
|
||||
Function Pos (c : Char; Const s : WideString) : SizeInt;
|
||||
Function Pos (c : WideChar; Const s : WideString) : SizeInt;
|
||||
|
@ -855,11 +855,7 @@ begin
|
||||
end;
|
||||
|
||||
|
||||
{$ifdef interncopy}
|
||||
Function Fpc_WideStr_Copy (Const S : WideString; Index,Size : SizeInt) : WideString;compilerproc;
|
||||
{$else}
|
||||
Function Copy (Const S : WideString; Index,Size : SizeInt) : WideString;
|
||||
{$endif}
|
||||
var
|
||||
ResultAddress : Pointer;
|
||||
begin
|
||||
@ -884,11 +880,7 @@ begin
|
||||
PWideChar(ResultAddress+Size*sizeof(WideChar))^:=#0;
|
||||
end;
|
||||
end;
|
||||
{$ifdef interncopy}
|
||||
Pointer(fpc_widestr_Copy):=ResultAddress;
|
||||
{$else}
|
||||
Pointer(Copy):=ResultAddress;
|
||||
{$endif}
|
||||
end;
|
||||
|
||||
|
||||
|
@ -830,11 +830,7 @@ asm
|
||||
end;
|
||||
|
||||
|
||||
{$ifdef interncopy}
|
||||
procedure fpc_shortstr_assign(len:longint;sstr,dstr:pointer);[public,alias:'FPC_SHORTSTR_ASSIGN'];
|
||||
{$else}
|
||||
procedure fpc_shortstr_copy(len:longint;sstr,dstr:pointer);[public,alias:'FPC_SHORTSTR_COPY'];
|
||||
{$endif}
|
||||
assembler; nostackframe;
|
||||
{ input: r3: len, r4: sstr, r5: dstr }
|
||||
asm
|
||||
|
Loading…
Reference in New Issue
Block a user