diff options
| author | Lioncash <mathew1800@gmail.com> | 2020-07-27 19:00:41 -0400 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2020-07-27 21:21:01 -0400 |
| commit | a7af349daee85237384dba07533c9a407cf15592 (patch) | |
| tree | e337a6e823960cc6b2a7d05c7e33e80cc51a4581 /src/core/tools/freezer.cpp | |
| parent | 6b35317ff3ec51a0d28181094ee73634e639d658 (diff) | |
core_timing: Make use of uintptr_t to represent user_data
Makes the interface future-proofed for supporting other platforms in the event we ever support platforms with differing pointer sizes. This way, we have a type in place that is always guaranteed to be able to represent a pointer exactly.
Diffstat (limited to 'src/core/tools/freezer.cpp')
| -rw-r--r-- | src/core/tools/freezer.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/core/tools/freezer.cpp b/src/core/tools/freezer.cpp index 27b894b511..2003e096f9 100644 --- a/src/core/tools/freezer.cpp +++ b/src/core/tools/freezer.cpp @@ -55,10 +55,11 @@ void MemoryWriteWidth(Core::Memory::Memory& memory, u32 width, VAddr addr, u64 v Freezer::Freezer(Core::Timing::CoreTiming& core_timing_, Core::Memory::Memory& memory_) : core_timing{core_timing_}, memory{memory_} { - event = Core::Timing::CreateEvent("MemoryFreezer::FrameCallback", - [this](u64 userdata, std::chrono::nanoseconds ns_late) { - FrameCallback(userdata, ns_late); - }); + event = Core::Timing::CreateEvent( + "MemoryFreezer::FrameCallback", + [this](std::uintptr_t user_data, std::chrono::nanoseconds ns_late) { + FrameCallback(user_data, ns_late); + }); core_timing.ScheduleEvent(memory_freezer_ns, event); } @@ -159,7 +160,7 @@ std::vector<Freezer::Entry> Freezer::GetEntries() const { return entries; } -void Freezer::FrameCallback(u64, std::chrono::nanoseconds ns_late) { +void Freezer::FrameCallback(std::uintptr_t, std::chrono::nanoseconds ns_late) { if (!IsActive()) { LOG_DEBUG(Common_Memory, "Memory freezer has been deactivated, ending callback events."); return; |