Migrate getOpCodeName and getMnemonicName from OpNames.cpp

eclipse · May 20, 2021 · ab74df3 · ab74df3
1 parent 8b051bc
commit ab74df3
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 45 deletions.
diff --git a/compiler/x/CMakeLists.txt b/compiler/x/CMakeLists.txt
@@ -35,7 +35,6 @@ compiler_library(x
 	${CMAKE_CURRENT_LIST_DIR}/codegen/IntegerMultiplyDecomposer.cpp
 	${CMAKE_CURRENT_LIST_DIR}/codegen/OMRMemoryReference.cpp
 	${CMAKE_CURRENT_LIST_DIR}/codegen/OMRInstOpCode.cpp
-	${CMAKE_CURRENT_LIST_DIR}/codegen/OpNames.cpp
 	${CMAKE_CURRENT_LIST_DIR}/codegen/OutlinedInstructions.cpp
 	${CMAKE_CURRENT_LIST_DIR}/codegen/RegisterRematerialization.cpp
 	${CMAKE_CURRENT_LIST_DIR}/codegen/SubtractAnalyser.cpp

diff --git a/compiler/x/codegen/OMRInstOpCode.cpp b/compiler/x/codegen/OMRInstOpCode.cpp
@@ -218,4 +218,25 @@ void OMR::X86::InstOpCode::finalize(uint8_t* cursor) const
    {
    if (!isPseudoOp())
       info().finalize(cursor);
-   }
+   }
+
+#ifdef DEBUG
+
+#include "codegen/CodeGenerator.hpp"
+#include "compile/Compilation.hpp"
+#include "ras/Debug.hpp"
+#include "codegen/InstOpCode.hpp"
+
+const char *
+OMR::X86::InstOpCode::getOpCodeName(TR::CodeGenerator *cg)
+   {
+   return cg->comp()->getDebug()->getOpCodeName(reinterpret_cast<TR::InstOpCode*>(this));
+   }
+
+const char *
+OMR::X86::InstOpCode::getMnemonicName(TR::CodeGenerator *cg)
+   {
+   return cg->comp()->getDebug()->getMnemonicName(reinterpret_cast<TR::InstOpCode*>(this));
+   }
+
+#endif // ifdef DEBUG
diff --git a/compiler/x/codegen/OpNames.cpp b/compiler/x/codegen/OpNames.cpp
diff --git a/fvtest/compilertest/build/files/target/x.mk b/fvtest/compilertest/build/files/target/x.mk
@@ -35,7 +35,6 @@ JIT_PRODUCT_BACKEND_SOURCES+=\
     $(JIT_OMR_DIRTY_DIR)/x/codegen/IntegerMultiplyDecomposer.cpp \
     $(JIT_OMR_DIRTY_DIR)/x/codegen/OMRMemoryReference.cpp \
     $(JIT_OMR_DIRTY_DIR)/x/codegen/OMRInstOpCode.cpp \
-    $(JIT_OMR_DIRTY_DIR)/x/codegen/OpNames.cpp \
     $(JIT_OMR_DIRTY_DIR)/x/codegen/OutlinedInstructions.cpp \
     $(JIT_OMR_DIRTY_DIR)/x/codegen/RegisterRematerialization.cpp \
     $(JIT_OMR_DIRTY_DIR)/x/codegen/SubtractAnalyser.cpp \

diff --git a/jitbuilder/build/files/target/x.mk b/jitbuilder/build/files/target/x.mk
@@ -36,7 +36,6 @@ JIT_PRODUCT_BACKEND_SOURCES+=\
     $(JIT_OMR_DIRTY_DIR)/x/codegen/IntegerMultiplyDecomposer.cpp \
     $(JIT_OMR_DIRTY_DIR)/x/codegen/OMRMemoryReference.cpp \
     $(JIT_OMR_DIRTY_DIR)/x/codegen/OMRInstOpCode.cpp \
-    $(JIT_OMR_DIRTY_DIR)/x/codegen/OpNames.cpp \
     $(JIT_OMR_DIRTY_DIR)/x/codegen/OutlinedInstructions.cpp \
     $(JIT_OMR_DIRTY_DIR)/x/codegen/RegisterRematerialization.cpp \
     $(JIT_OMR_DIRTY_DIR)/x/codegen/SubtractAnalyser.cpp \