Fix some compilation issues

This commit is contained in:
momo5502
2025-01-05 13:11:32 +01:00
parent c07fb2ca86
commit 05e75a20ba
5 changed files with 18 additions and 9 deletions

View File

@@ -109,12 +109,12 @@ namespace
}
};
struct my_fuzzer_handler : fuzzer::handler
struct my_fuzzing_handler : fuzzer::fuzzing_handler
{
std::vector<std::byte> emulator_state{};
std::atomic_bool stop_fuzzing{false};
my_fuzzer_handler(std::vector<std::byte> emulator_state)
my_fuzzing_handler(std::vector<std::byte> emulator_state)
: emulator_state(std::move(emulator_state))
{
}
@@ -137,7 +137,7 @@ namespace
utils::buffer_serializer serializer{};
base_emulator.serialize(serializer);
my_fuzzer_handler handler{serializer.move_buffer()};
my_fuzzing_handler handler{serializer.move_buffer()};
fuzzer::run(handler, concurrency);
}

View File

@@ -8,7 +8,7 @@ namespace fuzzer
class fuzzing_context
{
public:
fuzzing_context(input_generator& generator, handler& handler)
fuzzing_context(input_generator& generator, fuzzing_handler& handler)
: generator(generator)
, handler(handler)
{
@@ -36,7 +36,7 @@ namespace fuzzer
}
input_generator& generator;
handler& handler;
fuzzing_handler& handler;
std::atomic_uint64_t executions{0};
private:
@@ -110,7 +110,7 @@ namespace fuzzer
};
}
void run(handler& handler, const size_t concurrency)
void run(fuzzing_handler& handler, const size_t concurrency)
{
input_generator generator{};
fuzzing_context context{generator, handler};

View File

@@ -23,9 +23,9 @@ namespace fuzzer
const std::function<coverage_functor>& coverage_handler) = 0;
};
struct handler
struct fuzzing_handler
{
virtual ~handler() = default;
virtual ~fuzzing_handler() = default;
virtual std::unique_ptr<executer> make_executer() = 0;
@@ -35,5 +35,5 @@ namespace fuzzer
}
};
void run(handler& handler, size_t concurrency = std::thread::hardware_concurrency());
void run(fuzzing_handler& handler, size_t concurrency = std::thread::hardware_concurrency());
}

View File

@@ -1,4 +1,5 @@
#include "random_generator.hpp"
#include <cstring>
namespace fuzzer
{

View File

@@ -4,11 +4,19 @@
#include <x64_emulator.hpp>
#include "platform/platform.hpp"
#ifdef WIN32
#ifdef UNICORN_EMULATOR_IMPL
#define UNICORN_EMULATOR_DLL_STORAGE EXPORT_SYMBOL
#else
#define UNICORN_EMULATOR_DLL_STORAGE IMPORT_SYMBOL
#endif
#else
#ifdef UNICORN_EMULATOR_IMPL
#define UNICORN_EMULATOR_DLL_STORAGE __attribute__((visibility("default")))
#else
#define UNICORN_EMULATOR_DLL_STORAGE
#endif
#endif
namespace unicorn
{