Merge pull request #4805 from aviansie-ben/power-remove-depend

Remove the unused depend Power pseudoinstruction
eclipse-openj9 · Feb 5, 2020 · 419f1da · 419f1da
2 parents 46e59c6 + 53bc0e1
commit 419f1da
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 16 deletions.
diff --git a/compiler/p/codegen/OMRInstOpCode.hpp b/compiler/p/codegen/OMRInstOpCode.hpp
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2016 IBM Corp. and others
+ * Copyright (c) 2000, 2020 IBM Corp. and others
  *
  * This program and the accompanying materials are made available under
  * the terms of the Eclipse Public License 2.0 which accompanies this
@@ -179,7 +179,6 @@ class InstOpCode: public OMR::InstOpCode
 
         bool isAdmin() {return _mnemonic==ret      ||
                                _mnemonic==fence    ||
-                               _mnemonic==depend   ||
                                _mnemonic==proc     ||
                                _mnemonic==assocreg ||
                                _mnemonic==dd;}

diff --git a/compiler/p/codegen/OMRInstOpCodeEnum.hpp b/compiler/p/codegen/OMRInstOpCodeEnum.hpp
@@ -551,7 +551,6 @@
    dd,               // define word
    assocreg,         // Associate real registers with Virtual registers.
    vgdnop,           // Virtual Guard NOP instruction
-   depend,           // Instruction to hang dependency on
    probenop,         // Probe NOP (for RI)
    iflong,           // compare and branch long
    setblong,         // compare long and set boolean

diff --git a/compiler/p/codegen/OMRInstOpCodeProperties.hpp b/compiler/p/codegen/OMRInstOpCodeProperties.hpp
@@ -5876,16 +5876,6 @@
    /* .properties  = */ PPCOpProp_None,
    },
 
-   {
-   /* .mnemonic    = */ OMR::InstOpCode::depend,
-   /* .name        = */ "depend",
-   /* .description =    "Instruction to hang dependency on", */
-   /* .opcode      = */ 0x00000000,
-   /* .format      = */ UNKNOWN_FORMAT,
-   /* .minimumALS  = */ TR_Processor::TR_DefaultPPCProcessor,
-   /* .properties  = */ PPCOpProp_None,
-   },
-
    {
    /* .mnemonic    = */ OMR::InstOpCode::probenop,
    /* .name        = */ "nop",

diff --git a/compiler/p/codegen/PPCBinaryEncoding.cpp b/compiler/p/codegen/PPCBinaryEncoding.cpp
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2019 IBM Corp. and others
+ * Copyright (c) 2000, 2020 IBM Corp. and others
  *
  * This program and the accompanying materials are made available under
  * the terms of the Eclipse Public License 2.0 which accompanies this
@@ -61,7 +61,7 @@ OMR::Power::Instruction::generateBinaryEncoding()
    {
    uint8_t *instructionStart = self()->cg()->getBinaryBufferCursor();
    uint8_t *cursor           = instructionStart;
-   if (self()->getOpCodeValue() == TR::InstOpCode::depend || self()->getOpCodeValue() == TR::InstOpCode::assocreg)
+   if (self()->getOpCodeValue() == TR::InstOpCode::assocreg)
       {
       }
    else
@@ -84,7 +84,7 @@ OMR::Power::Instruction::generateBinaryEncoding()
 int32_t
 OMR::Power::Instruction::estimateBinaryLength(int32_t currentEstimate)
    {
-   if (self()->getOpCodeValue() == TR::InstOpCode::depend || self()->getOpCodeValue() == TR::InstOpCode::assocreg)
+   if (self()->getOpCodeValue() == TR::InstOpCode::assocreg)
       {
       self()->setEstimatedBinaryLength(0);
       return currentEstimate;