···

       
1
       
-
       
compatibility with newer spdlog/fmt versions

     

       
2
       
-
       


     

       
3
       
-
       
diff --git a/plugins/module_identification/src/api/module_identification.cpp b/plugins/module_identification/src/api/module_identification.cpp

     

       
4
       
-
       
index 808875e8a68..3cf3cf1fb8b 100644

     

       
5
       
-
       
--- a/plugins/module_identification/src/api/module_identification.cpp

     

       
6
       
-
       
+++ b/plugins/module_identification/src/api/module_identification.cpp

     

       
7
       
-
       
@@ -406,7 +406,7 @@ namespace hal

     

       
8
       
-
       
 

     

       
9
       
-
       
                 const u32 num_threads = std::min(config.m_max_thread_count, std::thread::hardware_concurrency() - 1);

     

       
10
       
-
       
 

     

       
11
       
-
       
-                log_info("module_identification", "running with {} threads and {} multithreading priority", num_threads, config.m_multithreading_priority);

     

       
12
       
-
       
+                log_info("module_identification", "running with {} threads and {} multithreading priority", num_threads, fmt::underlying(config.m_multithreading_priority));

     

       
13
       
-
       
 

     

       
14
       
-
       
                 auto stats = Statistics();

     

       
15
       
-
       
 

     

       
16
       
-
       
diff --git a/plugins/z3_utils/src/simplification.cpp b/plugins/z3_utils/src/simplification.cpp

     

       
17
       
-
       
index d64cab665f2..561fa7f1a23 100644

     

       
18
       
-
       
--- a/plugins/z3_utils/src/simplification.cpp

     

       
19
       
-
       
+++ b/plugins/z3_utils/src/simplification.cpp

     

       
20
       
-
       
@@ -617,7 +617,7 @@ namespace hal

     

       
21
       
-
       
                     return false;

     

       
22
       
-
       
 

     

       
23
       
-
       
                 default: {

     

       
24
       
-
       
-                    log_error("z3_utils", "commutative check not implemeted for type {}!", t);

     

       
25
       
-
       
+                    log_error("z3_utils", "commutative check not implemeted for type {}!", fmt::underlying(t));

     

       
26
       
-
       
                     return false;

     

       
27
       
-
       
                 }

     

       
28
       
-
       
             }

     

···

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

···

       
4
       
 
       
  boost,

     

       
5
       
 
       
  cmake,

     

       
6
       
 
       
  fetchFromGitHub,

     

       
7
       
-
       
  fetchpatch,

     

       
8
       
 
       
  graphviz,

     

       
9
       
 
       
  igraph,

     

       
10
       
 
       
  llvmPackages,

     
···

       
23
       
 
       
}:

     

       
24
       
 
       


     

       
25
       
 
       
stdenv.mkDerivation rec {

     

       
26
       
-
       
  version = "4.4.1";

     

       
27
       
 
       
  pname = "hal-hardware-analyzer";

     

       
28
       
 
       


     

       
29
       
 
       
  src = fetchFromGitHub {

     

       
30
       
 
       
    owner = "emsec";

     

       
31
       
 
       
    repo = "hal";

     

       
32
       
-
       
    rev = "v${version}";

     

       
33
       
-
       
    sha256 = "sha256-8kmYeqsmqR7tY044rZb3KuEAVGv37IObX6k1qjXWG0A=";

     

       
34
       
 
       
  };

     

       
35
       
-
       


     

       
36
       
-
       
  patches = [

     

       
37
       
-
       
    (fetchpatch {

     

       
38
       
-
       
      name = "de-vendor-nlohmann-json.patch";

     

       
39
       
-
       
      # https://github.com/emsec/hal/pull/596

     

       
40
       
-
       
      url = "https://github.com/emsec/hal/commit/f8337d554d80cfa2588512696696fd4c878dd7a3.patch";

     

       
41
       
-
       
      hash = "sha256-QjgvcduwbFccC807JFOevlTfO3KiL9T3HSqYmh3sXAQ=";

     

       
42
       
-
       
    })

     

       
43
       
-
       
    (fetchpatch {

     

       
44
       
-
       
      name = "fix-vendored-igraph-regression.patch";

     

       
45
       
-
       
      # https://github.com/emsec/hal/pull/596

     

       
46
       
-
       
      url = "https://github.com/emsec/hal/commit/fe1fe74719ab4fef873a22e2b28cce0c57d570e0.patch";

     

       
47
       
-
       
      hash = "sha256-bjbW4pr04pP0TCuSdzPcV8h6LbLWMvdGSf61RL9Ju6E=";

     

       
48
       
-
       
    })

     

       
49
       
-
       
    ./4.4.1-newer-spdlog-fmt-compat.patch

     

       
50
       
-
       
    ./resynthesis-fix-narrowing-conversion.patch

     

       
51
       
-
       
  ];

     

       
52
       
 
       


     

       
53
       
 
       
  # make sure bundled dependencies don't get in the way - install also otherwise

     

       
54
       
 
       
  # copies them in full to the output, bloating the package

     
···

       
117
       
 
       
  '';

     

       
118
       
 
       


     

       
119
       
 
       
  meta = with lib; {

     

       
0
       
 
       

     

       
120
       
 
       
    description = "Comprehensive reverse engineering and manipulation framework for gate-level netlists";

     

       
121
       
 
       
    mainProgram = "hal";

     

       
122
       
 
       
    homepage = "https://github.com/emsec/hal";

     

···

       
4
       
 
       
  boost,

     

       
5
       
 
       
  cmake,

     

       
6
       
 
       
  fetchFromGitHub,

     

       
0
       
 
       

     

       
7
       
 
       
  graphviz,

     

       
8
       
 
       
  igraph,

     

       
9
       
 
       
  llvmPackages,

     
···

       
22
       
 
       
}:

     

       
23
       
 
       


     

       
24
       
 
       
stdenv.mkDerivation rec {

     

       
25
       
+
       
  version = "4.5.0";

     

       
26
       
 
       
  pname = "hal-hardware-analyzer";

     

       
27
       
 
       


     

       
28
       
 
       
  src = fetchFromGitHub {

     

       
29
       
 
       
    owner = "emsec";

     

       
30
       
 
       
    repo = "hal";

     

       
31
       
+
       
    tag = "v${version}";

     

       
32
       
+
       
    hash = "sha256-4HLM/7JCDxWRWusGL4lUa8KXCn9pe3Vkr+lOxHOraNU=";

     

       
33
       
 
       
  };

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
34
       
 
       


     

       
35
       
 
       
  # make sure bundled dependencies don't get in the way - install also otherwise

     

       
36
       
 
       
  # copies them in full to the output, bloating the package

     
···

       
99
       
 
       
  '';

     

       
100
       
 
       


     

       
101
       
 
       
  meta = with lib; {

     

       
102
       
+
       
    changelog = "https://github.com/emsec/hal/blob/${src.tag}/CHANGELOG.md";

     

       
103
       
 
       
    description = "Comprehensive reverse engineering and manipulation framework for gate-level netlists";

     

       
104
       
 
       
    mainProgram = "hal";

     

       
105
       
 
       
    homepage = "https://github.com/emsec/hal";

     

···

       
1
       
-
       
diff --git a/plugins/resynthesis/src/resynthesis.cpp b/plugins/resynthesis/src/resynthesis.cpp

     

       
2
       
-
       
index 7a7e404114f..f2889667af8 100644

     

       
3
       
-
       
--- a/plugins/resynthesis/src/resynthesis.cpp

     

       
4
       
-
       
+++ b/plugins/resynthesis/src/resynthesis.cpp

     

       
5
       
-
       
@@ -1058,7 +1058,7 @@ namespace hal

     

       
6
       
-
       
             // delete the created directory and the contained files

     

       
7
       
-
       
             std::filesystem::remove_all(base_path);

     

       
8
       
-
       
 

     

       
9
       
-
       
-            return OK(subgraph.size());

     

       
10
       
-
       
+            return OK(static_cast<unsigned int>(subgraph.size()));

     

       
11
       
-
       
         }

     

       
12
       
-
       
 

     

       
13
       
-
       
         Result<u32> resynthesize_subgraph_of_type(Netlist* nl, const std::vector<const GateType*>& gate_types, GateLibrary* target_gl)

     

···

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0