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

* RTL, fpc_val_int64_shortstr and fpc_val_qword_shortstr: variable 'u' does not have to be 64-bit because it only takes values 0 to 15. Changing to sizeint improves code quality on 32-bit targets.

Browse Source 
* fpc_val_uint_shortstr and fpc_val_qword_shortstr: variable 'prev' is not needed, removed.
* ShortCompareText: variable 'i' type changed from integer to sizeint; integer is 16-bit here, resulting in suboptimal code on non-x86.

git-svn-id: trunk@25159 -
This commit is contained in:
sergei 2013-07-22 10:13:03 +00:00
parent 6daadff427
commit b0153f1482
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
rtl/inc/sstrings.inc
View File

@ -1113,7 +1113,6 @@ Function int_Val_SInt_ShortStr(DestSize: SizeInt; Const S: ShortString; out Code
Function fpc_Val_UInt_Shortstr(Const S: ShortString; out Code: ValSInt): ValUInt; [public, alias:'FPC_VAL_UINT_SHORTSTR']; compilerproc; Function fpc_Val_UInt_Shortstr(Const S: ShortString; out Code: ValSInt): ValUInt; [public, alias:'FPC_VAL_UINT_SHORTSTR']; compilerproc;
var var
prev : ValUInt;
base,u : byte; base,u : byte;
negative : boolean; negative : boolean;
begin begin
@ -1137,9 +1136,8 @@ begin
else else
u:=16; u:=16;
end; end;
prev := fpc_Val_UInt_Shortstr;
If (u>=base) or If (u>=base) or
(ValUInt(MaxUIntValue-u) div ValUInt(Base)<prev) then (ValUInt(MaxUIntValue-u) div ValUInt(Base)<fpc_val_uint_shortstr) then
begin begin
fpc_Val_UInt_Shortstr:=0; fpc_Val_UInt_Shortstr:=0;
exit; exit;
@ -1155,7 +1153,8 @@ end;
Function fpc_val_int64_shortstr(Const S: ShortString; out Code: ValSInt): Int64; [public, alias:'FPC_VAL_INT64_SHORTSTR']; compilerproc; Function fpc_val_int64_shortstr(Const S: ShortString; out Code: ValSInt): Int64; [public, alias:'FPC_VAL_INT64_SHORTSTR']; compilerproc;
var u, temp, prev, maxprevvalue, maxnewvalue : qword; var u : sizeuint;
temp, prev, maxprevvalue, maxnewvalue : qword;
base : byte; base : byte;
negative : boolean; negative : boolean;
@ -1211,7 +1210,7 @@ end;
Function fpc_val_qword_shortstr(Const S: ShortString; out Code: ValSInt): QWord; [public, alias:'FPC_VAL_QWORD_SHORTSTR']; compilerproc; Function fpc_val_qword_shortstr(Const S: ShortString; out Code: ValSInt): QWord; [public, alias:'FPC_VAL_QWORD_SHORTSTR']; compilerproc;
var u, prev: QWord; var u : sizeuint;
base : byte; base : byte;
negative : boolean; negative : boolean;
@ -1238,9 +1237,8 @@ end;
else else
u:=16; u:=16;
end; end;
prev := fpc_val_qword_shortstr;
If (u>=base) or If (u>=base) or
((QWord(maxqword-u) div QWord(base))<prev) then ((QWord(maxqword-u) div QWord(base))<fpc_val_qword_shortstr) then
Begin Begin
fpc_val_qword_shortstr := 0; fpc_val_qword_shortstr := 0;
Exit Exit
@ -1902,7 +1900,7 @@ end;
function ShortCompareText(const S1, S2: shortstring): SizeInt; function ShortCompareText(const S1, S2: shortstring): SizeInt;
var var
c1, c2: Byte; c1, c2: Byte;
i: Integer; i: SizeInt;
L1, L2, Count: SizeInt; L1, L2, Count: SizeInt;
P1, P2: PChar; P1, P2: PChar;
begin begin