Rename Reactor/Memory.* to Reactor/ExecutableMemory.*
Bug b/115344057
Bug swiftshader:16
Change-Id: I2ef387ee237e964c089d9a7a5eb156a8733cc77f
Reviewed-on: https://swiftshader-review.googlesource.com/c/21388
Tested-by: Nicolas Capens <nicolascapens@google.com>
Reviewed-by: Alexis Hétu <sugoi@google.com>
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8f1e1c2..babffbb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1726,8 +1726,8 @@
${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 @@
${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
diff --git a/src/Android.mk b/src/Android.mk
index d418b35..f9b30e0 100644
--- a/src/Android.mk
+++ b/src/Android.mk
@@ -64,7 +64,7 @@
Reactor/Routine.cpp \
Reactor/Debug.cpp \
Reactor/DebugAndroid.cpp \
- Reactor/Memory.cpp
+ Reactor/ExecutableMemory.cpp
ifdef SWIFTSHADER_USE_SUBZERO
COMMON_SRC_FILES += \
diff --git a/src/Reactor/BUILD.gn b/src/Reactor/BUILD.gn
index c63e359..bbe1dab 100644
--- a/src/Reactor/BUILD.gn
+++ b/src/Reactor/BUILD.gn
@@ -268,7 +268,7 @@
sources = [
"Routine.cpp",
"Debug.cpp",
- "Memory.cpp",
+ "ExecutableMemory.cpp",
]
if (use_swiftshader_with_subzero) {
diff --git a/src/Reactor/Memory.cpp b/src/Reactor/ExecutableMemory.cpp
similarity index 99%
rename from src/Reactor/Memory.cpp
rename to src/Reactor/ExecutableMemory.cpp
index 8f8e7ac..04684ef 100644
--- a/src/Reactor/Memory.cpp
+++ b/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"
diff --git a/src/Reactor/Memory.hpp b/src/Reactor/ExecutableMemory.hpp
similarity index 90%
rename from src/Reactor/Memory.hpp
rename to src/Reactor/ExecutableMemory.hpp
index 53b9446..1a2b4bd 100644
--- a/src/Reactor/Memory.hpp
+++ b/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 deallocateExecutable(void *memory, size_t bytes);
}
-#endif // rr_Memory_hpp
+#endif // rr_ExecutableMemory_hpp
diff --git a/src/Reactor/LLVMReactor.cpp b/src/Reactor/LLVMReactor.cpp
index 0f3b3da..dac87a7 100644
--- a/src/Reactor/LLVMReactor.cpp
+++ b/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
diff --git a/src/Reactor/LLVMRoutine.cpp b/src/Reactor/LLVMRoutine.cpp
index 92bb898..7f3fb18 100644
--- a/src/Reactor/LLVMRoutine.cpp
+++ b/src/Reactor/LLVMRoutine.cpp
@@ -14,7 +14,7 @@
#include "LLVMRoutine.hpp"
-#include "Memory.hpp"
+#include "ExecutableMemory.hpp"
#include "Thread.hpp"
namespace rr
diff --git a/src/Reactor/LLVMRoutineManager.cpp b/src/Reactor/LLVMRoutineManager.cpp
index 276bdd9..77a00cd 100644
--- a/src/Reactor/LLVMRoutineManager.cpp
+++ b/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"
diff --git a/src/Reactor/Reactor.vcxproj b/src/Reactor/Reactor.vcxproj
index 9cf4aed..8b54ce5 100644
--- a/src/Reactor/Reactor.vcxproj
+++ b/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" />
diff --git a/src/Reactor/Reactor.vcxproj.filters b/src/Reactor/Reactor.vcxproj.filters
index 0bdda47..d30c58e 100644
--- a/src/Reactor/Reactor.vcxproj.filters
+++ b/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">
diff --git a/src/Reactor/Subzero.vcxproj b/src/Reactor/Subzero.vcxproj
index 3aaf7b4..1ea0eab 100644
--- a/src/Reactor/Subzero.vcxproj
+++ b/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" />
diff --git a/src/Reactor/Subzero.vcxproj.filters b/src/Reactor/Subzero.vcxproj.filters
index 42f0bda..f4b6f43 100644
--- a/src/Reactor/Subzero.vcxproj.filters
+++ b/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">
diff --git a/src/Reactor/SubzeroReactor.cpp b/src/Reactor/SubzeroReactor.cpp
index a691037..2126afb 100644
--- a/src/Reactor/SubzeroReactor.cpp
+++ b/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"
