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

Perform retrigger after violation

Browse Source
This commit is contained in:
momo5502
2024-11-03 20:27:30 +01:00
parent 690f314302
commit 3a26b3a894
3 changed files with 28 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/emulator/emulator.hpp
View File

@@ -130,6 +130,8 @@ public:
this->perform_deserialization(deserializer, true);
}
virtual bool has_violation() const = 0;
private:
std::vector<std::byte> last_snapshot_data_{};

50
src/unicorn-emulator/unicorn_x64_emulator.cpp
View File

@@ -241,7 +241,7 @@ namespace unicorn
uc_close(this->uc_);
}
void start(uint64_t start, const uint64_t end, std::chrono::nanoseconds timeout,
void start(const uint64_t start, const uint64_t end, std::chrono::nanoseconds timeout,
const size_t count) override
{
if (timeout.count() < 0)
@@ -249,31 +249,26 @@ namespace unicorn
timeout = {};
}
// TODO: Fix adjusting timeout and count
while (true)
this->has_violation_ = false;
const auto timeoutYs = std::chrono::duration_cast<std::chrono::microseconds>(timeout);
const auto res = uc_emu_start(*this, start, end, static_cast<uint64_t>(timeoutYs.count()),
count);
if (res == UC_ERR_OK)
{
this->retry_after_violation_ = false;
const auto timeoutYs = std::chrono::duration_cast<std::chrono::microseconds>(timeout);
const auto res = uc_emu_start(*this, start, end, static_cast<uint64_t>(timeoutYs.count()),
count);
if (res == UC_ERR_OK)
{
return;
}
return;
}
const auto is_violation = res == UC_ERR_READ_UNMAPPED || //
res == UC_ERR_WRITE_UNMAPPED || //
res == UC_ERR_FETCH_UNMAPPED || //
res == UC_ERR_READ_PROT || //
res == UC_ERR_WRITE_PROT || //
res == UC_ERR_FETCH_PROT;
const auto is_violation = //
res == UC_ERR_READ_UNMAPPED || //
res == UC_ERR_WRITE_UNMAPPED || //
res == UC_ERR_FETCH_UNMAPPED || //
res == UC_ERR_READ_PROT || //
res == UC_ERR_WRITE_PROT || //
res == UC_ERR_FETCH_PROT;
if (!is_violation || !this->retry_after_violation_)
{
uce(res);
}
start = this->read_instruction_pointer();
if (!is_violation || !this->has_violation_)
{
uce(res);
}
}
@@ -493,7 +488,7 @@ namespace unicorn
return false;
}
this->retry_after_violation_ = resume && has_ip_changed;
this->has_violation_ = resume && has_ip_changed;
if (has_ip_changed)
{
@@ -609,10 +604,15 @@ namespace unicorn
serializer.deserialize(buffer);
}
bool has_violation() const override
{
return this->has_violation_;
}
private:
mutable bool has_snapshots_{false};
uc_engine* uc_{};
bool retry_after_violation_{false};
bool has_violation_{false};
std::vector<std::unique_ptr<hook_object>> hooks_{};
};
}

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

@@ -964,7 +964,7 @@ void windows_emulator::start(std::chrono::nanoseconds timeout, size_t count)
this->emu().start_from_ip(timeout, count);
if (!this->switch_thread)
if (!this->switch_thread && !this->emu().has_violation())
{
break;
}