Rename Reactor/Memory.* to Reactor/ExecutableMemory.*

CMakeLists.txt

@@ -1726,8 +1726,8 @@ if(${REACTOR_BACKEND} STREQUAL "Subzero")
         ${SOURCE_DIR}/Reactor/Routine.hpp
         ${SOURCE_DIR}/Reactor/Debug.cpp
         ${SOURCE_DIR}/Reactor/Debug.hpp
-        ${SOURCE_DIR}/Reactor/Memory.cpp
-        ${SOURCE_DIR}/Reactor/Memory.hpp
+        ${SOURCE_DIR}/Reactor/ExecutableMemory.cpp
+        ${SOURCE_DIR}/Reactor/ExecutableMemory.hpp
     )
 
     set(SUBZERO_INCLUDE_DIR
@@ -1824,8 +1824,8 @@ set(REACTOR_LLVM_LIST
     ${SOURCE_DIR}/Reactor/CPUID.hpp
     ${SOURCE_DIR}/Reactor/Debug.cpp
     ${SOURCE_DIR}/Reactor/Debug.hpp
-    ${SOURCE_DIR}/Reactor/Memory.cpp
-    ${SOURCE_DIR}/Reactor/Memory.hpp
+    ${SOURCE_DIR}/Reactor/ExecutableMemory.cpp
+    ${SOURCE_DIR}/Reactor/ExecutableMemory.hpp
 )
 
 file(GLOB_RECURSE EGL_LIST

src/Android.mk

@@ -64,7 +64,7 @@ COMMON_SRC_FILES += \
 	Reactor/Routine.cpp \
 	Reactor/Debug.cpp \
 	Reactor/DebugAndroid.cpp \
-	Reactor/Memory.cpp
+	Reactor/ExecutableMemory.cpp
 
 ifdef SWIFTSHADER_USE_SUBZERO
 COMMON_SRC_FILES += \

src/Reactor/BUILD.gn

@@ -268,7 +268,7 @@ swiftshader_source_set("swiftshader_reactor") {
   sources = [
     "Routine.cpp",
     "Debug.cpp",
-    "Memory.cpp",
+    "ExecutableMemory.cpp",
   ]
 
   if (use_swiftshader_with_subzero) {

src/Reactor/Memory.cpp → src/Reactor/ExecutableMemory.cpp

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "Memory.hpp"
+#include "ExecutableMemory.hpp"
 
 #include "Debug.hpp"
 

src/Reactor/Memory.hpp → src/Reactor/ExecutableMemory.hpp

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef rr_Memory_hpp
-#define rr_Memory_hpp
+#ifndef rr_ExecutableMemory_hpp
+#define rr_ExecutableMemory_hpp
 
 #include <stddef.h>
 #include <stdint.h>
@@ -27,4 +27,4 @@ void markExecutable(void *memory, size_t bytes);
 void deallocateExecutable(void *memory, size_t bytes);
 }
 
-#endif   // rr_Memory_hpp
+#endif   // rr_ExecutableMemory_hpp

src/Reactor/LLVMReactor.cpp

@@ -17,7 +17,7 @@
 #include "x86.hpp"
 #include "CPUID.hpp"
 #include "Thread.hpp"
-#include "Memory.hpp"
+#include "ExecutableMemory.hpp"
 #include "MutexLock.hpp"
 
 #undef min

src/Reactor/LLVMRoutine.cpp

@@ -14,7 +14,7 @@
 
 #include "LLVMRoutine.hpp"
 
-#include "Memory.hpp"
+#include "ExecutableMemory.hpp"
 #include "Thread.hpp"
 
 namespace rr

src/Reactor/LLVMRoutineManager.cpp

@@ -18,7 +18,7 @@
 
 #include "LLVMRoutine.hpp"
 #include "llvm/Function.h"
-#include "Memory.hpp"
+#include "ExecutableMemory.hpp"
 #include "Thread.hpp"
 #include "Debug.hpp"
 

src/Reactor/Reactor.vcxproj

@@ -282,7 +282,7 @@
     <ClCompile Include="LLVMRoutine.cpp" />
     <ClCompile Include="LLVMRoutineManager.cpp" />
     <ClCompile Include="LLVMReactor.cpp" />
-    <ClCompile Include="Memory.cpp" />
+    <ClCompile Include="ExecutableMemory.cpp" />
     <ClCompile Include="Routine.cpp" />
     <ClCompile Include="Thread.cpp" />
   </ItemGroup>
@@ -291,7 +291,7 @@
     <ClInclude Include="Debug.hpp" />
     <ClInclude Include="LLVMRoutine.hpp" />
     <ClInclude Include="LLVMRoutineManager.hpp" />
-    <ClInclude Include="Memory.hpp" />
+    <ClInclude Include="ExecutableMemory.hpp" />
     <ClInclude Include="MutexLock.hpp" />
     <ClInclude Include="Nucleus.hpp" />
     <ClInclude Include="Reactor.hpp" />

src/Reactor/Reactor.vcxproj.filters

@@ -33,7 +33,7 @@
     <ClCompile Include="Debug.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Memory.cpp">
+    <ClCompile Include="ExecutableMemory.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="Thread.cpp">
@@ -65,7 +65,7 @@
     <ClInclude Include="Debug.hpp">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Memory.hpp">
+    <ClInclude Include="ExecutableMemory.hpp">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="MutexLock.hpp">

src/Reactor/Subzero.vcxproj

@@ -218,7 +218,7 @@
     <ClCompile Include="$(SolutionDir)third_party\subzero\src\IceVariableSplitting.cpp" />
     <ClCompile Include="CPUID.cpp" />
     <ClCompile Include="Debug.cpp" />
-    <ClCompile Include="Memory.cpp" />
+    <ClCompile Include="ExecutableMemory.cpp" />
     <ClCompile Include="Optimizer.cpp" />
     <ClCompile Include="Routine.cpp" />
     <ClCompile Include="SubzeroReactor.cpp" />

src/Reactor/Subzero.vcxproj.filters

@@ -123,7 +123,7 @@
     <ClCompile Include="CPUID.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Memory.cpp">
+    <ClCompile Include="ExecutableMemory.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="Debug.cpp">

src/Reactor/SubzeroReactor.cpp

@@ -15,7 +15,7 @@
 #include "Reactor.hpp"
 
 #include "Optimizer.hpp"
-#include "Memory.hpp"
+#include "ExecutableMemory.hpp"
 
 #include "src/IceTypes.h"
 #include "src/IceCfg.h"