Replacing the tick count timer with xplat abstraction (also better rate).
Fixes #346.
This commit is contained in:
@@ -14,7 +14,6 @@
|
||||
#include "xenia/base/clock.h"
|
||||
#include "xenia/base/logging.h"
|
||||
#include "xenia/base/math.h"
|
||||
#include "xenia/base/platform_win.h"
|
||||
#include "xenia/emulator.h"
|
||||
#include "xenia/kernel/kernel_state.h"
|
||||
#include "xenia/kernel/xboxkrnl_private.h"
|
||||
@@ -131,16 +130,11 @@ XboxkrnlModule::XboxkrnlModule(Emulator* emulator, KernelState* kernel_state)
|
||||
xe::store_and_swap<uint32_t>(lpKeTimeStampBundle + 16,
|
||||
Clock::QueryGuestUptimeMillis());
|
||||
xe::store_and_swap<uint32_t>(lpKeTimeStampBundle + 20, 0);
|
||||
CreateTimerQueueTimer(
|
||||
×tamp_timer_, nullptr,
|
||||
[](PVOID param, BOOLEAN timer_or_wait_fired) {
|
||||
auto timestamp_bundle = reinterpret_cast<uint8_t*>(param);
|
||||
xe::store_and_swap<uint32_t>(timestamp_bundle + 16,
|
||||
timestamp_timer_ = xe::threading::HighResolutionTimer::CreateRepeating(
|
||||
std::chrono::milliseconds(1), [lpKeTimeStampBundle]() {
|
||||
xe::store_and_swap<uint32_t>(lpKeTimeStampBundle + 16,
|
||||
Clock::QueryGuestUptimeMillis());
|
||||
},
|
||||
lpKeTimeStampBundle, 0,
|
||||
1, // 1ms
|
||||
WT_EXECUTEINTIMERTHREAD);
|
||||
});
|
||||
}
|
||||
|
||||
std::vector<xe::cpu::Export*> xboxkrnl_exports(4096);
|
||||
@@ -171,9 +165,7 @@ void XboxkrnlModule::RegisterExportTable(
|
||||
export_resolver->RegisterTable("xboxkrnl.exe", &xboxkrnl_exports);
|
||||
}
|
||||
|
||||
XboxkrnlModule::~XboxkrnlModule() {
|
||||
DeleteTimerQueueTimer(nullptr, timestamp_timer_, nullptr);
|
||||
}
|
||||
XboxkrnlModule::~XboxkrnlModule() = default;
|
||||
|
||||
int XboxkrnlModule::LaunchModule(const char* path) {
|
||||
// Create and register the module. We keep it local to this function and
|
||||
|
||||
@@ -10,6 +10,9 @@
|
||||
#ifndef XENIA_KERNEL_XBOXKRNL_MODULE_H_
|
||||
#define XENIA_KERNEL_XBOXKRNL_MODULE_H_
|
||||
|
||||
#include <memory>
|
||||
|
||||
#include "xenia/base/threading.h"
|
||||
#include "xenia/cpu/export_resolver.h"
|
||||
#include "xenia/kernel/objects/xkernel_module.h"
|
||||
#include "xenia/kernel/xboxkrnl_ordinals.h"
|
||||
@@ -17,9 +20,6 @@
|
||||
// All of the exported functions:
|
||||
#include "xenia/kernel/xboxkrnl_rtl.h"
|
||||
|
||||
// TODO(benvanik): switch timer.
|
||||
typedef void* HANDLE;
|
||||
|
||||
namespace xe {
|
||||
namespace kernel {
|
||||
|
||||
@@ -35,7 +35,7 @@ class XboxkrnlModule : public XKernelModule {
|
||||
int LaunchModule(const char* path);
|
||||
|
||||
private:
|
||||
HANDLE timestamp_timer_;
|
||||
std::unique_ptr<xe::threading::HighResolutionTimer> timestamp_timer_;
|
||||
};
|
||||
|
||||
} // namespace kernel
|
||||
|
||||
Reference in New Issue
Block a user