From 4766e164e0ff27f9927be6cbbe7b9c4a817010d2 Mon Sep 17 00:00:00 2001 From: momo5502 Date: Tue, 24 Dec 2024 09:26:19 +0100 Subject: [PATCH] Move emulator settings --- src/analyzer/main.cpp | 4 ++-- src/fuzzer/main.cpp | 4 ++-- src/windows-emulator-test/emulation_test_utils.hpp | 6 +++--- src/windows-emulator/windows_emulator.cpp | 2 +- src/windows-emulator/windows_emulator.hpp | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/analyzer/main.cpp b/src/analyzer/main.cpp index db098f57..dc3cfd41 100644 --- a/src/analyzer/main.cpp +++ b/src/analyzer/main.cpp @@ -95,12 +95,12 @@ namespace return; } - const emulator_settings settings{ + emulator_settings settings{ .application = argv[0], .arguments = parse_arguments(argv, argc), }; - windows_emulator win_emu{settings}; + windows_emulator win_emu{std::move(settings)}; (void)&watch_system_objects; watch_system_objects(win_emu); diff --git a/src/fuzzer/main.cpp b/src/fuzzer/main.cpp index de088639..de1baa77 100644 --- a/src/fuzzer/main.cpp +++ b/src/fuzzer/main.cpp @@ -144,11 +144,11 @@ namespace void run(const std::string_view application) { - const emulator_settings settings{ + emulator_settings settings{ .application = application, }; - windows_emulator win_emu{settings}; + windows_emulator win_emu{std::move(settings)}; forward_emulator(win_emu); run_fuzzer(win_emu); diff --git a/src/windows-emulator-test/emulation_test_utils.hpp b/src/windows-emulator-test/emulation_test_utils.hpp index c45db025..cc934220 100644 --- a/src/windows-emulator-test/emulation_test_utils.hpp +++ b/src/windows-emulator-test/emulation_test_utils.hpp @@ -20,10 +20,10 @@ namespace test { - inline windows_emulator create_sample_emulator(emulator_settings& settings) + inline windows_emulator create_sample_emulator(emulator_settings settings) { settings.application = "./test-sample.exe"; - return windows_emulator{settings}; + return windows_emulator{std::move(settings)}; } inline windows_emulator create_sample_emulator() @@ -34,6 +34,6 @@ namespace test .use_relative_time = true, }; - return create_sample_emulator(settings); + return create_sample_emulator(std::move(settings)); } } diff --git a/src/windows-emulator/windows_emulator.cpp b/src/windows-emulator/windows_emulator.cpp index a2883bad..2591bf30 100644 --- a/src/windows-emulator/windows_emulator.cpp +++ b/src/windows-emulator/windows_emulator.cpp @@ -716,7 +716,7 @@ std::unique_ptr create_default_x64_emulator() return unicorn::create_x64_emulator(); } -windows_emulator::windows_emulator(const emulator_settings& settings, +windows_emulator::windows_emulator(emulator_settings settings, std::unique_ptr emu) : windows_emulator(std::move(emu)) { diff --git a/src/windows-emulator/windows_emulator.hpp b/src/windows-emulator/windows_emulator.hpp index ce82e0b0..cef15e47 100644 --- a/src/windows-emulator/windows_emulator.hpp +++ b/src/windows-emulator/windows_emulator.hpp @@ -26,7 +26,7 @@ class windows_emulator { public: windows_emulator(std::unique_ptr emu = create_default_x64_emulator()); - windows_emulator(const emulator_settings& settings, + windows_emulator(emulator_settings settings, std::unique_ptr emu = create_default_x64_emulator()); windows_emulator(windows_emulator&&) = delete;