mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-08-03 14:49:22 +00:00
Merge pull request #7602 from CrystalGamma/stop-g_jit
stop using g_jit outside of JitInterface
This commit is contained in:
commit
bfb9b1aca5
14 changed files with 57 additions and 41 deletions
|
@ -8,6 +8,7 @@
|
|||
#include "Common/Timer.h"
|
||||
#include "Core/MemTools.h"
|
||||
#include "Core/PowerPC/JitCommon/JitBase.h"
|
||||
#include "Core/PowerPC/JitInterface.h"
|
||||
|
||||
// include order is important
|
||||
#include <gtest/gtest.h> // NOLINT
|
||||
|
@ -56,7 +57,7 @@ TEST(PageFault, PageFault)
|
|||
Common::WriteProtectMemory(data, PAGE_GRAN, false);
|
||||
|
||||
PageFaultFakeJit pfjit;
|
||||
g_jit = &pfjit;
|
||||
JitInterface::SetJit(&pfjit);
|
||||
pfjit.m_data = data;
|
||||
|
||||
auto start = std::chrono::high_resolution_clock::now();
|
||||
|
@ -67,7 +68,7 @@ TEST(PageFault, PageFault)
|
|||
((unsigned long long)std::chrono::duration_cast<std::chrono::nanoseconds>(diff).count())
|
||||
|
||||
EMM::UninstallExceptionHandler();
|
||||
g_jit = nullptr;
|
||||
JitInterface::SetJit(nullptr);
|
||||
|
||||
printf("page fault timing:\n");
|
||||
printf("start->HandleFault %llu ns\n", AS_NS(pfjit.m_pre_unprotect_time - start));
|
||||
|
|
|
@ -10,8 +10,8 @@
|
|||
#include "Common/FloatUtils.h"
|
||||
#include "Common/x64ABI.h"
|
||||
#include "Core/PowerPC/Gekko.h"
|
||||
#include "Core/PowerPC/Jit64/Jit.h"
|
||||
#include "Core/PowerPC/Jit64Common/Jit64AsmCommon.h"
|
||||
#include "Core/PowerPC/Jit64Common/Jit64Base.h"
|
||||
#include "Core/PowerPC/Jit64Common/Jit64PowerPCState.h"
|
||||
|
||||
#include <gtest/gtest.h>
|
||||
|
@ -19,7 +19,7 @@
|
|||
class TestCommonAsmRoutines : public CommonAsmRoutines
|
||||
{
|
||||
public:
|
||||
TestCommonAsmRoutines()
|
||||
TestCommonAsmRoutines() : CommonAsmRoutines(jit)
|
||||
{
|
||||
using namespace Gen;
|
||||
|
||||
|
@ -49,6 +49,7 @@ public:
|
|||
}
|
||||
|
||||
u64 (*wrapped_frsqrte)(u64, UReg_FPSCR&);
|
||||
Jit64 jit;
|
||||
};
|
||||
|
||||
TEST(Jit64, Frsqrte)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue