Index: include/llvm/Support/CRC.h =================================================================== --- include/llvm/Support/CRC.h +++ include/llvm/Support/CRC.h @@ -0,0 +1,25 @@ +//===-- llvm/Support/CRC.h - Cyclic Redundancy Check-------------*- C++ -*-===// +// +// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. +// See https://llvm.org/LICENSE.txt for license information. +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +// +//===----------------------------------------------------------------------===// +// +// This file contains basic functions for calculating Cyclic Redundancy Check +// or CRC. +// +//===----------------------------------------------------------------------===// + +#ifndef LLVM_SUPPORT_CRC_H +#define LLVM_SUPPORT_CRC_H + +#include "llvm/ADT/StringRef.h" +#include "llvm/Support/DataTypes.h" + +namespace llvm { +// zlib independent CRC32 calculation. +uint32_t getCRC32(uint32_t CRC, StringRef S); +} // end namespace llvm + +#endif Index: lib/DebugInfo/Symbolize/Symbolize.cpp =================================================================== --- lib/DebugInfo/Symbolize/Symbolize.cpp +++ lib/DebugInfo/Symbolize/Symbolize.cpp @@ -23,6 +23,7 @@ #include "llvm/Object/COFF.h" #include "llvm/Object/MachO.h" #include "llvm/Object/MachOUniversal.h" +#include "llvm/Support/CRC.h" #include "llvm/Support/Casting.h" #include "llvm/Support/Compression.h" #include "llvm/Support/DataExtractor.h" @@ -163,7 +164,7 @@ MemoryBuffer::getFileOrSTDIN(Path); if (!MB) return false; - return !zlib::isAvailable() || CRCHash == zlib::crc32(MB.get()->getBuffer()); + return CRCHash == getCRC32(0, MB.get()->getBuffer()); } bool findDebugBinary(const std::string &OrigPath, Index: lib/Support/CMakeLists.txt =================================================================== --- lib/Support/CMakeLists.txt +++ lib/Support/CMakeLists.txt @@ -76,6 +76,7 @@ CodeGenCoverage.cpp CommandLine.cpp Compression.cpp + CRC.cpp ConvertUTF.cpp ConvertUTFWrapper.cpp CrashRecoveryContext.cpp Index: lib/Support/CRC.cpp =================================================================== --- lib/Support/CRC.cpp +++ lib/Support/CRC.cpp @@ -0,0 +1,60 @@ +//===--- CRC.cpp - Cyclic Redundancy Check implementation -----------------===// +// +// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. +// See https://llvm.org/LICENSE.txt for license information. +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +// +//===----------------------------------------------------------------------===// +// +// This file implements getCRC32 function. +// +//===----------------------------------------------------------------------===// + +#include "llvm/Support/CRC.h" +#include "llvm/ADT/StringRef.h" +#include "llvm/Support/Threading.h" +#include + +using namespace llvm; + +using CRC32Table = std::array; + +static void initCRC32Table(CRC32Table &Tbl) { + auto Shuffle = [](uint32_t V) { + return (V & 1) ? (V >> 1) ^ 0xEDB88320U : V >> 1; + }; + + for (size_t I = 0; I < Tbl.size(); ++I) { + uint32_t V = Shuffle(I); + V = Shuffle(V); + V = Shuffle(V); + V = Shuffle(V); + V = Shuffle(V); + V = Shuffle(V); + V = Shuffle(V); + Tbl[I] = Shuffle(V); + } +} + +uint32_t llvm::getCRC32(uint32_t CRC, StringRef S) { + static llvm::once_flag InitFlag; + static CRC32Table Tbl; + llvm::call_once(InitFlag, initCRC32Table, Tbl); + + const uint8_t *P = reinterpret_cast(S.data()); + size_t Len = S.size(); + CRC ^= 0xFFFFFFFFU; + for (; Len >= 8; Len -= 8) { + CRC = Tbl[(CRC ^ *P++) & 0xFF] ^ (CRC >> 8); + CRC = Tbl[(CRC ^ *P++) & 0xFF] ^ (CRC >> 8); + CRC = Tbl[(CRC ^ *P++) & 0xFF] ^ (CRC >> 8); + CRC = Tbl[(CRC ^ *P++) & 0xFF] ^ (CRC >> 8); + CRC = Tbl[(CRC ^ *P++) & 0xFF] ^ (CRC >> 8); + CRC = Tbl[(CRC ^ *P++) & 0xFF] ^ (CRC >> 8); + CRC = Tbl[(CRC ^ *P++) & 0xFF] ^ (CRC >> 8); + CRC = Tbl[(CRC ^ *P++) & 0xFF] ^ (CRC >> 8); + } + while (Len--) + CRC = Tbl[(CRC ^ *P++) & 0xFF] ^ (CRC >> 8); + return CRC ^ 0xFFFFFFFFU; +} Index: unittests/Support/CMakeLists.txt =================================================================== --- unittests/Support/CMakeLists.txt +++ unittests/Support/CMakeLists.txt @@ -18,6 +18,7 @@ CommandLineTest.cpp CompressionTest.cpp ConvertUTFTest.cpp + CRCTest.cpp DataExtractorTest.cpp DebugTest.cpp DebugCounterTest.cpp Index: unittests/Support/CRCTest.cpp =================================================================== --- unittests/Support/CRCTest.cpp +++ unittests/Support/CRCTest.cpp @@ -0,0 +1,29 @@ +//===- llvm/unittest/Support/CRCTest.cpp - CRC tests ----------------------===// +// +// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. +// See https://llvm.org/LICENSE.txt for license information. +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +// +//===----------------------------------------------------------------------===// +// +// This file implements unit tests for CRC calculation functions. +// +//===----------------------------------------------------------------------===// + +#include "llvm/Support/CRC.h" +#include "gtest/gtest.h" + +using namespace llvm; + +namespace { + +TEST(CRCTest, CRC32) { + EXPECT_EQ(0x414FA339U, + llvm::getCRC32( + 0, StringRef("The quick brown fox jumps over the lazy dog"))); + // CRC-32/ISO-HDLC test vector + // http://reveng.sourceforge.net/crc-catalogue/17plus.htm#crc.cat.crc-32c + EXPECT_EQ(0xCBF43926U, llvm::getCRC32(0, StringRef("123456789"))); +} + +} // end anonymous namespace