Replace includes of ARMOps.hpp with OMRInstOpCode.hpp

This is done in preparation for eliminating the former with the latter.
eclipse · Jun 8, 2021 · 5d05197 · 5d05197
1 parent faaca57
commit 5d05197
Show file tree

Hide file tree

Showing 12 changed files with 12 additions and 11 deletions.
diff --git a/compiler/arm/codegen/ARMInstruction.hpp b/compiler/arm/codegen/ARMInstruction.hpp
@@ -23,7 +23,7 @@
 #define ARMINSTRUCTION_INCL
 
 #include "codegen/Instruction.hpp"
-#include "codegen/ARMOps.hpp"
+#include "codegen/InstOpCode.hpp"
 #include "codegen/MemoryReference.hpp"
 #include "codegen/RegisterDependency.hpp"
 #include "codegen/UnresolvedDataSnippet.hpp"

diff --git a/compiler/arm/codegen/ARMOutOfLineCodeSection.hpp b/compiler/arm/codegen/ARMOutOfLineCodeSection.hpp
@@ -22,7 +22,7 @@
 #ifndef ARMOUTOFLINECODESECTION_INCL
 #define ARMOUTOFLINECODESECTION_INCL
 
-#include "codegen/ARMOps.hpp"
+#include "codegen/InstOpCode.hpp"
 #include "codegen/OutOfLineCodeSection.hpp"
 #include "env/TRMemory.hpp"
 

diff --git a/compiler/arm/codegen/BinaryCommutativeAnalyser.hpp b/compiler/arm/codegen/BinaryCommutativeAnalyser.hpp
@@ -26,7 +26,7 @@
 #ifndef ARMBINARYCOMMUTATIVEANALYSER_INCL
 #define ARMBINARYCOMMUTATIVEANALYSER_INCL
 
-#include "codegen/ARMOps.hpp"
+#include "codegen/InstOpCode.hpp"
 #include "codegen/Register.hpp"
 #include "il/Node.hpp"
 #include "codegen/Analyser.hpp"

diff --git a/compiler/arm/codegen/OMRCodeGenerator.hpp b/compiler/arm/codegen/OMRCodeGenerator.hpp
@@ -36,7 +36,7 @@ namespace OMR { typedef OMR::ARM::CodeGenerator CodeGeneratorConnector; }
 #include "compiler/codegen/OMRCodeGenerator.hpp"
 
 #include <stdint.h>
-#include "arm/codegen/ARMOps.hpp"
+#include "codegen/InstOpCode.hpp"
 #include "codegen/RealRegister.hpp"
 #include "codegen/ScratchRegisterManager.hpp"
 #include "env/jittypes.h"

diff --git a/compiler/arm/codegen/OMRInstOpCode.hpp b/compiler/arm/codegen/OMRInstOpCode.hpp
@@ -34,6 +34,7 @@ namespace OMR { typedef OMR::ARM::InstOpCode InstOpCodeConnector; }
 #endif
 
 #include "compiler/codegen/OMRInstOpCode.hpp"
+#include "arm/codegen/ARMOps.hpp"
 
 namespace OMR
 {

diff --git a/compiler/arm/codegen/OMRInstruction.hpp b/compiler/arm/codegen/OMRInstruction.hpp
@@ -35,7 +35,7 @@ namespace OMR { typedef OMR::ARM::Instruction InstructionConnector; }
 
 #include "compiler/codegen/OMRInstruction.hpp"
 
-#include "arm/codegen/ARMOps.hpp"
+#include "codegen/InstOpCode.hpp"
 #include "codegen/InstOpCode.hpp"
 #include "codegen/GCStackMap.hpp"
 #include "codegen/RegisterConstants.hpp"

diff --git a/compiler/arm/codegen/OMRLinkage.hpp b/compiler/arm/codegen/OMRLinkage.hpp
@@ -33,7 +33,7 @@ namespace OMR { typedef OMR::ARM::Linkage LinkageConnector; }
 #endif
 
 #include "compiler/codegen/OMRLinkage.hpp"
-#include "codegen/ARMOps.hpp"
+#include "codegen/InstOpCode.hpp"
 #include "codegen/LinkageConventionsEnum.hpp"
 #include "codegen/RealRegister.hpp"
 #include "infra/Annotations.hpp"

diff --git a/compiler/arm/codegen/OMRMemoryReference.hpp b/compiler/arm/codegen/OMRMemoryReference.hpp
@@ -36,7 +36,7 @@ namespace OMR { typedef OMR::ARM::MemoryReference MemoryReferenceConnector; }
 #include "compiler/codegen/OMRMemoryReference.hpp"
 
 #include <stdint.h>
-#include "codegen/ARMOps.hpp"
+#include "codegen/InstOpCode.hpp"
 #include "env/jittypes.h"
 #include "il/LabelSymbol.hpp"
 #include "il/MethodSymbol.hpp"

diff --git a/compiler/arm/codegen/OMRTreeEvaluator.hpp b/compiler/arm/codegen/OMRTreeEvaluator.hpp
@@ -36,7 +36,7 @@ namespace OMR { typedef OMR::ARM::TreeEvaluator TreeEvaluatorConnector; }
 #include "compiler/codegen/OMRTreeEvaluator.hpp"
 
 #include "arm/codegen/InstOpCode.hpp"
-#include "codegen/ARMOps.hpp"
+#include "codegen/InstOpCode.hpp"
 #include "codegen/ARMConditionCode.hpp"
 #include "il/ILOps.hpp"
 #include "runtime/Runtime.hpp"

diff --git a/compiler/arm/codegen/OpBinary.cpp b/compiler/arm/codegen/OpBinary.cpp
@@ -19,7 +19,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception
  *******************************************************************************/
 
-#include "codegen/ARMOps.hpp"
+#include "codegen/InstOpCode.hpp"
 
 const TR_ARMOpCode::TR_OpCodeBinaryEntry TR_ARMOpCode::binaryEncodings[ARMNumOpCodes] =
 {

diff --git a/compiler/arm/codegen/OpProperties.cpp b/compiler/arm/codegen/OpProperties.cpp
@@ -19,7 +19,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception
  *******************************************************************************/
 
-#include "codegen/ARMOps.hpp"
+#include "codegen/InstOpCode.hpp"
 
 const uint32_t TR_ARMOpCode::properties[ARMNumOpCodes] =
 {

diff --git a/compiler/arm/codegen/SubtractAnalyser.hpp b/compiler/arm/codegen/SubtractAnalyser.hpp
@@ -25,7 +25,7 @@
 #include "codegen/Analyser.hpp"
 
 #include <stdint.h>
-#include "arm/codegen/ARMOps.hpp"
+#include "codegen/InstOpCode.hpp"
 
 namespace TR { class CodeGenerator; }
 namespace TR { class Node; }