Rename MemoryManager to RoutineManager.

src/GLES2/libGLESv2/libGLESv2.cbp

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

src/Reactor/Nucleus.cpp

@@ -26,7 +26,7 @@
 #include "llvm/Support/TargetSelect.h"
 #include "../lib/ExecutionEngine/JIT/JIT.h"
 
-#include "MemoryManager.hpp"
+#include "RoutineManager.hpp"
 #include "x86.hpp"
 #include "CPUID.hpp"
 #include "Thread.hpp"
@@ -59,7 +59,7 @@ namespace sw
 
 	using namespace llvm;
 
-	MemoryManager *Nucleus::memoryManager = 0;
+	RoutineManager *Nucleus::routineManager = 0;
 	ExecutionEngine *Nucleus::executionEngine = 0;
 	Builder *Nucleus::builder = 0;
 	LLVMContext *Nucleus::context = 0;
@@ -76,7 +76,7 @@ namespace sw
 
 		buffer = memory;
 		entry = memory;
-		functionSize = bufferSize;   // Updated by MemoryManager::endFunctionBody
+		functionSize = bufferSize;   // Updated by RoutineManager::endFunctionBody
 
 		bindCount = 0;
 	}
@@ -158,7 +158,7 @@ namespace sw
 		}
 
 		module = new Module("", *context);
-		memoryManager = new MemoryManager();
+		routineManager = new RoutineManager();
 
 		#if defined(__x86_64__)
 			const char *architecture = "x86-64";
@@ -177,7 +177,7 @@ namespace sw
 
 		std::string error;
 		TargetMachine *targetMachine = EngineBuilder::selectTarget(module, architecture, "", MAttrs, Reloc::Default, CodeModel::JITDefault, &error);
-		executionEngine = JIT::createJIT(module, 0, memoryManager, CodeGenOpt::Aggressive, true, targetMachine);
+		executionEngine = JIT::createJIT(module, 0, routineManager, CodeGenOpt::Aggressive, true, targetMachine);
 
 		if(!builder)
 		{
@@ -202,7 +202,7 @@ namespace sw
 		delete executionEngine;
 		executionEngine = 0;
 
-		memoryManager = 0;
+		routineManager = 0;
 		function = 0;
 		module = 0;
 	}
@@ -244,7 +244,7 @@ namespace sw
 
 		void *entry = executionEngine->getPointerToFunction(function);
 
-		Routine *routine = memoryManager->acquireRoutine();
+		Routine *routine = routineManager->acquireRoutine();
 		routine->entry = entry;
 		markExecutable(routine->buffer, routine->bufferSize);
 

src/Reactor/Nucleus.hpp

@@ -61,7 +61,7 @@ namespace sw
 
 	extern Optimization optimization[10];
 
-	class MemoryManager;
+	class RoutineManager;
 	class Builder;
 	class Nucleus;
 
@@ -249,7 +249,7 @@ namespace sw
 		static llvm::Function *function;
 		static llvm::LLVMContext *context;
 		static llvm::Module *module;
-		static MemoryManager *memoryManager;
+		static RoutineManager *routineManager;
 	};
 
 	class Byte;

src/Reactor/Reactor.vcxproj

@@ -261,14 +261,14 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="DLL.cpp" />
-    <ClCompile Include="MemoryManager.cpp" />
     <ClCompile Include="Nucleus.cpp" />
+    <ClCompile Include="RoutineManager.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="DLL.hpp" />
-    <ClInclude Include="MemoryManager.hpp" />
     <ClInclude Include="Nucleus.hpp" />
     <ClInclude Include="Reactor.hpp" />
+    <ClInclude Include="RoutineManager.hpp" />
     <ClInclude Include="x86.hpp" />
   </ItemGroup>
   <ItemGroup>

src/Reactor/Reactor.vcxproj.filters

@@ -18,10 +18,10 @@
     <ClCompile Include="DLL.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="MemoryManager.cpp">
+    <ClCompile Include="Nucleus.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Nucleus.cpp">
+    <ClCompile Include="RoutineManager.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
@@ -29,9 +29,6 @@
     <ClInclude Include="DLL.hpp">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="MemoryManager.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="Nucleus.hpp">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -41,5 +38,8 @@
     <ClInclude Include="x86.hpp">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="RoutineManager.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file

src/Reactor/MemoryManager.cpp → src/Reactor/RoutineManager.cpp

@@ -9,7 +9,7 @@
 // or implied, including but not limited to any patent rights, are granted to you.
 //
 
-#include "MemoryManager.hpp"
+#include "RoutineManager.hpp"
 
 #include "Nucleus.hpp"
 
@@ -17,29 +17,29 @@ namespace sw
 {
 	using namespace llvm;
 
-	MemoryManager::MemoryManager()
+	RoutineManager::RoutineManager()
 	{
 		routine = 0;
 	}
 
-	MemoryManager::~MemoryManager()
+	RoutineManager::~RoutineManager()
 	{
 		delete routine;
 	}
 
-	void MemoryManager::AllocateGOT()
+	void RoutineManager::AllocateGOT()
 	{
 		// FIXME: ASSERT(false);
 	}
 
-	unsigned char *MemoryManager::allocateStub(const GlobalValue *function, unsigned stubSize, unsigned alignment)
+	unsigned char *RoutineManager::allocateStub(const GlobalValue *function, unsigned stubSize, unsigned alignment)
 	{
 		// FIXME: ASSERT(false);
 
 		return 0;
 	}
 
-	unsigned char *MemoryManager::startFunctionBody(const llvm::Function *function, uintptr_t &actualSize)
+	unsigned char *RoutineManager::startFunctionBody(const llvm::Function *function, uintptr_t &actualSize)
 	{
 		if(actualSize == 0)
 		{
@@ -54,59 +54,59 @@ namespace sw
 		return (unsigned char*)routine->getBuffer();
 	}
 
-	void MemoryManager::endFunctionBody(const llvm::Function *function, unsigned char *functionStart, unsigned char *functionEnd)
+	void RoutineManager::endFunctionBody(const llvm::Function *function, unsigned char *functionStart, unsigned char *functionEnd)
 	{
 		routine->setFunctionSize(functionEnd - functionStart);
 	}
 
-	unsigned char *MemoryManager::startExceptionTable(const llvm::Function* F, uintptr_t &ActualSize)
+	unsigned char *RoutineManager::startExceptionTable(const llvm::Function* F, uintptr_t &ActualSize)
 	{
 		// FIXME: ASSERT(false);
 
 		return 0;
 	}
 
-	void MemoryManager::endExceptionTable(const llvm::Function *F, unsigned char *TableStart, unsigned char *TableEnd, unsigned char* FrameRegister) 
+	void RoutineManager::endExceptionTable(const llvm::Function *F, unsigned char *TableStart, unsigned char *TableEnd, unsigned char* FrameRegister) 
 	{
 		// FIXME: ASSERT(false);
 	}
     
-	unsigned char *MemoryManager::getGOTBase() const
+	unsigned char *RoutineManager::getGOTBase() const
 	{
 		return 0;
 	}
 
-	unsigned char *MemoryManager::allocateSpace(intptr_t Size, unsigned Alignment)
+	unsigned char *RoutineManager::allocateSpace(intptr_t Size, unsigned Alignment)
 	{
 		return 0;
 	}
 
-	unsigned char *MemoryManager::allocateGlobal(uintptr_t Size, unsigned Alignment)
+	unsigned char *RoutineManager::allocateGlobal(uintptr_t Size, unsigned Alignment)
 	{
 		return 0;
 	}
 
-	void MemoryManager::deallocateFunctionBody(void *Body)
+	void RoutineManager::deallocateFunctionBody(void *Body)
 	{
 	}
 
-	void MemoryManager::deallocateExceptionTable(void *ET)
+	void RoutineManager::deallocateExceptionTable(void *ET)
 	{
 	}
 
-	void MemoryManager::setMemoryWritable()
+	void RoutineManager::setMemoryWritable()
 	{
 	}
 
-	void MemoryManager::setMemoryExecutable()
+	void RoutineManager::setMemoryExecutable()
 	{
 	}
 
-	void MemoryManager::setPoisonMemory(bool poison)
+	void RoutineManager::setPoisonMemory(bool poison)
 	{
 	}
 
-	Routine *MemoryManager::acquireRoutine()
+	Routine *RoutineManager::acquireRoutine()
 	{
 		Routine *result = routine;
 
@@ -115,11 +115,11 @@ namespace sw
 		return result;
 	}
 
-	void MemoryManager::SetDlsymTable(void *pointer)
+	void RoutineManager::SetDlsymTable(void *pointer)
 	{
 	}
 
-	void *MemoryManager::getDlsymTable() const
+	void *RoutineManager::getDlsymTable() const
 	{
 		return 0;
 	}

src/Reactor/MemoryManager.hpp → src/Reactor/RoutineManager.hpp

@@ -9,8 +9,8 @@
 // or implied, including but not limited to any patent rights, are granted to you.
 //
 
-#ifndef sw_MemoryManager_hpp
-#define sw_MemoryManager_hpp
+#ifndef sw_RoutineManager_hpp
+#define sw_RoutineManager_hpp
 
 #include "llvm/GlobalValue.h"
 #include "llvm/ExecutionEngine/JITMemoryManager.h"
@@ -19,12 +19,12 @@ namespace sw
 {
 	class Routine;
 
-	class MemoryManager : public llvm::JITMemoryManager
+	class RoutineManager : public llvm::JITMemoryManager
 	{
 	public:
-		MemoryManager();
+		RoutineManager();
 
-		~MemoryManager();
+		~RoutineManager();
 
 		void AllocateGOT();
 
@@ -51,4 +51,4 @@ namespace sw
 	};
 }
 
-#endif   // sw_MemoryManager_hpp
+#endif   // sw_RoutineManager_hpp