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

refactor(rdtsc): clean up code overall

Browse Source 
Change type of chrono return to be auto

Co-authored-by: Maurice Heumann <MauriceHeumann@gmail.com>

simplify conditional compile and add #else to prevent clang-tidy breaking CI

Co-authored-by: Maurice Heumann <MauriceHeumann@gmail.com>
This commit is contained in:
Soham Nandy
2025-04-11 11:42:36 +05:30
parent 55f29caf0f
commit daeefb4a7f
2 changed files with 8 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/common/utils/time.hpp
View File

@@ -40,16 +40,13 @@ namespace utils
/// TODO: find better solution for ARM and Figure out better CPU base frequency heuristics
virtual uint64_t timestamp_counter()
{
#if defined(_MSC_VER)
#if defined(_M_X64) || defined(_M_AMD64) || defined(_M_IX86)
return __rdtsc(); // 64-bit with MSVC intrinsic
#endif
#elif defined(__x86_64__) || defined(__i386__) || defined(__amd64__) // If we are using clang or gcc
return __rdtsc(); // 64-bit with clang/gcc intrinsic
#endif
int64_t count = std::chrono::high_resolution_clock::now().time_since_epoch().count();
#if defined(_M_X64) || defined(_M_AMD64) || defined(_M_IX86) || defined(__x86_64__) || defined(__i386__) || \
defined(__amd64__)
return __rdtsc(); // any x86 system will have this instrinsic
#else
const auto count = std::chrono::high_resolution_clock::now().time_since_epoch().count();
return static_cast<uint64_t>((count * 38LL) / 10LL);
#endif
}
};

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

@@ -449,18 +449,8 @@ void windows_emulator::setup_hooks()
this->emu().hook_instruction(x64_hookable_instructions::rdtsc, [&] {
uint64_t ticks = this->clock_->timestamp_counter();
static uint64_t fake_ticks = ticks;
static uint64_t prev_ticks = 0;
if (ticks > prev_ticks)
{
fake_ticks += (ticks - prev_ticks);
}
fake_ticks = std::min(fake_ticks, ticks);
prev_ticks = ticks;
this->emu().reg(x64_register::rax, fake_ticks & 0xFFFFFFFF);
this->emu().reg(x64_register::rdx, (fake_ticks >> 32) & 0xFFFFFFFF);
this->emu().reg(x64_register::rax, ticks & 0xFFFFFFFF);
this->emu().reg(x64_register::rdx, (ticks >> 32) & 0xFFFFFFFF);
return instruction_hook_continuation::skip_instruction;
});