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

Fix stack alignment

Browse Source
This commit is contained in:
momo5502
2024-09-06 19:44:35 +02:00
parent daeea58c91
commit 2022513bbe
3 changed files with 33 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/windows_emulator/syscalls.cpp
View File

@@ -123,23 +123,33 @@ namespace
return resolve_argument<T>(emu, index++);
}
void write_status(const syscall_context& c, const NTSTATUS status)
void write_status(const syscall_context& c, const NTSTATUS status, const uint64_t initial_ip)
{
if (c.write_status)
{
c.emu.reg<uint64_t>(x64_register::rax, static_cast<uint64_t>(status));
}
const auto new_ip = c.emu.read_instruction_pointer();
if (initial_ip != new_ip)
{
c.emu.reg(x64_register::rip, new_ip - 2);
}
}
void forward(const syscall_context& c, NTSTATUS (*handler)())
{
const auto ip = c.emu.read_instruction_pointer();
const auto ret = handler();
write_status(c, ret);
write_status(c, ret, ip);
}
template <typename... Args>
void forward(const syscall_context& c, NTSTATUS (*handler)(const syscall_context&, Args...))
{
const auto ip = c.emu.read_instruction_pointer();
size_t index = 0;
std::tuple<const syscall_context&, Args...> func_args
{
@@ -148,7 +158,7 @@ namespace
};
const auto ret = std::apply(handler, std::move(func_args));
write_status(c, ret);
write_status(c, ret, ip);
}
NTSTATUS handle_NtQueryPerformanceCounter(const syscall_context&,