Skip to content

Commit

Permalink
Remove remaining warnings and upload installation scripts
Browse files Browse the repository at this point in the history
  • Loading branch information
nicolaimueller committed Aug 14, 2024
1 parent 7a845d0 commit 6719400
Show file tree
Hide file tree
Showing 7 changed files with 83 additions and 15 deletions.
15 changes: 15 additions & 0 deletions default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# default.nix

let

nixpkgs = fetchTarball "https://github.com/NixOS/nixpkgs/tarball/nixos-24.05";

pkgs = import nixpkgs { config = {}; overlays = []; };

in

{

prolead = pkgs.callPackage ./prolead.nix { };

}
2 changes: 1 addition & 1 deletion inc/Hardware/StuckAtOneFault.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ class StuckAtOneFault : public Fault {
* @param fault_free_computation The fault-free computation computed by the simulator.
* @return One is returned since for StuckAtZero fault, the signal is always set to 0.
*/
virtual uint64_t ComputeFaultEffect(uint64_t fault_free_computation) const override {
virtual uint64_t ComputeFaultEffect(uint64_t /*fault_free_computation*/) const override {
return 0xffffffffffffffff;
}
};
2 changes: 1 addition & 1 deletion inc/Hardware/StuckAtZeroFault.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ class StuckAtZeroFault : public Fault {
* @param fault_free_computation The fault-free computation computed by the simulator.
* @return Zero is returned since for StuckAtZero fault, the signal is always set to 0.
*/
virtual uint64_t ComputeFaultEffect(uint64_t fault_free_computation) const override {
virtual uint64_t ComputeFaultEffect(uint64_t /*fault_free_computation*/) const override {
return 0;
}
};
8 changes: 4 additions & 4 deletions inc/Util/FileParsing.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@
#include <boost/fusion/include/adapt_struct.hpp>
#include <boost/fusion/include/io.hpp>
#include <boost/json.hpp>
#include <boost/spirit/include/phoenix.hpp>
#include <boost/spirit/include/phoenix_core.hpp>
#include <boost/spirit/include/phoenix_object.hpp>
#include <boost/spirit/include/phoenix_operator.hpp>
#include <boost/phoenix.hpp>
#include <boost/phoenix/core.hpp>
#include <boost/phoenix/object.hpp>
#include <boost/phoenix/operator.hpp>
#include <boost/spirit/include/qi.hpp>
#include <cstdint>
#include <filesystem>
Expand Down
51 changes: 51 additions & 0 deletions prolead.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
# prolead.nix
{
stdenv,
fetchFromGitHub,
pkg-config,
gnumake,
boost185,
flint,
python310,
catch2,
gcc-arm-embedded,
}:

stdenv.mkDerivation {
pname = "prolead";
version = "v3.0.0-alpha";

src = fetchFromGitHub {
owner = "ChairImpSec";
repo = "PROLEAD";
rev = "v3.0.0-alpha";
sha256 = "1jcdpms8nbva7d8f8if0axq1aih0j8bvmg8i7cwb5n4p9fydx5vb";
};

# Required for building
nativeBuildInputs = [
pkg-config
gnumake
];
nativeCheckInputs = [
catch2
];

# Required at runtime
buildInputs = [
(boost185.override {
enablePython = true;
python = python310;
})
flint
python310
gcc-arm-embedded
];

installPhase = ''
runHook preInstall
mkdir -p $out/bin
cp release/PROLEAD $out/bin
runHook postInstall
'';
}
18 changes: 10 additions & 8 deletions shell.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,21 @@

pkgs.mkShell {
name = "prolead-dev";
nativeBuildInputs = with pkgs; [ pkg-config ];
buildInputs = with pkgs; [

nativeBuildInputs = with pkgs; [
pkg-config
gnumake
];
nativeCheckInputs = with pkgs; [
catch2
];
buildInputs = with pkgs; [
(boost185.override {
enablePython = true;
python = python310;
enablePython = true;
python = python310;
})
flint
git
python310
catch2
heaptrack
flamegraph
gcc-arm-embedded
];
}
2 changes: 1 addition & 1 deletion src/Hardware/Propagation.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ namespace Hardware{
}

template <>
bool Propagation<RelaxedProbe>::IsObsolete(const Library& library, const CircuitStruct& circuit, const Settings& settings){
bool Propagation<RelaxedProbe>::IsObsolete(const Library& /*library*/, const CircuitStruct& circuit, const Settings& /*settings*/){
uint64_t signal_index = GetSignalIndex();

if (!extension_indices_[0].number_of_enable_indices_ && extension_indices_[0].propagation_indices_.empty() && !extension_indices_[0].number_of_signal_indices_) {
Expand Down

0 comments on commit 6719400

Please sign in to comment.