Lightemerald/windows-user-space-emulator
2
0
Fork 0
mirror of https://github.com/momo5502/emulator.git synced 2026-01-11 16:46:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move emulator settings

Browse Source
This commit is contained in:
momo5502
2024-12-24 09:26:19 +01:00
parent 6111f2fad3
commit 4766e164e0
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/analyzer/main.cpp
View File

@@ -95,12 +95,12 @@ namespace
return; return;
} }
const emulator_settings settings{ emulator_settings settings{
.application = argv[0], .application = argv[0],
.arguments = parse_arguments(argv, argc), .arguments = parse_arguments(argv, argc),
}; };
windows_emulator win_emu{settings}; windows_emulator win_emu{std::move(settings)};
(void)&watch_system_objects; (void)&watch_system_objects;
watch_system_objects(win_emu); watch_system_objects(win_emu);

4
src/fuzzer/main.cpp
View File

@@ -144,11 +144,11 @@ namespace
void run(const std::string_view application) void run(const std::string_view application)
{ {
const emulator_settings settings{ emulator_settings settings{
.application = application, .application = application,
}; };
windows_emulator win_emu{settings}; windows_emulator win_emu{std::move(settings)};
forward_emulator(win_emu); forward_emulator(win_emu);
run_fuzzer(win_emu); run_fuzzer(win_emu);

6
src/windows-emulator-test/emulation_test_utils.hpp
View File

@@ -20,10 +20,10 @@
namespace test 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"; settings.application = "./test-sample.exe";
return windows_emulator{settings}; return windows_emulator{std::move(settings)};
} }
inline windows_emulator create_sample_emulator() inline windows_emulator create_sample_emulator()
@@ -34,6 +34,6 @@ namespace test
.use_relative_time = true, .use_relative_time = true,
}; };
return create_sample_emulator(settings); return create_sample_emulator(std::move(settings));
} }
} }

2
src/windows-emulator/windows_emulator.cpp
View File

@@ -716,7 +716,7 @@ std::unique_ptr<x64_emulator> create_default_x64_emulator()
return unicorn::create_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<x64_emulator> emu) std::unique_ptr<x64_emulator> emu)
: windows_emulator(std::move(emu)) : windows_emulator(std::move(emu))
{ {

2
src/windows-emulator/windows_emulator.hpp
View File

@@ -26,7 +26,7 @@ class windows_emulator
{ {
public: public:
windows_emulator(std::unique_ptr<x64_emulator> emu = create_default_x64_emulator()); windows_emulator(std::unique_ptr<x64_emulator> emu = create_default_x64_emulator());
windows_emulator(const emulator_settings& settings, windows_emulator(emulator_settings settings,
std::unique_ptr<x64_emulator> emu = create_default_x64_emulator()); std::unique_ptr<x64_emulator> emu = create_default_x64_emulator());
windows_emulator(windows_emulator&&) = delete; windows_emulator(windows_emulator&&) = delete;