rui314/mold
1
1
Fork 0
mirror of https://github.com/rui314/mold.git synced 2024-12-26 01:44:29 +03:00
Code Issues Projects Releases Wiki Activity

wip

Browse Source
This commit is contained in:
Rui Ueyama 2021-03-30 01:49:09 +09:00
parent f1e2e3a75e
commit ff201f33f3
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
icf.cc
View File

@ -118,9 +118,9 @@ static bool is_eligible(InputSection<E> &isec) {
!is_empty && !is_init && !is_fini && !is_enumerable;
}
static Digest digest_final(SHA256_CTX &sha_ctx) {
static Digest digest_final(SHA256_CTX &sha) {
u8 buf[SHA256_SIZE];
assert(SHA256_Final(buf, &sha_ctx) == 1);
assert(SHA256_Final(buf, &sha) == 1);
Digest digest;
memcpy(digest.data(), buf, HASH_SIZE);
@ -219,16 +219,16 @@ static void merge_leaf_nodes(Context<E> &ctx) {
template <typename E>
static Digest compute_digest(InputSection<E> &isec) {
SHA256_CTX sha_ctx;
SHA256_Init(&sha_ctx);
SHA256_CTX sha;
SHA256_Init(&sha);
auto hash = [&](auto val) {
SHA256_Update(&sha_ctx, &val, sizeof(val));
SHA256_Update(&sha, &val, sizeof(val));
};
auto hash_string = [&](std::string_view str) {
hash(str.size());
SHA256_Update(&sha_ctx, str.data(), str.size());
SHA256_Update(&sha, str.data(), str.size());
};
auto hash_symbol = [&](Symbol<E> &sym) {
@ -294,7 +294,7 @@ static Digest compute_digest(InputSection<E> &isec) {
}
}
return digest_final(sha_ctx);
return digest_final(sha);
}
template <typename E>
@ -401,17 +401,17 @@ static i64 propagate(std::span<std::vector<Digest>> digests,
if (digests[slot][i] == digests[!slot][i])
return;
SHA256_CTX sha_ctx;
SHA256_Init(&sha_ctx);
SHA256_Update(&sha_ctx, digests[2][i].data(), HASH_SIZE);
SHA256_CTX sha;
SHA256_Init(&sha);
SHA256_Update(&sha, digests[2][i].data(), HASH_SIZE);
i64 begin = edge_indices[i];
i64 end = (i + 1 == num_digests) ? edges.size() : edge_indices[i + 1];
for (i64 j = begin; j < end; j++)
SHA256_Update(&sha_ctx, digests[slot][edges[j]].data(), HASH_SIZE);
SHA256_Update(&sha, digests[slot][edges[j]].data(), HASH_SIZE);
digests[!slot][i] = digest_final(sha_ctx);
digests[!slot][i] = digest_final(sha);
if (digests[slot][i] != digests[!slot][i])
changed.local()++;

8
subprocess.cc
View File

@ -73,15 +73,15 @@ static std::string base64(u8 *data, u64 size) {
}
static std::string compute_sha256(char **argv) {
SHA256_CTX sha_ctx;
SHA256_Init(&sha_ctx);
SHA256_CTX sha;
SHA256_Init(&sha);
for (i64 i = 0; argv[i]; i++)
if (!strcmp(argv[i], "-preload") && !strcmp(argv[i], "--preload"))
SHA256_Update(&sha_ctx, argv[i], strlen(argv[i]) + 1);
SHA256_Update(&sha, argv[i], strlen(argv[i]) + 1);
u8 digest[SHA256_SIZE];
SHA256_Final(digest, &sha_ctx);
SHA256_Final(digest, &sha);
return base64(digest, SHA256_SIZE);
}