paweld/lazarus-ccr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Fix 32bit Assembly version of PackArray and use it instead of the pascal one. Fixes 20016

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@1888 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
blikblum 2011-09-03 00:22:05 +00:00
parent ab06420f76
commit fd19284586
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
components/virtualtreeview-new/branches/4.8/VirtualTrees.pas
View File

@ -2411,7 +2411,7 @@ type
//lcl //lcl
procedure LoadPanningCursors; procedure LoadPanningCursors;
function MakeNewNode: PVirtualNode; function MakeNewNode: PVirtualNode;
function PackArrayAsm(TheArray: TNodeArray; Count: Integer): Integer; function PackArrayPascal(TheArray: TNodeArray; Count: Integer): Integer;
function PackArray(TheArray: TNodeArray; Count: Integer): Integer; function PackArray(TheArray: TNodeArray; Count: Integer): Integer;
procedure PrepareBitmaps(NeedButtons, NeedLines: Boolean); procedure PrepareBitmaps(NeedButtons, NeedLines: Boolean);
procedure SetAlignment(const Value: TAlignment); procedure SetAlignment(const Value: TAlignment);
@ -13160,7 +13160,7 @@ begin
end; end;
end; end;
function TBaseVirtualTree.PackArray(TheArray: TNodeArray; Count: Integer): Integer; function TBaseVirtualTree.PackArrayPascal(TheArray: TNodeArray; Count: Integer): Integer;
var var
i, l: Integer; i, l: Integer;
begin begin
@ -13184,7 +13184,9 @@ end;
//---------------------------------------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------------------------------------
function TBaseVirtualTree.PackArrayAsm(TheArray: TNodeArray; Count: Integer): Integer; assembler; {$IMPLICITEXCEPTIONS OFF}
function TBaseVirtualTree.PackArray(TheArray: TNodeArray; Count: Integer): Integer; assembler;
// Removes all entries from the selection array which are no longer in use. The selection array must be sorted for this // Removes all entries from the selection array which are no longer in use. The selection array must be sorted for this
// algo to work. Values which must be removed are marked with bit 0 (LSB) set. This little trick works because memory // algo to work. Values which must be removed are marked with bit 0 (LSB) set. This little trick works because memory
@ -13200,7 +13202,8 @@ asm
PUSH EBX PUSH EBX
PUSH EDI PUSH EDI
PUSH ESI PUSH ESI
MOV ESI, EDX MOV ECX, EDX //fpc: count is in EDX. Move to ECX
MOV ESI, [EBP+8] //fpc: TheArray is in EBP+8
MOV EDX, -1 MOV EDX, -1
JCXZ @@Finish // Empty list? JCXZ @@Finish // Empty list?
INC EDX // init remaining entries counter INC EDX // init remaining entries counter
@ -13238,6 +13241,7 @@ asm
POP EBX POP EBX
end; end;
{$IMPLICITEXCEPTIONS ON}
//---------------------------------------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------------------------------------
procedure TBaseVirtualTree.PrepareBitmaps(NeedButtons, NeedLines: Boolean); procedure TBaseVirtualTree.PrepareBitmaps(NeedButtons, NeedLines: Boolean);