Skip to content

rework crc core: unify fold context, rename fold paths #86

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Xor-el merged 1 commit into from
Jun 24, 2026
Merged

rework crc core: unify fold context, rename fold paths #86

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions HashLib.Benchmark/Delphi/HashLib.BenchmarkConsole.dpr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,9 @@ uses
HlpAdler32Dispatch in '..\..\HashLib\src\Checksum\HlpAdler32Dispatch.pas',
HlpCRC in '..\..\HashLib\src\Checksum\HlpCRC.pas',
HlpCRCDispatch in '..\..\HashLib\src\Checksum\HlpCRCDispatch.pas',
HlpGF2 in '..\..\HashLib\src\Checksum\HlpGF2.pas',
HlpCRC16 in '..\..\HashLib\src\Checksum\HlpCRC16.pas',
HlpCRC32 in '..\..\HashLib\src\Checksum\HlpCRC32.pas',
HlpCRCFoldConstants in '..\..\HashLib\src\Checksum\HlpCRCFoldConstants.pas',
HlpCRCStandard in '..\..\HashLib\src\Checksum\HlpCRCStandard.pas',
HlpCRC32Fast in '..\..\HashLib\src\Checksum\HlpCRC32Fast.pas',
HlpCRC64 in '..\..\HashLib\src\Checksum\HlpCRC64.pas',
HlpGost in '..\..\HashLib\src\Crypto\HlpGost.pas',
HlpGrindahl256 in '..\..\HashLib\src\Crypto\HlpGrindahl256.pas',
HlpGrindahl512 in '..\..\HashLib\src\Crypto\HlpGrindahl512.pas',
Expand Down
6 changes: 2 additions & 4 deletions HashLib.Benchmark/Delphi/HashLib.BenchmarkFMX.dpr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,9 @@ uses
HlpAdler32Dispatch in '..\..\HashLib\src\Checksum\HlpAdler32Dispatch.pas',
HlpCRC in '..\..\HashLib\src\Checksum\HlpCRC.pas',
HlpCRCDispatch in '..\..\HashLib\src\Checksum\HlpCRCDispatch.pas',
HlpGF2 in '..\..\HashLib\src\Checksum\HlpGF2.pas',
HlpCRC16 in '..\..\HashLib\src\Checksum\HlpCRC16.pas',
HlpCRC32 in '..\..\HashLib\src\Checksum\HlpCRC32.pas',
HlpCRCFoldConstants in '..\..\HashLib\src\Checksum\HlpCRCFoldConstants.pas',
HlpCRCStandard in '..\..\HashLib\src\Checksum\HlpCRCStandard.pas',
HlpCRC32Fast in '..\..\HashLib\src\Checksum\HlpCRC32Fast.pas',
HlpCRC64 in '..\..\HashLib\src\Checksum\HlpCRC64.pas',
HlpGost in '..\..\HashLib\src\Crypto\HlpGost.pas',
HlpGrindahl256 in '..\..\HashLib\src\Crypto\HlpGrindahl256.pas',
HlpGrindahl512 in '..\..\HashLib\src\Crypto\HlpGrindahl512.pas',
Expand Down
6 changes: 2 additions & 4 deletions HashLib.Tests/Delphi.Tests/HashLib.Tests.Mobile.dpr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,9 @@ uses
HlpAdler32Dispatch in '..\..\HashLib\src\Checksum\HlpAdler32Dispatch.pas',
HlpCRC in '..\..\HashLib\src\Checksum\HlpCRC.pas',
HlpCRCDispatch in '..\..\HashLib\src\Checksum\HlpCRCDispatch.pas',
HlpGF2 in '..\..\HashLib\src\Checksum\HlpGF2.pas',
HlpCRC16 in '..\..\HashLib\src\Checksum\HlpCRC16.pas',
HlpCRC32 in '..\..\HashLib\src\Checksum\HlpCRC32.pas',
HlpCRCFoldConstants in '..\..\HashLib\src\Checksum\HlpCRCFoldConstants.pas',
HlpCRCStandard in '..\..\HashLib\src\Checksum\HlpCRCStandard.pas',
HlpCRC32Fast in '..\..\HashLib\src\Checksum\HlpCRC32Fast.pas',
HlpCRC64 in '..\..\HashLib\src\Checksum\HlpCRC64.pas',
HlpGost in '..\..\HashLib\src\Crypto\HlpGost.pas',
HlpGrindahl256 in '..\..\HashLib\src\Crypto\HlpGrindahl256.pas',
HlpGrindahl512 in '..\..\HashLib\src\Crypto\HlpGrindahl512.pas',
Expand Down
6 changes: 2 additions & 4 deletions HashLib.Tests/Delphi.Tests/HashLib.Tests.Mobile.dproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -364,11 +364,9 @@
<DCCReference Include="..\..\HashLib\src\Checksum\HlpAdler32Dispatch.pas"/>
<DCCReference Include="..\..\HashLib\src\Checksum\HlpCRC.pas"/>
<DCCReference Include="..\..\HashLib\src\Checksum\HlpCRCDispatch.pas"/>
<DCCReference Include="..\..\HashLib\src\Checksum\HlpGF2.pas"/>
<DCCReference Include="..\..\HashLib\src\Checksum\HlpCRC16.pas"/>
<DCCReference Include="..\..\HashLib\src\Checksum\HlpCRC32.pas"/>
<DCCReference Include="..\..\HashLib\src\Checksum\HlpCRCFoldConstants.pas"/>
<DCCReference Include="..\..\HashLib\src\Checksum\HlpCRCStandard.pas"/>
<DCCReference Include="..\..\HashLib\src\Checksum\HlpCRC32Fast.pas"/>
<DCCReference Include="..\..\HashLib\src\Checksum\HlpCRC64.pas"/>
<DCCReference Include="..\..\HashLib\src\Crypto\HlpGost.pas"/>
<DCCReference Include="..\..\HashLib\src\Crypto\HlpGrindahl256.pas"/>
<DCCReference Include="..\..\HashLib\src\Crypto\HlpGrindahl512.pas"/>
Expand Down
6 changes: 2 additions & 4 deletions HashLib.Tests/Delphi.Tests/HashLib.Tests.dpr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,9 @@ uses
HlpAdler32Dispatch in '..\..\HashLib\src\Checksum\HlpAdler32Dispatch.pas',
HlpCRC in '..\..\HashLib\src\Checksum\HlpCRC.pas',
HlpCRCDispatch in '..\..\HashLib\src\Checksum\HlpCRCDispatch.pas',
HlpGF2 in '..\..\HashLib\src\Checksum\HlpGF2.pas',
HlpCRC16 in '..\..\HashLib\src\Checksum\HlpCRC16.pas',
HlpCRC32 in '..\..\HashLib\src\Checksum\HlpCRC32.pas',
HlpCRCFoldConstants in '..\..\HashLib\src\Checksum\HlpCRCFoldConstants.pas',
HlpCRCStandard in '..\..\HashLib\src\Checksum\HlpCRCStandard.pas',
HlpCRC32Fast in '..\..\HashLib\src\Checksum\HlpCRC32Fast.pas',
HlpCRC64 in '..\..\HashLib\src\Checksum\HlpCRC64.pas',
HlpGost in '..\..\HashLib\src\Crypto\HlpGost.pas',
HlpGrindahl256 in '..\..\HashLib\src\Crypto\HlpGrindahl256.pas',
HlpGrindahl512 in '..\..\HashLib\src\Crypto\HlpGrindahl512.pas',
Expand Down
4 changes: 1 addition & 3 deletions HashLib/src/Base/HlpHashFactory.pas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,8 @@ interface
HlpAdler32,
// CRC Units //
HlpCRC,
HlpCRC16,
HlpCRC32,
HlpCRCStandard,
HlpCRC32Fast,
HlpCRC64,
// Hash32 Units //
HlpAP,
HlpBernstein,
Expand Down
10 changes: 5 additions & 5 deletions HashLib/src/Checksum/HlpCRC.pas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -577,7 +577,7 @@ TCRC = class sealed(THash, IChecksum, ICRC, ITransformBlock)
type
TCRCCacheValue = record
Table: THashLibMatrixUInt64Array;
FoldRuntime: TCRCFoldRuntimeCtx64;
FoldRuntime: TCRCFoldRuntimeCtx;
end;

class var
Expand Down Expand Up @@ -1393,7 +1393,7 @@ class function TCRC.GetOrCreateCacheEntry(APoly: UInt64; AWidth: Int32;
if not FCache.TryGetValue(LKey, Result) then
begin
Result.Table := GenerateCRCTable(APoly, AWidth, AReflected);
CRCDispatch_InitRuntimeCtx64(Result.Table, APoly, AWidth, AReflected,
CRCDispatch_InitRuntimeCtx(Result.Table, APoly, AWidth, AReflected,
Result.FoldRuntime);
FCache.Add(LKey, Result);
end;
Expand Down Expand Up @@ -1446,13 +1446,13 @@ procedure TCRC.TransformBytes(const AData: THashLibByteArray;
begin
if IsInputReflected then
begin
LFoldFunc := CRC_Fold_Lsb;
LFoldFunc := CRC_Fold_Reflected;
LState[0] := FHash;
end
else
begin
LFoldFunc := CRC_Fold_Msb;
if CRC_Fold_UsesPclmul then
LFoldFunc := CRC_Fold_Forward;
if CRC_Fold_UsesCarrylessMul then
begin
if Width < 64 then
LState[0] := FHash shl (64 - Width)
Expand Down
90 changes: 0 additions & 90 deletions HashLib/src/Checksum/HlpCRC16.pas
View file
Open in desktop

This file was deleted.

119 changes: 0 additions & 119 deletions HashLib/src/Checksum/HlpCRC32.pas
View file
Open in desktop

This file was deleted.

8 changes: 4 additions & 4 deletions HashLib/src/Checksum/HlpCRC32Fast.pas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ TCRC32_PKZIP = class sealed(TCRC32Fast)

class var
FCrc32PkzipTable: THashLibMatrixUInt32Array;
FCrc32PkzipFoldRuntime: TCRCFoldRuntimeCtx32;
FCrc32PkzipFoldRuntime: TCRCFoldRuntimeCtx;

class constructor Crc32Pkzip();

Expand All @@ -63,7 +63,7 @@ TCRC32_CASTAGNOLI = class sealed(TCRC32Fast)

class var
FCrc32CastagnoliTable: THashLibMatrixUInt32Array;
FCrc32CastagnoliFoldRuntime: TCRCFoldRuntimeCtx32;
FCrc32CastagnoliFoldRuntime: TCRCFoldRuntimeCtx;

class constructor Crc32Castagnoli();

Expand All @@ -78,10 +78,10 @@ TCRC32_CASTAGNOLI = class sealed(TCRC32Fast)
implementation

procedure CRC32FastInitFoldTables(const AReflectedPoly, AMsbPoly: UInt32;
var ATable: THashLibMatrixUInt32Array; var ACtx: TCRCFoldRuntimeCtx32);
var ATable: THashLibMatrixUInt32Array; var ACtx: TCRCFoldRuntimeCtx);
begin
ATable := CRCDispatch_BuildSlicingTable32Reflect(AReflectedPoly);
CRCDispatch_InitRuntimeCtx32(ATable, AMsbPoly, ACtx);
CRCDispatch_InitRuntimeCtx(ATable, AMsbPoly, ACtx);
end;

{ TCRC32Fast }
Expand Down
Loading
Loading