Split off Routine into its own file.

src/GLES2/libGLESv2/libGLESv2.cbp

@@ -293,6 +293,8 @@
 		<Unit filename="./../../Main/serialcommon.h" />
 		<Unit filename="./../../Main/serialvalid.cpp" />
 		<Unit filename="./../../Main/serialvalid.h" />
+		<Unit filename="./../../Reactor/Routine.cpp" />
+		<Unit filename="./../../Reactor/Routine.hpp" />
 		<Unit filename="./../../Reactor/RoutineManager.cpp" />
 		<Unit filename="./../../Reactor/RoutineManager.hpp" />
 		<Unit filename="./../../Reactor/Nucleus.cpp" />

src/Reactor/Nucleus.cpp

@@ -26,6 +26,7 @@
 #include "llvm/Support/TargetSelect.h"
 #include "../lib/ExecutionEngine/JIT/JIT.h"
 
+#include "Routine.hpp"
 #include "RoutineManager.hpp"
 #include "x86.hpp"
 #include "CPUID.hpp"
@@ -70,83 +71,6 @@ namespace sw
 	{
 	};
 
-	Routine::Routine(int bufferSize) : bufferSize(bufferSize), dynamic(true)
-	{
-		void *memory = allocateExecutable(bufferSize);
-
-		buffer = memory;
-		entry = memory;
-		functionSize = bufferSize;   // Updated by RoutineManager::endFunctionBody
-
-		bindCount = 0;
-	}
-
-	Routine::Routine(void *memory, int bufferSize, int offset) : bufferSize(bufferSize), functionSize(bufferSize), dynamic(false)
-	{
-		buffer = (unsigned char*)memory - offset;
-		entry = memory;
-
-		bindCount = 0;
-	}
-
-	Routine::~Routine()
-	{
-		if(dynamic)
-		{
-			deallocateExecutable(buffer, bufferSize);
-		}
-	}
-
-	void Routine::setFunctionSize(int functionSize)
-	{
-		this->functionSize = functionSize;
-	}
-
-	const void *Routine::getBuffer()
-	{
-		return buffer;
-	}
-
-	const void *Routine::getEntry()
-	{
-		return entry;
-	}
-
-	int Routine::getBufferSize()
-	{
-		return bufferSize;
-	}
-
-	int Routine::getFunctionSize()
-	{
-		return functionSize;
-	}
-
-	int Routine::getCodeSize()
-	{
-		return functionSize - ((uintptr_t)entry - (uintptr_t)buffer);
-	}
-
-	bool Routine::isDynamic()
-	{
-		return dynamic;
-	}
-
-	void Routine::bind()
-	{
-		atomicIncrement(&bindCount);
-	}
-
-	void Routine::unbind()
-	{
-		long count = atomicDecrement(&bindCount);
-
-		if(count == 0)
-		{
-			delete this;
-		}
-	}
-
 	Nucleus::Nucleus()
 	{
 		InitializeNativeTarget();
@@ -243,14 +167,11 @@ namespace sw
 		}
 
 		void *entry = executionEngine->getPointerToFunction(function);
-
-		Routine *routine = routineManager->acquireRoutine();
-		routine->entry = entry;
-		markExecutable(routine->buffer, routine->bufferSize);
+		Routine *routine = routineManager->acquireRoutine(entry);
 
 		if(CodeAnalystLogJITCode)
 		{
-			CodeAnalystLogJITCode(routine->entry, routine->getCodeSize(), name);
+			CodeAnalystLogJITCode(routine->getEntry(), routine->getCodeSize(), name);
 		}
 
 		return routine;

src/Reactor/Nucleus.hpp

@@ -61,41 +61,9 @@ namespace sw
 
 	extern Optimization optimization[10];
 
+	class Routine;
 	class RoutineManager;
 	class Builder;
-	class Nucleus;
-
-	class Routine
-	{
-		friend class Nucleus;
-
-	public:
-		Routine(int bufferSize);
-		Routine(void *memory, int bufferSize, int offset);
-
-		~Routine();
-
-		void setFunctionSize(int functionSize);
-
-		const void *getBuffer();
-		const void *getEntry();
-		int getBufferSize();
-		int getFunctionSize();   // Includes constants before the entry point
-		int getCodeSize();       // Executable code only
-		bool isDynamic();
-
-		void bind();
-		void unbind();
-
-	private:
-		void *buffer;
-		const void *entry;
-		int bufferSize;
-		int functionSize;
-
-		volatile int bindCount;
-		const bool dynamic;   // Generated or precompiled
-	};
 
 	class Nucleus
 	{

src/Reactor/Reactor.hpp

@@ -10,6 +10,7 @@
 //
 
 #include "Nucleus.hpp"
+#include "Routine.hpp"
 
 namespace sw
 {

src/Reactor/Reactor.vcxproj

@@ -262,12 +262,14 @@
   <ItemGroup>
     <ClCompile Include="DLL.cpp" />
     <ClCompile Include="Nucleus.cpp" />
+    <ClCompile Include="Routine.cpp" />
     <ClCompile Include="RoutineManager.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="DLL.hpp" />
     <ClInclude Include="Nucleus.hpp" />
     <ClInclude Include="Reactor.hpp" />
+    <ClInclude Include="Routine.hpp" />
     <ClInclude Include="RoutineManager.hpp" />
     <ClInclude Include="x86.hpp" />
   </ItemGroup>

src/Reactor/Reactor.vcxproj.filters

@@ -24,6 +24,9 @@
     <ClCompile Include="RoutineManager.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="Routine.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="DLL.hpp">
@@ -41,5 +44,8 @@
     <ClInclude Include="RoutineManager.hpp">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="Routine.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file

src/Reactor/Routine.cpp

+#include "Routine.hpp"
+
+#include "../Common/Memory.hpp"
+#include "../Common/Thread.hpp"
+#include "../Common/Types.hpp"
+
+namespace sw
+{
+	Routine::Routine(int bufferSize) : bufferSize(bufferSize), dynamic(true)
+	{
+		void *memory = allocateExecutable(bufferSize);
+
+		buffer = memory;
+		entry = memory;
+		functionSize = bufferSize;   // Updated by RoutineManager::endFunctionBody
+
+		bindCount = 0;
+	}
+
+	Routine::Routine(void *memory, int bufferSize, int offset) : bufferSize(bufferSize), functionSize(bufferSize), dynamic(false)
+	{
+		buffer = (unsigned char*)memory - offset;
+		entry = memory;
+
+		bindCount = 0;
+	}
+
+	Routine::~Routine()
+	{
+		if(dynamic)
+		{
+			deallocateExecutable(buffer, bufferSize);
+		}
+	}
+
+	void Routine::setFunctionSize(int functionSize)
+	{
+		this->functionSize = functionSize;
+	}
+
+	const void *Routine::getBuffer()
+	{
+		return buffer;
+	}
+
+	const void *Routine::getEntry()
+	{
+		return entry;
+	}
+
+	int Routine::getBufferSize()
+	{
+		return bufferSize;
+	}
+
+	int Routine::getFunctionSize()
+	{
+		return functionSize;
+	}
+
+	int Routine::getCodeSize()
+	{
+		return functionSize - ((uintptr_t)entry - (uintptr_t)buffer);
+	}
+
+	bool Routine::isDynamic()
+	{
+		return dynamic;
+	}
+
+	void Routine::bind()
+	{
+		atomicIncrement(&bindCount);
+	}
+
+	void Routine::unbind()
+	{
+		long count = atomicDecrement(&bindCount);
+
+		if(count == 0)
+		{
+			delete this;
+		}
+	}
+}

src/Reactor/Routine.hpp

+#ifndef sw_Routine_hpp
+#define sw_Routine_hpp
+
+namespace sw
+{
+	class RoutineManager;
+
+	class Routine
+	{
+		friend class RoutineManager;
+
+	public:
+		Routine(int bufferSize);
+		Routine(void *memory, int bufferSize, int offset);
+
+		~Routine();
+
+		void setFunctionSize(int functionSize);
+
+		const void *getBuffer();
+		const void *getEntry();
+		int getBufferSize();
+		int getFunctionSize();   // Includes constants before the entry point
+		int getCodeSize();       // Executable code only
+		bool isDynamic();
+
+		void bind();
+		void unbind();
+
+	private:
+		void *buffer;
+		const void *entry;
+		int bufferSize;
+		int functionSize;
+
+		volatile int bindCount;
+		const bool dynamic;   // Generated or precompiled
+	};
+}
+
+#endif   // sw_Routine_hpp

src/Reactor/RoutineManager.cpp

@@ -11,7 +11,7 @@
 
 #include "RoutineManager.hpp"
 
-#include "Nucleus.hpp"
+#include "Routine.hpp"
 #include "llvm/Function.h"
 #include "../Common/Memory.hpp"
 #include "../Common/Thread.hpp"
@@ -117,16 +117,18 @@ namespace sw
 
 	void RoutineManager::setMemoryExecutable()
 	{
+		markExecutable(routine->buffer, routine->bufferSize);
 	}
 
 	void RoutineManager::setPoisonMemory(bool poison)
 	{
 	}
 
-	Routine *RoutineManager::acquireRoutine()
+	Routine *RoutineManager::acquireRoutine(void *entry)
 	{
-		Routine *result = routine;
+		routine->entry = entry;
 
+		Routine *result = routine;
 		routine = 0;
 
 		return result;

src/Reactor/RoutineManager.hpp

@@ -42,7 +42,7 @@ namespace sw
 		virtual void setMemoryExecutable();
 		virtual void setPoisonMemory(bool poison);
 
-		Routine *acquireRoutine();
+		Routine *acquireRoutine(void *entry);
 
 	private:
 		Routine *routine;