Refactor common Reactor implementations

CMakeLists.txt

@@ -1873,6 +1873,7 @@ if(${REACTOR_BACKEND} STREQUAL "Subzero")
     )
 
     set(SUBZERO_REACTOR_LIST
+        ${SOURCE_DIR}/Reactor/Reactor.cpp
         ${SOURCE_DIR}/Reactor/SubzeroReactor.cpp
         ${SOURCE_DIR}/Reactor/Routine.cpp
         ${SOURCE_DIR}/Reactor/Optimizer.cpp
@@ -1965,6 +1966,7 @@ list(REMOVE_ITEM SWIFTSHADER_LIST
 )
 
 set(REACTOR_LLVM_LIST
+    ${SOURCE_DIR}/Reactor/Reactor.cpp
     ${SOURCE_DIR}/Reactor/LLVMReactor.cpp
     ${SOURCE_DIR}/Reactor/Nucleus.hpp
     ${SOURCE_DIR}/Reactor/Routine.cpp

src/Android.bp

@@ -174,6 +174,7 @@ cc_defaults {
     defaults: [ "libswiftshader_common_defaults" ],
 
     srcs: [
+        "Reactor/Reactor.cpp",
         "Reactor/LLVMReactor.cpp",
         "Reactor/Routine.cpp",
         "Reactor/LLVMRoutine.cpp",
@@ -192,6 +193,7 @@ cc_defaults {
     device_supported: false,
 
     srcs: [
+        "Reactor/Reactor.cpp",
         "Reactor/SubzeroReactor.cpp",
         "Reactor/Routine.cpp",
         "Reactor/Optimizer.cpp",

src/Android.mk

@@ -61,6 +61,7 @@ COMMON_SRC_FILES += \
 	Main/SwiftConfig.cpp
 
 COMMON_SRC_FILES += \
+	Reactor/Reactor.cpp \
 	Reactor/Routine.cpp \
 	Reactor/Debug.cpp \
 	Reactor/DebugAndroid.cpp \

src/Reactor/BUILD.gn

@@ -294,6 +294,7 @@ swiftshader_source_set("swiftshader_reactor") {
   ]
 
   sources = [
+    "Reactor.cpp",
     "Routine.cpp",
     "Debug.cpp",
     "ExecutableMemory.cpp",

src/Reactor/Reactor.vcxproj

@@ -289,6 +289,7 @@
     <ClCompile Include="LLVMRoutineManager.cpp" />
     <ClCompile Include="LLVMReactor.cpp" />
     <ClCompile Include="ExecutableMemory.cpp" />
+    <ClCompile Include="Reactor.cpp" />
     <ClCompile Include="Routine.cpp" />
     <ClCompile Include="Thread.cpp" />
   </ItemGroup>

src/Reactor/Reactor.vcxproj.filters

@@ -39,6 +39,9 @@
     <ClCompile Include="Thread.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="Reactor.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="Nucleus.hpp">

src/Reactor/Subzero.vcxproj

@@ -224,6 +224,7 @@
     <ClCompile Include="Debug.cpp" />
     <ClCompile Include="ExecutableMemory.cpp" />
     <ClCompile Include="Optimizer.cpp" />
+    <ClCompile Include="Reactor.cpp" />
     <ClCompile Include="Routine.cpp" />
     <ClCompile Include="SubzeroReactor.cpp" />
   </ItemGroup>

src/Reactor/Subzero.vcxproj.filters

@@ -129,6 +129,9 @@
     <ClCompile Include="Debug.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="Reactor.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="$(SolutionDir)third_party\subzero\src\IceAssembler.h">