+ Removed INTERNCOPY define

git-svn-id: trunk@259 -
This commit is contained in:
michael 2005-06-07 21:11:49 +00:00
parent a20556e62d
commit db5d9d75aa
8 changed files with 0 additions and 49 deletions

View File

@ -998,11 +998,7 @@ begin
end; end;
{$ifdef interncopy}
procedure fpc_shortstr_assign(len:longint;sstr,dstr:pointer);[public,alias:'FPC_SHORTSTR_ASSIGN']; 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 begin
asm asm
pushl %eax pushl %eax

View File

@ -555,11 +555,7 @@ begin
move(Str[1],S[ofs+1],length(Str)+1); move(Str[1],S[ofs+1],length(Str)+1);
end; end;
{$ifdef interncopy}
Function Fpc_Ansistr_Copy (Const S : AnsiString; Index,Size : SizeInt) : AnsiString;compilerproc; Function Fpc_Ansistr_Copy (Const S : AnsiString; Index,Size : SizeInt) : AnsiString;compilerproc;
{$else}
Function Copy (Const S : AnsiString; Index,Size : SizeInt) : AnsiString;
{$endif}
var var
ResultAddress : Pointer; ResultAddress : Pointer;
begin begin
@ -584,11 +580,7 @@ begin
PByte(ResultAddress+Size)^:=0; PByte(ResultAddress+Size)^:=0;
end; end;
end; end;
{$ifdef interncopy}
Pointer(fpc_ansistr_Copy):=ResultAddress; Pointer(fpc_ansistr_Copy):=ResultAddress;
{$else}
Pointer(Copy):=ResultAddress;
{$endif}
end; end;

View File

@ -546,11 +546,7 @@ begin
result[0]:=chr(len); result[0]:=chr(len);
end; end;
{$ifdef interncopy}
procedure fpc_shortstr_assign(len:longint;sstr,dstr:pointer);[public,alias:'FPC_SHORTSTR_ASSIGN']; {$ifdef HAS_COMPILER_PROC} compilerproc; {$endif} 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 var
slen : byte; slen : byte;
type type

View File

@ -22,11 +22,7 @@ begin
s[0]:=chr(len); s[0]:=chr(len);
end; end;
{$ifdef interncopy}
function fpc_shortstr_copy(const s : shortstring;index : SizeInt;count : SizeInt): shortstring;compilerproc; 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 begin
if count<0 then if count<0 then
count:=0; count:=0;
@ -39,13 +35,8 @@ begin
else else
if count>length(s)-index then if count>length(s)-index then
count:=length(s)-index; count:=length(s)-index;
{$ifdef interncopy}
fpc_shortstr_Copy[0]:=chr(Count); fpc_shortstr_Copy[0]:=chr(Count);
Move(s[Index+1],fpc_shortstr_Copy[1],Count); Move(s[Index+1],fpc_shortstr_Copy[1],Count);
{$else}
Copy[0]:=chr(Count);
Move(s[Index+1],Copy[1],Count);
{$endif}
end; end;

View File

@ -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'; function strlen(p:pchar):longint;external name 'FPC_PCHAR_LENGTH';
{ Shortstring functions } { 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 Delete(Var s:shortstring;index:SizeInt;count:SizeInt);
Procedure Insert(const source:shortstring;Var s:shortstring;index:SizeInt); Procedure Insert(const source:shortstring;Var s:shortstring;index:SizeInt);
Procedure Insert(source:Char;Var s:shortstring;index:SizeInt); Procedure Insert(source:Char;Var s:shortstring;index:SizeInt);
@ -491,9 +488,6 @@ Function Chr(b:byte):Char;
{$endif} {$endif}
Function upCase(c:Char):Char; Function upCase(c:Char):Char;
Function lowerCase(c:Char):Char; overload; 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; 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'; 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 (Const Substr : AnsiString; Const Source : AnsiString) : SizeInt;
Function Pos (c : Char; Const s : AnsiString) : SizeInt; Function Pos (c : Char; Const s : AnsiString) : SizeInt;
Procedure Insert (Const Source : AnsiString; Var S : AnsiString; Index : SizeInt); Procedure Insert (Const Source : AnsiString; Var S : AnsiString; Index : SizeInt);

View File

@ -16,9 +16,6 @@
procedure UniqueString(Var S : WideString);external name 'FPC_WIDESTR_UNIQUE'; 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 (Const Substr : WideString; Const Source : WideString) : SizeInt;
Function Pos (c : Char; Const s : WideString) : SizeInt; Function Pos (c : Char; Const s : WideString) : SizeInt;
Function Pos (c : WideChar; Const s : WideString) : SizeInt; Function Pos (c : WideChar; Const s : WideString) : SizeInt;

View File

@ -855,11 +855,7 @@ begin
end; end;
{$ifdef interncopy}
Function Fpc_WideStr_Copy (Const S : WideString; Index,Size : SizeInt) : WideString;compilerproc; Function Fpc_WideStr_Copy (Const S : WideString; Index,Size : SizeInt) : WideString;compilerproc;
{$else}
Function Copy (Const S : WideString; Index,Size : SizeInt) : WideString;
{$endif}
var var
ResultAddress : Pointer; ResultAddress : Pointer;
begin begin
@ -884,11 +880,7 @@ begin
PWideChar(ResultAddress+Size*sizeof(WideChar))^:=#0; PWideChar(ResultAddress+Size*sizeof(WideChar))^:=#0;
end; end;
end; end;
{$ifdef interncopy}
Pointer(fpc_widestr_Copy):=ResultAddress; Pointer(fpc_widestr_Copy):=ResultAddress;
{$else}
Pointer(Copy):=ResultAddress;
{$endif}
end; end;

View File

@ -830,11 +830,7 @@ asm
end; end;
{$ifdef interncopy}
procedure fpc_shortstr_assign(len:longint;sstr,dstr:pointer);[public,alias:'FPC_SHORTSTR_ASSIGN']; 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; assembler; nostackframe;
{ input: r3: len, r4: sstr, r5: dstr } { input: r3: len, r4: sstr, r5: dstr }
asm asm