mirror of
https://github.com/momo5502/emulator.git
synced 2026-01-18 11:13:57 +00:00
Fix some compilation issues
This commit is contained in:
@@ -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);
|
||||
}
|
||||
|
||||
@@ -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};
|
||||
|
||||
@@ -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());
|
||||
}
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
#include "random_generator.hpp"
|
||||
#include <cstring>
|
||||
|
||||
namespace fuzzer
|
||||
{
|
||||
|
||||
@@ -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
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user