hal-hardware-analyzer: 4.4.1 -> 4.5.0

Diff: https://github.com/emsec/hal/compare/v4.4.1...v4.5.0

Changelog: https://github.com/emsec/hal/releases/tag/v4.5.0
This commit is contained in:
Robert Schütz
2025-09-26 03:25:07 -07:00
parent 97338c3457
commit 343a8033bd
3 changed files with 4 additions and 62 deletions
@@ -1,28 +0,0 @@
compatibility with newer spdlog/fmt versions
diff --git a/plugins/module_identification/src/api/module_identification.cpp b/plugins/module_identification/src/api/module_identification.cpp
index 808875e8a68..3cf3cf1fb8b 100644
--- a/plugins/module_identification/src/api/module_identification.cpp
+++ b/plugins/module_identification/src/api/module_identification.cpp
@@ -406,7 +406,7 @@ namespace hal
const u32 num_threads = std::min(config.m_max_thread_count, std::thread::hardware_concurrency() - 1);
- log_info("module_identification", "running with {} threads and {} multithreading priority", num_threads, config.m_multithreading_priority);
+ log_info("module_identification", "running with {} threads and {} multithreading priority", num_threads, fmt::underlying(config.m_multithreading_priority));
auto stats = Statistics();
diff --git a/plugins/z3_utils/src/simplification.cpp b/plugins/z3_utils/src/simplification.cpp
index d64cab665f2..561fa7f1a23 100644
--- a/plugins/z3_utils/src/simplification.cpp
+++ b/plugins/z3_utils/src/simplification.cpp
@@ -617,7 +617,7 @@ namespace hal
return false;
default: {
- log_error("z3_utils", "commutative check not implemeted for type {}!", t);
+ log_error("z3_utils", "commutative check not implemeted for type {}!", fmt::underlying(t));
return false;
}
}
@@ -4,7 +4,6 @@
boost,
cmake,
fetchFromGitHub,
fetchpatch,
graphviz,
igraph,
llvmPackages,
@@ -23,33 +22,16 @@
}:
stdenv.mkDerivation rec {
version = "4.4.1";
version = "4.5.0";
pname = "hal-hardware-analyzer";
src = fetchFromGitHub {
owner = "emsec";
repo = "hal";
rev = "v${version}";
sha256 = "sha256-8kmYeqsmqR7tY044rZb3KuEAVGv37IObX6k1qjXWG0A=";
tag = "v${version}";
hash = "sha256-4HLM/7JCDxWRWusGL4lUa8KXCn9pe3Vkr+lOxHOraNU=";
};
patches = [
(fetchpatch {
name = "de-vendor-nlohmann-json.patch";
# https://github.com/emsec/hal/pull/596
url = "https://github.com/emsec/hal/commit/f8337d554d80cfa2588512696696fd4c878dd7a3.patch";
hash = "sha256-QjgvcduwbFccC807JFOevlTfO3KiL9T3HSqYmh3sXAQ=";
})
(fetchpatch {
name = "fix-vendored-igraph-regression.patch";
# https://github.com/emsec/hal/pull/596
url = "https://github.com/emsec/hal/commit/fe1fe74719ab4fef873a22e2b28cce0c57d570e0.patch";
hash = "sha256-bjbW4pr04pP0TCuSdzPcV8h6LbLWMvdGSf61RL9Ju6E=";
})
./4.4.1-newer-spdlog-fmt-compat.patch
./resynthesis-fix-narrowing-conversion.patch
];
# make sure bundled dependencies don't get in the way - install also otherwise
# copies them in full to the output, bloating the package
postPatch = ''
@@ -117,6 +99,7 @@ stdenv.mkDerivation rec {
'';
meta = with lib; {
changelog = "https://github.com/emsec/hal/blob/${src.tag}/CHANGELOG.md";
description = "Comprehensive reverse engineering and manipulation framework for gate-level netlists";
mainProgram = "hal";
homepage = "https://github.com/emsec/hal";
@@ -1,13 +0,0 @@
diff --git a/plugins/resynthesis/src/resynthesis.cpp b/plugins/resynthesis/src/resynthesis.cpp
index 7a7e404114f..f2889667af8 100644
--- a/plugins/resynthesis/src/resynthesis.cpp
+++ b/plugins/resynthesis/src/resynthesis.cpp
@@ -1058,7 +1058,7 @@ namespace hal
// delete the created directory and the contained files
std::filesystem::remove_all(base_path);
- return OK(subgraph.size());
+ return OK(static_cast<unsigned int>(subgraph.size()));
}
Result<u32> resynthesize_subgraph_of_type(Netlist* nl, const std::vector<const GateType*>& gate_types, GateLibrary* target_gl)