commit 3bbc5e16af2975cf3903ef47a21ed7d75d0874d9
author Nicolas Capens <capn@google.com> Tue Sep 27 10:49:52 2016 -0400
committer Nicolas Capens <capn@google.com> Wed Sep 28 22:20:54 2016 +0000
tree b5c07deaa51071d6d565c4776e7721783cbaa800
parent 5763d17ef7ebf0568cc02f755361a26647d17f2e

Reduce header dependencies.

This removes all Common headers from Reactor headers, making it
easier to use Reactor outside of SwiftShader.

Bug swiftshader:10

Change-Id: I35c5d138e781d4e911d206954d38e392714d4659
Reviewed-on: https://swiftshader-review.googlesource.com/7330
Tested-by: Nicolas Capens <capn@google.com>
Reviewed-by: Alexis Hétu <sugoi@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>

src/Reactor/LLVMReactor.cpp

diff --git a/src/Reactor/LLVMReactor.cpp b/src/Reactor/LLVMReactor.cpp
index 67dd392..fb1cf03 100644
--- a/src/Reactor/LLVMReactor.cpp
+++ b/src/Reactor/LLVMReactor.cpp
@@ -35,6 +35,7 @@
 #include "CPUID.hpp"
 #include "Thread.hpp"
 #include "Memory.hpp"
+#include "MutexLock.hpp"
 
 #include <xmmintrin.h>
 #include <fstream>
@@ -66,12 +67,13 @@
 	llvm::LLVMContext *context = nullptr;
 	llvm::Module *module = nullptr;
 	llvm::Function *function = nullptr;
+
+	sw::BackoffLock codegenMutex;
 }
 
 namespace sw
 {
 	using namespace llvm;
-	BackoffLock Nucleus::codegenMutex;
 
 	Optimization optimization[10] = {InstructionCombining, Disabled};
 
@@ -107,7 +109,7 @@
 
 	Nucleus::Nucleus()
 	{
-		codegenMutex.lock();   // Reactor and LLVM are currently not thread safe
+		::codegenMutex.lock();   // Reactor and LLVM are currently not thread safe
 
 		InitializeNativeTarget();
 		JITEmitDebugInfo = false;
@@ -166,7 +168,7 @@
 		::function = nullptr;
 		::module = nullptr;
 
-		codegenMutex.unlock();
+		::codegenMutex.unlock();
 	}
 
 	Routine *Nucleus::acquireRoutine(const wchar_t *name, bool runOptimizations)
@@ -1961,7 +1963,7 @@
 	//	xyzw.parent = this;
 	}
 
-	Byte8::Byte8(byte x0, byte x1, byte x2, byte x3, byte x4, byte x5, byte x6, byte x7)
+	Byte8::Byte8(uint8_t x0, uint8_t x1, uint8_t x2, uint8_t x3, uint8_t x4, uint8_t x5, uint8_t x6, uint8_t x7)
 	{
 	//	xyzw.parent = this;
 
@@ -2298,7 +2300,7 @@
 	//	xyzw.parent = this;
 	}
 
-	SByte8::SByte8(byte x0, byte x1, byte x2, byte x3, byte x4, byte x5, byte x6, byte x7)
+	SByte8::SByte8(uint8_t x0, uint8_t x1, uint8_t x2, uint8_t x3, uint8_t x4, uint8_t x5, uint8_t x6, uint8_t x7)
 	{
 	//	xyzw.parent = this;