Fixed: bug in Binary Tree where root node would not be assigned an index
Fixed: Hash() implementation
This commit is contained in:
parent
4d284957d4
commit
d3ae64e43d
@ -32,6 +32,6 @@
|
|||||||
-M
|
-M
|
||||||
-$M16384,1048576
|
-$M16384,1048576
|
||||||
-K$00400000
|
-K$00400000
|
||||||
-LE"c:\delphi6\Projects\Bpl"
|
-LE"c:\program files\borland\delphi6\Projects\Bpl"
|
||||||
-LN"c:\delphi6\Projects\Bpl"
|
-LN"c:\program files\borland\delphi6\Projects\Bpl"
|
||||||
-DmadExcept
|
-DmadExcept
|
||||||
|
|||||||
@ -56,10 +56,6 @@ HostApplication=
|
|||||||
Launcher=
|
Launcher=
|
||||||
UseLauncher=0
|
UseLauncher=0
|
||||||
DebugCWD=
|
DebugCWD=
|
||||||
[Language]
|
|
||||||
ActiveLang=
|
|
||||||
ProjectLang=
|
|
||||||
RootDir=
|
|
||||||
[Version Info]
|
[Version Info]
|
||||||
IncludeVerInfo=0
|
IncludeVerInfo=0
|
||||||
AutoIncBuild=0
|
AutoIncBuild=0
|
||||||
@ -86,11 +82,118 @@ ProductName=
|
|||||||
ProductVersion=1.0.0.0
|
ProductVersion=1.0.0.0
|
||||||
Comments=
|
Comments=
|
||||||
[Excluded Packages]
|
[Excluded Packages]
|
||||||
c:\delphi6\Projects\Bpl\DIPasDocD6.bpl=DiPasDoc - Designtime
|
c:\program files\borland\delphi6\Projects\Bpl\VirtualTreesD6D.bpl=Virtual Treeview
|
||||||
C:\Program Files\madCollection\madRemote\Delphi 6\madRemote_.bpl=madRemote 1.1b · www.madshi.net
|
C:\PROGRA~1\Borland\Delphi6\Projects\Bpl\JvCoreD6D.bpl=JVCL Core Components
|
||||||
C:\Program Files\madCollection\madKernel\Delphi 6\madKernel_.bpl=madKernel 1.3 · www.madshi.net
|
C:\PROGRA~1\Borland\Delphi6\Projects\Bpl\JvStdCtrlsD6D.bpl=JVCL Standard Controls
|
||||||
C:\Program Files\madCollection\madCodeHook\Delphi 6\madCodeHook_.bpl=madCodeHook 2.1b · www.madshi.net
|
C:\PROGRA~1\Borland\Delphi6\Projects\Bpl\tbx_d6.bpl=Toolbar2000 -- TBX Extensions (Alex Denisov)
|
||||||
C:\Program Files\madCollection\madSecurity\Delphi 6\madSecurity_.bpl=madSecurity 1.1n · www.madshi.net
|
C:\PROGRA~1\Borland\Delphi6\Projects\Bpl\tb2k_d6.bpl=Toolbar2000 Components (Jordan Russell)
|
||||||
C:\Program Files\madCollection\madShell\Delphi 6\madShell_.bpl=madShell 1.3k · www.madshi.net
|
c:\program files\borland\delphi6\Projects\Bpl\tbxdsgn_d6.bpl=Toolbar2000 -- TBX Extensions Design Package (Alex Denisov)
|
||||||
|
C:\PROGRA~1\Borland\Delphi6\Projects\Bpl\tb2kdsgn_d6.bpl=Toolbar2000 Design Package (Jordan Russell)
|
||||||
|
c:\program files\borland\delphi6\Bin\applet60.bpl=Borland Control Panel Applet Package
|
||||||
|
C:\Program Files\Borland\Delphi6\Projects\Bpl\JvJansD6D.bpl=JVCL Jans Components
|
||||||
|
c:\program files\borland\delphi6\Projects\Bpl\dclIndyCore60.bpl=Indy 10 Core Design Time
|
||||||
|
c:\program files\borland\delphi6\Projects\Bpl\dclIndyProtocols60.bpl=Indy 10 Protocols Design Time
|
||||||
|
c:\program files\borland\delphi6\Projects\Bpl\P164_D60.bpl=TurboPower OfficePartner 1.64 Design-time package - VCL60
|
||||||
|
c:\program files\borland\delphi6\Projects\Bpl\v103_d60.bpl=TurboPower VisualPlanIt 1.03 designtime package - VCL60
|
||||||
|
c:\program files\borland\delphi6\Projects\Bpl\BalloonD6.bpl=Balloon 2.0
|
||||||
|
c:\program files\borland\delphi6\Projects\Bpl\SysILS.bpl=(untitled)
|
||||||
|
c:\program files\borland\delphi6\Projects\Bpl\DragDropD6.bpl=Drag and Drop Component Suite
|
||||||
|
C:\Program Files\Borland\Delphi6\Projects\Bpl\JvCustomD6D.bpl=JVCL Custom Controls
|
||||||
|
C:\Program Files\Borland\Delphi6\Projects\Bpl\JvCtrlsD6D.bpl=JVCL Visual Controls
|
||||||
|
C:\Program Files\Borland\Delphi6\Projects\Bpl\JvWizardD6D.bpl=JVCL Wizard Design Time Package
|
||||||
|
c:\program files\borland\delphi6\Projects\Bpl\dclIndy60.bpl=Internet Direct (Indy) for D6 Property and Component Editors
|
||||||
|
c:\program files\borland\delphi6\Bin\dclnet60.bpl=Borland Internet Components
|
||||||
|
c:\program files\borland\delphi6\Bin\dclsoap60.bpl=Borland SOAP Components
|
||||||
|
c:\program files\borland\delphi6\Projects\Bpl\ColorPickerButtonD6.bpl=ColorPickerButton
|
||||||
|
C:\Program Files\Borland\Delphi6\Projects\Bpl\ThreadNameExpert60.bpl=JCL Thread Name IDE expert for Delphi 6
|
||||||
|
C:\Program Files\Borland\Delphi6\Projects\Bpl\JvDlgsD6D.bpl=JVCL Dialog Components
|
||||||
|
c:\program files\borland\delphi6\Projects\Bpl\asqlite.bpl=Aducom Software -- SQLite Design Time Components
|
||||||
|
C:\PROGRA~1\Borland\Delphi6\Projects\Bpl\aSQLitepkg.bpl=Aducom Software -- SQLite RunTime Components
|
||||||
|
C:\Program Files\Borland\Delphi6\Projects\Bpl\JvAppFrmD6D.bpl=JVCL Application and Form Components
|
||||||
|
C:\Program Files\Borland\Delphi6\Projects\Bpl\JvBandsD6D.bpl=JVCL Band Objects
|
||||||
|
C:\Program Files\Borland\Delphi6\Projects\Bpl\JvCmpD6D.bpl=JVCL Non-Visual Components
|
||||||
|
C:\Program Files\Borland\Delphi6\Projects\Bpl\JvCryptD6D.bpl=JVCL Encryption and Compression Components
|
||||||
|
C:\Program Files\Borland\Delphi6\Projects\Bpl\JvDockingD6D.bpl=JVCL Docking Components
|
||||||
|
C:\Program Files\Borland\Delphi6\Projects\Bpl\JvDotNetCtrlsD6D.bpl=JVCL DotNet Controls
|
||||||
|
C:\Program Files\Borland\Delphi6\Projects\Bpl\JvGlobusD6D.bpl=JVCL Globus Components
|
||||||
|
C:\Program Files\Borland\Delphi6\Projects\Bpl\JvHMID6D.bpl=JVCL HMI Controls design time unit
|
||||||
|
C:\Program Files\Borland\Delphi6\Projects\Bpl\JvInterpreterD6D.bpl=JVCL Interpreter Components
|
||||||
|
C:\Program Files\Borland\Delphi6\Projects\Bpl\JvManagedThreadsD6D.bpl=JVCL Managed Threads
|
||||||
|
C:\Program Files\Borland\Delphi6\Projects\Bpl\JvMMD6D.bpl=JVCL Multimedia and Image Components
|
||||||
|
C:\Program Files\Borland\Delphi6\Projects\Bpl\JvNetD6D.bpl=JVCL Network Components
|
||||||
|
C:\Program Files\Borland\Delphi6\Projects\Bpl\JvPageCompsD6D.bpl=JVCL Page Style Components
|
||||||
|
C:\Program Files\Borland\Delphi6\Projects\Bpl\JvPluginD6D.bpl=JVCL Plugin Components
|
||||||
|
C:\Program Files\Borland\Delphi6\Projects\Bpl\JvPrintPreviewD6D.bpl=JVCL Print Preview Components
|
||||||
|
C:\Program Files\Borland\Delphi6\Projects\Bpl\JvSystemD6D.bpl=JVCL System Components
|
||||||
|
C:\Program Files\Borland\Delphi6\Projects\Bpl\JvTimeFrameworkD6D.bpl=JVCL Time Framework
|
||||||
|
C:\Program Files\Borland\Delphi6\Projects\Bpl\JvValidatorsD6D.bpl=JVCL Validators and Error Provider Components
|
||||||
|
C:\Program Files\Borland\Delphi6\Projects\Bpl\JvXPCtrlsD6D.bpl=JVCL XP Controls
|
||||||
|
c:\program files\borland\delphi6\Projects\Bpl\GJLSoftwareD5.bpl=GJL Software ExDBGrid Components
|
||||||
|
c:\program files\borland\delphi6\Projects\Bpl\FREEREP6.bpl=FreeReport 2.32 Components
|
||||||
|
c:\program files\borland\delphi6\Projects\Bpl\PageControlExD6.bpl=PageControlEx
|
||||||
|
F:\Delphi\Components\madCollection\madExcept\Delphi 6\madExceptIde_.bpl=madExceptIde 1.0b · www.madshi.net
|
||||||
|
c:\program files\borland\delphi6\Projects\Bpl\ZCore.bpl=Zeos Core Classes and Intefaces
|
||||||
|
c:\program files\borland\delphi6\Projects\Bpl\ZParse.bpl=Zeos Parsing Classes and Intefaces
|
||||||
|
c:\program files\borland\delphi6\Projects\Bpl\ZParseSql.bpl=Zeos SQL Parsing Classes and Intefaces
|
||||||
|
c:\program files\borland\delphi6\Projects\Bpl\ZPlain.bpl=Zeos Plain Database API
|
||||||
|
c:\program files\borland\delphi6\Projects\Bpl\ZDbc.bpl=Zeos Low Level Database API
|
||||||
|
c:\program files\borland\delphi6\Projects\Bpl\ZComponent.bpl=Zeos Database Components
|
||||||
|
c:\program files\borland\delphi6\Projects\Bpl\IconXPD6.bpl=IconXP
|
||||||
|
c:\program files\borland\delphi6\Projects\Bpl\NLDVDBT_D6D.bpl=NLDVirtualDBTree
|
||||||
|
c:\program files\borland\delphi6\Projects\Bpl\ff2_d60.bpl=TurboPower FlashFiler Designtime Package - VCL60
|
||||||
|
C:\PROGRA~1\Borland\Delphi6\Projects\Bpl\GR32_D6.bpl=Graphics32
|
||||||
|
c:\program files\borland\delphi6\Projects\Bpl\GR32_DSGN_D6.bpl=Graphics32 Design Time Package
|
||||||
|
c:\program files\borland\delphi6\Projects\Bpl\PNGImage_D6.bpl=PNGImage
|
||||||
|
c:\program files\borland\delphi6\Projects\Bpl\SynEdit_D6.bpl=SynEdit component suite
|
||||||
|
c:\program files\borland\delphi6\Projects\Bpl\DelphiX_for5.bpl=DelphiX - DirectX components for Delphi
|
||||||
|
c:\program files\borland\delphi6\Projects\Bpl\NLDMBD6D.bpl=NLDMessageBox
|
||||||
|
c:\program files\borland\delphi6\Bin\dcl31w60.bpl=Delphi 1.0 Compatibility Components
|
||||||
|
c:\program files\borland\delphi6\Projects\Bpl\NLDTrayIconD6.bpl=NLDTrayIcon donated by SVG_1986
|
||||||
|
c:\program files\borland\delphi6\Projects\Bpl\ServerListD6D.bpl=SOF2Manager - Server List Designtime
|
||||||
C:\WINDOWS\System32\ibevnt60.bpl=Borland Interbase Event Alerter Component
|
C:\WINDOWS\System32\ibevnt60.bpl=Borland Interbase Event Alerter Component
|
||||||
c:\delphi6\Projects\Bpl\PsychoTidyD6.bpl=PsychoTidy IDE Expert
|
F:\Delphi\Components\madCollection\madBasic\Delphi 6\madHelp_.bpl=madHelp 1.1 · www.madshi.net
|
||||||
|
F:\Delphi\Components\madCollection\madRemote\Delphi 6\madRemote_.bpl=madRemote 1.1a · www.madshi.net
|
||||||
|
F:\Delphi\Components\madCollection\madKernel\Delphi 6\madKernel_.bpl=madKernel 1.2z · www.madshi.net
|
||||||
|
F:\Delphi\Components\madCollection\madCodeHook\Delphi 6\madCodeHook_.bpl=madCodeHook 2.0a · www.madshi.net
|
||||||
|
F:\Delphi\Components\madCollection\madSecurity\Delphi 6\madSecurity_.bpl=madSecurity 1.1n · www.madshi.net
|
||||||
|
F:\Delphi\Components\madCollection\madShell\Delphi 6\madShell_.bpl=madShell 1.3i · www.madshi.net
|
||||||
|
c:\program files\borland\delphi6\Projects\Bpl\BMSpinEditD6.bpl=BMSpinEdit
|
||||||
|
c:\program files\borland\delphi6\Projects\Bpl\GLScene6.bpl=GLScene - OpenGL 3D library
|
||||||
|
c:\program files\borland\delphi6\Projects\Bpl\TntUnicodeVcl_D60.bpl=Tnt Unicode Controls
|
||||||
|
c:\program files\borland\delphi6\Bin\dclsmp60.bpl=Borland Sample Components
|
||||||
|
c:\program files\borland\delphi6\Projects\Bpl\X2MultiMon_D6D.bpl=X2MultiMon Designtime Package
|
||||||
|
F:\Delphi\Components\ZipForge\Lib\Delphi 6\dclZipForged6.bpl=ZipForge Package
|
||||||
|
c:\program files\borland\delphi6\Bin\dclado60.bpl=Borland ADO DB Components
|
||||||
|
c:\program files\borland\delphi6\Bin\dclbde60.bpl=Borland BDE DB Components
|
||||||
|
C:\Program Files\Borland\Delphi6\Bin\dbx60.bpl=Borland SQL Explorer UI Package
|
||||||
|
c:\program files\borland\delphi6\Bin\DCLIB60.bpl=InterBase Data Access Components
|
||||||
|
c:\program files\borland\delphi6\Bin\dclbdecds60.bpl=Borland Local BDE ClientDataset Components
|
||||||
|
c:\program files\borland\delphi6\Bin\dclqrt60.bpl=QuickReport Components
|
||||||
|
c:\program files\borland\delphi6\Bin\dcltee60.bpl=TeeChart Components
|
||||||
|
c:\program files\borland\delphi6\Bin\dcldss60.bpl=Borland Decision Cube Components
|
||||||
|
c:\program files\borland\delphi6\Bin\dcltqr60.bpl=TeeChart for QuickReport Components
|
||||||
|
c:\program files\borland\delphi6\Bin\dclclxdb60.bpl=Borland CLX Database Components
|
||||||
|
C:\Program Files\Borland\Delphi6\Bin\dclclxstd60.bpl=Borland CLX Standard Components
|
||||||
|
c:\program files\borland\delphi6\Bin\dclmcn60.bpl=Borland DataSnap Connection Components
|
||||||
|
c:\program files\borland\delphi6\Bin\dclemacsedit60.bpl=Borland Editor Emacs Enhancements
|
||||||
|
c:\program files\borland\delphi6\Bin\dclshlctrls60.bpl=Shell Control Property and Component Editors
|
||||||
|
c:\program files\borland\delphi6\Bin\DBWEBXPRT.BPL=Borland Web Wizard Package
|
||||||
|
c:\program files\borland\delphi6\Bin\dclwbm60.bpl=Borland InternetExpress Components
|
||||||
|
c:\program files\borland\delphi6\Bin\dclie60.bpl=Internet Explorer Components
|
||||||
|
c:\program files\borland\delphi6\Bin\dclwebsnap60.bpl=Borland WebSnap Components
|
||||||
|
c:\program files\borland\delphi6\Bin\dclite60.bpl=Borland Integrated Translation Environment
|
||||||
|
c:\program files\borland\delphi6\Bin\dcldbx60.bpl=Borland dbExpress Components
|
||||||
|
c:\program files\borland\delphi6\Bin\dcldbxcds60.bpl=Borland Local DBX ClientDataset Components
|
||||||
|
[Included Packages]
|
||||||
|
C:\Program Files\Borland\Delphi6\Bin\dclstd60.bpl=Borland Standard Components
|
||||||
|
c:\program files\borland\delphi6\Bin\dclsmpedit60.bpl=Borland Editor Script Enhancements
|
||||||
|
C:\Program Files\Borland\Delphi6\Bin\dcldb60.bpl=Borland Database Components
|
||||||
|
C:\Program Files\Borland\Delphi6\Bin\dclact60.bpl=Borland ActionBar Components
|
||||||
|
F:\Delphi\Components\madCollection\madBasic\Delphi 6\madBasic_.bpl=madBasic 1.1f · www.madshi.net
|
||||||
|
F:\Delphi\Components\madCollection\madDisAsm\Delphi 6\madDisAsm_.bpl=madDisAsm 2.0a · www.madshi.net
|
||||||
|
F:\Delphi\Components\madCollection\madExcept\Delphi 6\madExcept_.bpl=madExcept 2.6a · www.madshi.net
|
||||||
|
F:\Delphi\Components\madCollection\madExcept\Delphi 6\madExceptWizard_.bpl=madExceptWizard 2.6 · www.madshi.net
|
||||||
|
c:\program files\borland\delphi6\Bin\dclcds60.bpl=Borland Base Cached ClientDataset Component
|
||||||
|
C:\Program Files\Borland\Delphi6\Bin\dclmid60.bpl=Borland MyBase DataAccess Components
|
||||||
|
C:\PROGRA~1\Borland\Delphi6\Projects\Bpl\ThemeManager6.bpl=Windows XP Theme Manager
|
||||||
|
H:\Downloads\commentexpert.bpl=Comment Expert v1.0 Alpha
|
||||||
|
|||||||
@ -61,7 +61,7 @@ begin
|
|||||||
|
|
||||||
shData := TX2UtStringHash.Create();
|
shData := TX2UtStringHash.Create();
|
||||||
try
|
try
|
||||||
shData['this'] := 'is';
|
shData['thisakslhalskdjfhaslkdfjhaslkfjh'] := 'is';
|
||||||
shData['a'] := 'test';
|
shData['a'] := 'test';
|
||||||
|
|
||||||
shData.Reset();
|
shData.Reset();
|
||||||
|
|||||||
@ -311,7 +311,8 @@ begin
|
|||||||
if ACanCreate then
|
if ACanCreate then
|
||||||
begin
|
begin
|
||||||
InitNode(FRoot);
|
InitNode(FRoot);
|
||||||
Result := FRoot;
|
FRoot^.Index := AIndex;
|
||||||
|
Result := FRoot;
|
||||||
|
|
||||||
if ASetCursor then
|
if ASetCursor then
|
||||||
begin
|
begin
|
||||||
|
|||||||
184
X2UtHashes.pas
184
X2UtHashes.pas
@ -135,9 +135,6 @@ type
|
|||||||
property CurrentValue: String read GetCurrentValue;
|
property CurrentValue: String read GetCurrentValue;
|
||||||
end;
|
end;
|
||||||
|
|
||||||
|
|
||||||
procedure Mix(var A, B, C: Cardinal);
|
|
||||||
|
|
||||||
implementation
|
implementation
|
||||||
resourcestring
|
resourcestring
|
||||||
RSEmptyKey = 'Cannot hash an empty key!';
|
RSEmptyKey = 'Cannot hash an empty key!';
|
||||||
@ -159,141 +156,74 @@ end;
|
|||||||
Hashing
|
Hashing
|
||||||
========================================}
|
========================================}
|
||||||
procedure Mix(var A, B, C: Cardinal);
|
procedure Mix(var A, B, C: Cardinal);
|
||||||
asm
|
begin
|
||||||
sub A, B; sub A, C; shr C, 13; xor A, C;
|
Dec(A, B); Dec(A, C); C := C shr 13; A := A xor C;
|
||||||
sub B, C; sub B, A; shl A, 8; xor B, A;
|
Dec(B, C); Dec(B, A); A := A shl 8; B := B xor A;
|
||||||
sub C, A; sub C, B; shr B, 13; xor C, B;
|
Dec(C, A); Dec(C, B); B := B shr 13; C := C xor B;
|
||||||
sub A, B; sub A, C; shr C, 12; xor A, C;
|
Dec(A, B); Dec(A, C); C := C shr 12; A := A xor C;
|
||||||
sub B, C; sub B, A; shl A, 16; xor B, A;
|
Dec(B, C); Dec(B, A); A := A shl 16; B := B xor A;
|
||||||
sub C, A; sub C, B; shr B, 5; xor C, B;
|
Dec(C, A); Dec(C, B); B := B shr 5; C := C xor B;
|
||||||
sub A, B; sub A, C; shr C, 3; xor A, C;
|
Dec(A, B); Dec(A, C); C := C shr 3; A := A xor C;
|
||||||
sub B, C; sub B, A; shl A, 10; xor B, A;
|
Dec(B, C); Dec(B, A); A := A shl 10; B := B xor A;
|
||||||
sub C, A; sub C, B; shr B, 15; xor C, B;
|
Dec(C, A); Dec(C, B); B := B shr 15; C := C xor B;
|
||||||
end;
|
end;
|
||||||
|
|
||||||
function TX2UtCustomHash.Hash;
|
function TX2UtCustomHash.Hash;
|
||||||
|
var
|
||||||
|
iA: Cardinal;
|
||||||
|
iB: Cardinal;
|
||||||
|
iC: Cardinal;
|
||||||
|
iLength: Cardinal;
|
||||||
|
pValue: PChar;
|
||||||
|
|
||||||
begin
|
begin
|
||||||
Result := 0;
|
Result := 0;
|
||||||
|
|
||||||
(*
|
iA := $9e3779b9;
|
||||||
ypedef unsigned long int ub4; /* unsigned 4-byte quantities */
|
iB := iA;
|
||||||
typedef unsigned char ub1; /* unsigned 1-byte quantities */
|
iC := iA;
|
||||||
|
iLength := Length(AValue);
|
||||||
|
pValue := PChar(AValue);
|
||||||
|
|
||||||
#define hashsize(n) ((ub4)1<<(n))
|
// Handle most of the key
|
||||||
#define hashmask(n) (hashsize(n)-1)
|
while (iLength >= 12) do
|
||||||
|
begin
|
||||||
|
Inc(iA, Ord(pValue[0]) + (Ord(pValue[1]) shl 8) + (Ord(pValue[2]) shl 16) +
|
||||||
|
(Ord(pValue[3]) shl 24));
|
||||||
|
Inc(iB, Ord(pValue[4]) + (Ord(pValue[5]) shl 8) + (Ord(pValue[6]) shl 16) +
|
||||||
|
(Ord(pValue[7]) shl 24));
|
||||||
|
Inc(iA, Ord(pValue[8]) + (Ord(pValue[9]) shl 8) + (Ord(pValue[10]) shl 16) +
|
||||||
|
(Ord(pValue[11]) shl 24));
|
||||||
|
|
||||||
/*
|
Mix(iA, iB, iC);
|
||||||
--------------------------------------------------------------------
|
Inc(pValue, 12);
|
||||||
mix -- mix 3 32-bit values reversibly.
|
Dec(iLength, 12);
|
||||||
For every delta with one or two bits set, and the deltas of all three
|
end;
|
||||||
high bits or all three low bits, whether the original value of a,b,c
|
|
||||||
is almost all zero or is uniformly distributed,
|
|
||||||
* If mix() is run forward or backward, at least 32 bits in a,b,c
|
|
||||||
have at least 1/4 probability of changing.
|
|
||||||
* If mix() is run forward, every bit of c will change between 1/3 and
|
|
||||||
2/3 of the time. (Well, 22/100 and 78/100 for some 2-bit deltas.)
|
|
||||||
mix() was built out of 36 single-cycle latency instructions in a
|
|
||||||
structure that could supported 2x parallelism, like so:
|
|
||||||
a -= b;
|
|
||||||
a -= c; x = (c>>13);
|
|
||||||
b -= c; a ^= x;
|
|
||||||
b -= a; x = (a<<8);
|
|
||||||
c -= a; b ^= x;
|
|
||||||
c -= b; x = (b>>13);
|
|
||||||
...
|
|
||||||
Unfortunately, superscalar Pentiums and Sparcs can't take advantage
|
|
||||||
of that parallelism. They've also turned some of those single-cycle
|
|
||||||
latency instructions into multi-cycle latency instructions. Still,
|
|
||||||
this is the fastest good hash I could find. There were about 2^^68
|
|
||||||
to choose from. I only looked at a billion or so.
|
|
||||||
--------------------------------------------------------------------
|
|
||||||
*/
|
|
||||||
#define mix(a,b,c) \
|
|
||||||
{ \
|
|
||||||
a -= b; a -= c; a ^= (c>>13); \
|
|
||||||
b -= c; b -= a; b ^= (a<<8); \
|
|
||||||
c -= a; c -= b; c ^= (b>>13); \
|
|
||||||
a -= b; a -= c; a ^= (c>>12); \
|
|
||||||
b -= c; b -= a; b ^= (a<<16); \
|
|
||||||
c -= a; c -= b; c ^= (b>>5); \
|
|
||||||
a -= b; a -= c; a ^= (c>>3); \
|
|
||||||
b -= c; b -= a; b ^= (a<<10); \
|
|
||||||
c -= a; c -= b; c ^= (b>>15); \
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
// Handle the last 11 bytes
|
||||||
--------------------------------------------------------------------
|
Inc(iC, iLength);
|
||||||
hash() -- hash a variable-length key into a 32-bit value
|
|
||||||
k : the key (the unaligned variable-length array of bytes)
|
|
||||||
len : the length of the key, counting by bytes
|
|
||||||
initval : can be any 4-byte value
|
|
||||||
Returns a 32-bit value. Every bit of the key affects every bit of
|
|
||||||
the return value. Every 1-bit and 2-bit delta achieves avalanche.
|
|
||||||
About 6*len+35 instructions.
|
|
||||||
|
|
||||||
The best hash table sizes are powers of 2. There is no need to do
|
while iLength > 0 do
|
||||||
mod a prime (mod is sooo slow!). If you need less than 32 bits,
|
begin
|
||||||
use a bitmask. For example, if you need only 10 bits, do
|
case iLength of
|
||||||
h = (h & hashmask(10));
|
11: Inc(iC, Ord(pValue[10]) shr 24);
|
||||||
In which case, the hash table should have hashsize(10) elements.
|
10: Inc(iC, Ord(pValue[9]) shr 16);
|
||||||
|
9: Inc(iC, Ord(pValue[8]) shr 8);
|
||||||
|
8: Inc(iB, Ord(pValue[7]) shr 24);
|
||||||
|
7: Inc(iB, Ord(pValue[6]) shr 16);
|
||||||
|
6: Inc(iB, Ord(pValue[5]) shr 8);
|
||||||
|
5: Inc(iB, Ord(pValue[4]));
|
||||||
|
4: Inc(iA, Ord(pValue[3]) shr 24);
|
||||||
|
3: Inc(iA, Ord(pValue[2]) shr 16);
|
||||||
|
2: Inc(iA, Ord(pValue[1]) shr 8);
|
||||||
|
1: Inc(iA, Ord(pValue[0]));
|
||||||
|
end;
|
||||||
|
|
||||||
If you are hashing n strings (ub1 ** )k, do it like this:
|
Dec(iLength);
|
||||||
for (i=0, h=0; i<n; ++i) h = hash( k[i], len[i], h);
|
end;
|
||||||
|
|
||||||
By Bob Jenkins, 1996. bob_jenkins@burtleburtle.net. You may use this
|
Mix(iA, iB, iC);
|
||||||
code any way you wish, private, educational, or commercial. It's free.
|
Result := iC;
|
||||||
|
|
||||||
See http://burtleburtle.net/bob/hash/evahash.html
|
|
||||||
Use for hash table lookup, or anything where one collision in 2^^32 is
|
|
||||||
acceptable. Do NOT use for cryptographic purposes.
|
|
||||||
--------------------------------------------------------------------
|
|
||||||
*/
|
|
||||||
|
|
||||||
ub4 hash( k, length, initval)
|
|
||||||
register ub1 *k; /* the key */
|
|
||||||
register ub4 length; /* the length of the key */
|
|
||||||
register ub4 initval; /* the previous hash, or an arbitrary value */
|
|
||||||
{
|
|
||||||
register ub4 a,b,c,len;
|
|
||||||
|
|
||||||
/* Set up the internal state */
|
|
||||||
len = length;
|
|
||||||
a = b = 0x9e3779b9; /* the golden ratio; an arbitrary value */
|
|
||||||
c = initval; /* the previous hash value */
|
|
||||||
|
|
||||||
/*---------------------------------------- handle most of the key */
|
|
||||||
while (len >= 12)
|
|
||||||
{
|
|
||||||
a += (k[0] +((ub4)k[1]<<8) +((ub4)k[2]<<16) +((ub4)k[3]<<24));
|
|
||||||
b += (k[4] +((ub4)k[5]<<8) +((ub4)k[6]<<16) +((ub4)k[7]<<24));
|
|
||||||
c += (k[8] +((ub4)k[9]<<8) +((ub4)k[10]<<16)+((ub4)k[11]<<24));
|
|
||||||
mix(a,b,c);
|
|
||||||
k += 12; len -= 12;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*------------------------------------- handle the last 11 bytes */
|
|
||||||
c += length;
|
|
||||||
switch(len) /* all the case statements fall through */
|
|
||||||
{
|
|
||||||
case 11: c+=((ub4)k[10]<<24);
|
|
||||||
case 10: c+=((ub4)k[9]<<16);
|
|
||||||
case 9 : c+=((ub4)k[8]<<8);
|
|
||||||
/* the first byte of c is reserved for the length */
|
|
||||||
case 8 : b+=((ub4)k[7]<<24);
|
|
||||||
case 7 : b+=((ub4)k[6]<<16);
|
|
||||||
case 6 : b+=((ub4)k[5]<<8);
|
|
||||||
case 5 : b+=k[4];
|
|
||||||
case 4 : a+=((ub4)k[3]<<24);
|
|
||||||
case 3 : a+=((ub4)k[2]<<16);
|
|
||||||
case 2 : a+=((ub4)k[1]<<8);
|
|
||||||
case 1 : a+=k[0];
|
|
||||||
/* case 0: nothing left to add */
|
|
||||||
}
|
|
||||||
mix(a,b,c);
|
|
||||||
/*-------------------------------------------- report the result */
|
|
||||||
return c;
|
|
||||||
}
|
|
||||||
*)
|
|
||||||
end;
|
end;
|
||||||
|
|
||||||
|
|
||||||
@ -346,7 +276,7 @@ end;
|
|||||||
|
|
||||||
function TX2UtCustomHash.LookupItem;
|
function TX2UtCustomHash.LookupItem;
|
||||||
var
|
var
|
||||||
iIndex: Integer;
|
iIndex: Cardinal;
|
||||||
pData: PX2UtHashList;
|
pData: PX2UtHashList;
|
||||||
pFound: PX2UtHashItem;
|
pFound: PX2UtHashItem;
|
||||||
pItem: PX2UtHashItem;
|
pItem: PX2UtHashItem;
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user