Make InstOpCode an extensible class on ARM

Inherit `OMR::InstOpCodeConnector` like on all other platforms. We had to adopt the use of the common pseudo-instructions in the ARM codegen to make this change.
eclipse · Jun 8, 2021 · bf65603 · bf65603
1 parent b173e31
commit bf65603
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 29 deletions.
diff --git a/compiler/arm/codegen/InstOpCode.hpp b/compiler/arm/codegen/InstOpCode.hpp
@@ -22,37 +22,17 @@
 #ifndef TR_ARM_INSTOPCODE_INCL
 #define TR_ARM_INSTOPCODE_INCL
 
-
+#include "codegen/OMRInstOpCode.hpp"
 
 namespace TR
 {
 
-/*
- * TODO: this is temporary so that ARM instruction can be re-shaped first.
- * Once ARM instruction is done, then this needs to be done properly.
- */
-class InstOpCode
+class InstOpCode : public OMR::InstOpCodeConnector
    {
    public:
 
-   enum Mnemonic
-      {
-      BAD
-      };
-
-   InstOpCode(); // TODO: this needs to be private later
-   InstOpCode(Mnemonic m): _mnemonic(m)  {}
-
-   Mnemonic getMnemonic() {return _mnemonic;}
-   void setMnemonic(Mnemonic op) {_mnemonic = op;}
-
-   private:
-
-   Mnemonic _mnemonic;
-
-   /* OMR TODO: Delegating method; need to be removed and replace with getMnemonic */
-   //TR::InstOpCode::Mnemonic getOpCodeValue()                  { return _mnemonic;; }
-   //TR::InstOpCode::Mnemonic setOpCodeValue(TR::InstOpCode::Mnemonic op) { return _mnemonic = op; }
+   InstOpCode() : OMR::InstOpCodeConnector(bad) {}
+   InstOpCode(TR::InstOpCode::Mnemonic m) : OMR::InstOpCodeConnector(m) {}
 
    };
 }

diff --git a/compiler/arm/codegen/OMRInstruction.cpp b/compiler/arm/codegen/OMRInstruction.cpp
@@ -78,15 +78,15 @@ OMR::ARM::Instruction::Instruction(TR::CodeGenerator *cg, TR::InstOpCode::Mnemon
 
 // TODO: need to fix the InstOpCode initialization
 OMR::ARM::Instruction::Instruction(TR::Node *node, TR::CodeGenerator *cg)
-   : OMR::InstructionConnector(cg, TR::InstOpCode::BAD, node)
+   : OMR::InstructionConnector(cg, TR::InstOpCode::bad, node)
    {
    self()->setOpCodeValue(ARMOp_bad);
    self()->setConditionCode(ARMConditionCodeAL);
    self()->setDependencyConditions(NULL);
    }
 
 OMR::ARM::Instruction::Instruction(TR_ARMOpCodes op, TR::Node *node, TR::CodeGenerator *cg)
-   : OMR::InstructionConnector(cg, TR::InstOpCode::BAD, node)
+   : OMR::InstructionConnector(cg, TR::InstOpCode::bad, node)
    {
    self()->setOpCodeValue(op);
    self()->setConditionCode(ARMConditionCodeAL);
@@ -97,7 +97,7 @@ OMR::ARM::Instruction::Instruction(TR::Instruction   *precedingInstruction,
             TR_ARMOpCodes     op,
             TR::Node          *node,
             TR::CodeGenerator *cg)
-   : OMR::InstructionConnector(cg, precedingInstruction, TR::InstOpCode::BAD, node)
+   : OMR::InstructionConnector(cg, precedingInstruction, TR::InstOpCode::bad, node)
    {
    self()->setOpCodeValue(op);
    self()->setConditionCode(ARMConditionCodeAL);
@@ -108,7 +108,7 @@ OMR::ARM::Instruction::Instruction(TR_ARMOpCodes                       op,
             TR::Node                            *node,
             TR::RegisterDependencyConditions    *cond,
             TR::CodeGenerator                   *cg)
-   : OMR::InstructionConnector(cg, TR::InstOpCode::BAD, node)
+   : OMR::InstructionConnector(cg, TR::InstOpCode::bad, node)
    {
    self()->setOpCodeValue(op);
    self()->setConditionCode(ARMConditionCodeAL);
@@ -122,7 +122,7 @@ OMR::ARM::Instruction::Instruction(TR::Instruction                     *precedin
             TR::Node                            *node,
             TR::RegisterDependencyConditions    *cond,
             TR::CodeGenerator                   *cg)
-   : OMR::InstructionConnector(cg, precedingInstruction, TR::InstOpCode::BAD, node)
+   : OMR::InstructionConnector(cg, precedingInstruction, TR::InstOpCode::bad, node)
    {
    self()->setOpCodeValue(op);
    self()->setConditionCode(ARMConditionCodeAL);