From 0fc774927fb0f08514e5ea5798760bcff1ceee21 Mon Sep 17 00:00:00 2001
From: "Unknown W. Brackets" <checkins@unknownbrackets.org>
Date: Sun, 10 Jan 2016 12:28:29 -0800
Subject: [PATCH] jit: Minor cleanups.

---
 Core/MIPS/ARM/ArmCompVFPU.cpp     | 2 +-
 Core/MIPS/ARM/ArmJit.h            | 8 ++++----
 Core/MIPS/ARM64/Arm64CompVFPU.cpp | 2 +-
 Core/MIPS/ARM64/Arm64Jit.h        | 8 ++++----
 Core/MIPS/fake/FakeJit.h          | 8 ++++----
 Core/MIPS/x86/Jit.h               | 8 ++++----
 6 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/Core/MIPS/ARM/ArmCompVFPU.cpp b/Core/MIPS/ARM/ArmCompVFPU.cpp
index 1adfd54f5c..4e2f98c3a8 100644
--- a/Core/MIPS/ARM/ArmCompVFPU.cpp
+++ b/Core/MIPS/ARM/ArmCompVFPU.cpp
@@ -136,7 +136,7 @@ namespace MIPSComp
 				// Prefix may say "z, z, z, z" but if this is a pair, we force to x.
 				// TODO: But some ops seem to use const 0 instead?
 				if (regnum >= n) {
-					WARN_LOG(CPU, "JIT: Invalid VFPU swizzle: %08x : %d / %d at PC = %08x (%s)", prefix, regnum, n, GetCompilerPC(), MIPSDisasmAt(js.compilerPC));
+					WARN_LOG(CPU, "JIT: Invalid VFPU swizzle: %08x : %d / %d at PC = %08x (%s)", prefix, regnum, n, GetCompilerPC(), MIPSDisasmAt(GetCompilerPC()));
 					regnum = 0;
 				}
 				
diff --git a/Core/MIPS/ARM/ArmJit.h b/Core/MIPS/ARM/ArmJit.h
index 26859c86ab..3df0936f69 100644
--- a/Core/MIPS/ARM/ArmJit.h
+++ b/Core/MIPS/ARM/ArmJit.h
@@ -30,11 +30,9 @@
 #include "stddef.h"
 #endif
 
-namespace MIPSComp
-{
+namespace MIPSComp {
 
-class ArmJit : public ArmGen::ARMXCodeBlock
-{
+class ArmJit : public ArmGen::ARMXCodeBlock {
 public:
 	ArmJit(MIPSState *mips);
 	virtual ~ArmJit();
@@ -42,6 +40,8 @@ public:
 	void DoState(PointerWrap &p);
 	static void DoDummyState(PointerWrap &p);
 
+	const JitOptions &GetJitOptions() { return jo; }
+
 	// Compiled ops should ignore delay slots
 	// the compiler will take care of them by itself
 	// OR NOT
diff --git a/Core/MIPS/ARM64/Arm64CompVFPU.cpp b/Core/MIPS/ARM64/Arm64CompVFPU.cpp
index dec8164b89..91500507ae 100644
--- a/Core/MIPS/ARM64/Arm64CompVFPU.cpp
+++ b/Core/MIPS/ARM64/Arm64CompVFPU.cpp
@@ -129,7 +129,7 @@ namespace MIPSComp {
 				// Prefix may say "z, z, z, z" but if this is a pair, we force to x.
 				// TODO: But some ops seem to use const 0 instead?
 				if (regnum >= n) {
-					WARN_LOG(CPU, "JIT: Invalid VFPU swizzle: %08x : %d / %d at PC = %08x (%s)", prefix, regnum, n, GetCompilerPC(), MIPSDisasmAt(js.compilerPC));
+					WARN_LOG(CPU, "JIT: Invalid VFPU swizzle: %08x : %d / %d at PC = %08x (%s)", prefix, regnum, n, GetCompilerPC(), MIPSDisasmAt(GetCompilerPC()));
 					regnum = 0;
 				}
 
diff --git a/Core/MIPS/ARM64/Arm64Jit.h b/Core/MIPS/ARM64/Arm64Jit.h
index 2877024338..36caaabe25 100644
--- a/Core/MIPS/ARM64/Arm64Jit.h
+++ b/Core/MIPS/ARM64/Arm64Jit.h
@@ -30,11 +30,9 @@
 #include "stddef.h"
 #endif
 
-namespace MIPSComp
-{
+namespace MIPSComp {
 
-class Arm64Jit : public Arm64Gen::ARM64CodeBlock
-{
+class Arm64Jit : public Arm64Gen::ARM64CodeBlock {
 public:
 	Arm64Jit(MIPSState *mips);
 	virtual ~Arm64Jit();
@@ -42,6 +40,8 @@ public:
 	void DoState(PointerWrap &p);
 	static void DoDummyState(PointerWrap &p);
 
+	const JitOptions &GetJitOptions() { return jo; }
+
 	// Compiled ops should ignore delay slots
 	// the compiler will take care of them by itself
 	// OR NOT
diff --git a/Core/MIPS/fake/FakeJit.h b/Core/MIPS/fake/FakeJit.h
index b76b7e737b..0546d0e038 100644
--- a/Core/MIPS/fake/FakeJit.h
+++ b/Core/MIPS/fake/FakeJit.h
@@ -26,19 +26,19 @@
 #include "stddef.h"
 #endif
 
-namespace MIPSComp
-{
+namespace MIPSComp {
 
 typedef int FakeReg;
 
-class FakeJit : public FakeGen::FakeXCodeBlock
-{
+class FakeJit : public FakeGen::FakeXCodeBlock {
 public:
 	FakeJit(MIPSState *mips);
 
 	void DoState(PointerWrap &p);
 	static void DoDummyState(PointerWrap &p);
 
+	const JitOptions &GetJitOptions() { return jo; }
+
 	void Comp_Generic(MIPSOpcode op);
 
 	void RunLoopUntil(u64 globalticks);
diff --git a/Core/MIPS/x86/Jit.h b/Core/MIPS/x86/Jit.h
index a896b7619d..cc927bb389 100644
--- a/Core/MIPS/x86/Jit.h
+++ b/Core/MIPS/x86/Jit.h
@@ -34,8 +34,7 @@
 
 class PointerWrap;
 
-namespace MIPSComp
-{
+namespace MIPSComp {
 
 // This is called when Jit hits a breakpoint.  Returns 1 when hit.
 u32 JitBreakpoint();
@@ -46,12 +45,13 @@ struct RegCacheState {
 	FPURegCacheState fpr;
 };
 
-class Jit : public Gen::XCodeBlock
-{
+class Jit : public Gen::XCodeBlock {
 public:
 	Jit(MIPSState *mips);
 	virtual ~Jit();
 
+	const JitOptions &GetJitOptions() { return jo; }
+
 	void DoState(PointerWrap &p);
 	static void DoDummyState(PointerWrap &p);