Update the RoutineManager interface.

src/Reactor/RoutineManager.cpp

@@ -32,14 +32,14 @@ namespace sw
 		// FIXME: ASSERT(false);
 	}
 
-	unsigned char *RoutineManager::allocateStub(const GlobalValue *function, unsigned stubSize, unsigned alignment)
+	uint8_t *RoutineManager::allocateStub(const GlobalValue *function, unsigned stubSize, unsigned alignment)
 	{
 		// FIXME: ASSERT(false);
 
 		return 0;
 	}
 
-	unsigned char *RoutineManager::startFunctionBody(const llvm::Function *function, uintptr_t &actualSize)
+	uint8_t *RoutineManager::startFunctionBody(const llvm::Function *function, uintptr_t &actualSize)
 	{
 		if(actualSize == 0)
 		{
@@ -51,37 +51,37 @@ namespace sw
 		delete routine;
 		routine = new Routine(actualSize);
 
-		return (unsigned char*)routine->getBuffer();
+		return (uint8_t*)routine->getBuffer();
 	}
 
-	void RoutineManager::endFunctionBody(const llvm::Function *function, unsigned char *functionStart, unsigned char *functionEnd)
+	void RoutineManager::endFunctionBody(const llvm::Function *function, uint8_t *functionStart, uint8_t *functionEnd)
 	{
 		routine->setFunctionSize(functionEnd - functionStart);
 	}
 
-	unsigned char *RoutineManager::startExceptionTable(const llvm::Function* F, uintptr_t &ActualSize)
+	uint8_t *RoutineManager::startExceptionTable(const llvm::Function* F, uintptr_t &ActualSize)
 	{
 		// FIXME: ASSERT(false);
 
 		return 0;
 	}
 
-	void RoutineManager::endExceptionTable(const llvm::Function *F, unsigned char *TableStart, unsigned char *TableEnd, unsigned char* FrameRegister) 
+	void RoutineManager::endExceptionTable(const llvm::Function *F, uint8_t *TableStart, uint8_t *TableEnd, uint8_t* FrameRegister) 
 	{
 		// FIXME: ASSERT(false);
 	}
     
-	unsigned char *RoutineManager::getGOTBase() const
+	uint8_t *RoutineManager::getGOTBase() const
 	{
 		return 0;
 	}
 
-	unsigned char *RoutineManager::allocateSpace(intptr_t Size, unsigned Alignment)
+	uint8_t *RoutineManager::allocateSpace(intptr_t Size, unsigned Alignment)
 	{
 		return 0;
 	}
 
-	unsigned char *RoutineManager::allocateGlobal(uintptr_t Size, unsigned Alignment)
+	uint8_t *RoutineManager::allocateGlobal(uintptr_t Size, unsigned Alignment)
 	{
 		return 0;
 	}
@@ -114,13 +114,4 @@ namespace sw
 
 		return result;
 	}
-
-	void RoutineManager::SetDlsymTable(void *pointer)
-	{
-	}
-
-	void *RoutineManager::getDlsymTable() const
-	{
-		return 0;
-	}
 }

src/Reactor/RoutineManager.hpp

@@ -24,25 +24,23 @@ namespace sw
 	public:
 		RoutineManager();
 
-		~RoutineManager();
-
-		void AllocateGOT();
-
-		unsigned char *allocateStub(const llvm::GlobalValue *function, unsigned stubSize, unsigned alignment);
-		unsigned char *startFunctionBody(const llvm::Function *function, uintptr_t &actualSize);
-		void endFunctionBody(const llvm::Function *function, unsigned char *functionStart, unsigned char *functionEnd);
-		unsigned char *startExceptionTable(const llvm::Function *function, uintptr_t &ActualSize);
-		void endExceptionTable(const llvm::Function *function, unsigned char *tableStart, unsigned char *tableEnd, unsigned char *frameRegister);
-		unsigned char *getGOTBase() const;
-		unsigned char *allocateSpace(intptr_t Size, unsigned Alignment);
-		unsigned char *allocateGlobal(uintptr_t Size, unsigned int Alignment);
-		void deallocateFunctionBody(void *Body);
-		void deallocateExceptionTable(void *ET);
-		void setMemoryWritable();
-		void setMemoryExecutable();
-		void setPoisonMemory(bool poison);
-		void SetDlsymTable(void *pointer);
-		void *getDlsymTable() const;
+		virtual ~RoutineManager();
+
+		virtual void AllocateGOT();
+
+		virtual uint8_t *allocateStub(const llvm::GlobalValue *function, unsigned stubSize, unsigned alignment);
+		virtual uint8_t *startFunctionBody(const llvm::Function *function, uintptr_t &actualSize);
+		virtual void endFunctionBody(const llvm::Function *function, uint8_t *functionStart, uint8_t *functionEnd);
+		virtual uint8_t *startExceptionTable(const llvm::Function *function, uintptr_t &ActualSize);
+		virtual void endExceptionTable(const llvm::Function *function, uint8_t *tableStart, uint8_t *tableEnd, uint8_t *frameRegister);
+		virtual uint8_t *getGOTBase() const;
+		virtual uint8_t *allocateSpace(intptr_t Size, unsigned Alignment);
+		virtual uint8_t *allocateGlobal(uintptr_t Size, unsigned int Alignment);
+		virtual void deallocateFunctionBody(void *Body);
+		virtual void deallocateExceptionTable(void *ET);
+		virtual void setMemoryWritable();
+		virtual void setMemoryExecutable();
+		virtual void setPoisonMemory(bool poison);
 
 		Routine *acquireRoutine();