Merge pull request #1710 from degasus/jit-linking-fix

Jit: move constants out of class
dolphin-emu · Dec 17, 2014 · 418e006 · 418e006
2 parents d9e2f51 + 5f322cc
commit 418e006
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/Source/Core/Core/PowerPC/JitArm32/Jit.cpp b/Source/Core/Core/PowerPC/JitArm32/Jit.cpp
@@ -24,8 +24,6 @@
 
 using namespace ArmGen;
 
-static int CODE_SIZE = 1024*1024*32;
-
 void JitArm::Init()
 {
 	AllocCodeSpace(CODE_SIZE);

diff --git a/Source/Core/Core/PowerPC/JitCommon/Jit_Util.h b/Source/Core/Core/PowerPC/JitCommon/Jit_Util.h
@@ -47,17 +47,17 @@ class FarCodeCache : public Gen::X64CodeBlock
 	void Shutdown() { FreeCodeSpace(); m_enabled = false; }
 };
 
+static const int CODE_SIZE = 1024 * 1024 * 32;
+
+// a bit of a hack; the MMU results in a vast amount more code ending up in the far cache,
+// mostly exception handling, so give it a whole bunch more space if the MMU is on.
+static const int FARCODE_SIZE = 1024 * 1024 * 8;
+static const int FARCODE_SIZE_MMU = 1024 * 1024 * 48;
+
 // Like XCodeBlock but has some utilities for memory access.
 class EmuCodeBlock : public Gen::X64CodeBlock
 {
 public:
-	static const int CODE_SIZE = 1024 * 1024 * 32;
-
-	// a bit of a hack; the MMU results in a vast amount more code ending up in the far cache,
-	// mostly exception handling, so give it a whole bunch more space if the MMU is on.
-	static const int FARCODE_SIZE = 1024 * 1024 * 8;
-	static const int FARCODE_SIZE_MMU = 1024 * 1024 * 48;
-
 	FarCodeCache farcode;
 	u8* nearcode; // Backed up when we switch to far code.