Update the RoutineManager interface.

BUG=15907357

Change-Id: Icbd1148c81fa71c31405330eb45294d0186ba6c6
Reviewed-on: https://swiftshader-review.googlesource.com/1142
Reviewed-by: Nicolas Capens <nicolascapens@google.com>

diff --git a/src/Reactor/RoutineManager.cpp b/src/Reactor/RoutineManager.cpp
index a489ce6..c84560b 100644 (file)
--- a/src/Reactor/RoutineManager.cpp
+++ b/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;
-       }
 }

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