Migrate proc to the common codegen

eclipse · May 12, 2021 · 9c45612 · 9c45612
1 parent e62f3d2
commit 9c45612
Show file tree

Hide file tree

Showing 15 changed files with 34 additions and 37 deletions.
diff --git a/compiler/aarch64/codegen/ARM64Debug.cpp b/compiler/aarch64/codegen/ARM64Debug.cpp
@@ -98,6 +98,7 @@ static const char *opCodeToNameMap[] =
    "dd",
    "fence",
    "label",
+   "proc",
    "cbzw",
    "cbnzw",
    "cbzx",
@@ -749,7 +750,6 @@ static const char *opCodeToNameMap[] =
    "vfneg2d",
    "vnot16b",
    "nop",
-   "proc",
    "return",
    "vgdnop",
    };

diff --git a/compiler/aarch64/codegen/OMRInstOpCode.enum b/compiler/aarch64/codegen/OMRInstOpCode.enum
@@ -733,7 +733,6 @@
 /* Hint instructions */
 		nop,                                                    	/* 0xD503201F   NOP          */
 /* Internal OpCodes */
-		proc,  // Entry to the method
 		retn,  // Return
 		vgdnop, // Virtual Guard NOP instruction
 		ARM64LastOp = vgdnop,

diff --git a/compiler/codegen/OMRInstOpCode.enum b/compiler/codegen/OMRInstOpCode.enum
@@ -28,4 +28,5 @@
    bad,                // Bad Opcode
    dd,                 // Define Doubleword
    fence,              // Fence
-   label,              // Destination of a jump
+   label,              // Destination of a jump
+   proc,               // Entry to the method
diff --git a/compiler/p/codegen/OMRInstOpCode.enum b/compiler/p/codegen/OMRInstOpCode.enum
@@ -542,7 +542,6 @@
    ret,              // Return
 // rxor,             // Rotate & XOR
    wrtbar,           // Write barrier directive
-   proc,             // Entry to the method
    vgdnop,           // Virtual Guard NOP instruction
    probenop,         // Probe NOP (for RI)
    iflong,           // compare and branch long

diff --git a/compiler/p/codegen/OMRInstOpCodeProperties.hpp b/compiler/p/codegen/OMRInstOpCodeProperties.hpp
@@ -80,6 +80,17 @@
    /* .properties  = */ PPCOpProp_None,
    },
 
+   {
+   /* .mnemonic    = */ OMR::InstOpCode::proc,
+   /* .name        = */ "proc",
+   /* .description =    "Entry to the method", */
+   /* .prefix      = */ 0x00000000,
+   /* .opcode      = */ 0x00000000,
+   /* .format      = */ FORMAT_NONE,
+   /* .minimumALS  = */ OMR_PROCESSOR_PPC_UNKNOWN,
+   /* .properties  = */ PPCOpProp_None,
+   },
+
    {
    /* .mnemonic    = */ OMR::InstOpCode::add,
    /* .name        = */ "add",
@@ -6268,17 +6279,6 @@
    /* .properties  = */ PPCOpProp_None,
    },
 
-   {
-   /* .mnemonic    = */ OMR::InstOpCode::proc,
-   /* .name        = */ "proc",
-   /* .description =    "Entry to the method", */
-   /* .prefix      = */ 0x00000000,
-   /* .opcode      = */ 0x00000000,
-   /* .format      = */ FORMAT_NONE,
-   /* .minimumALS  = */ OMR_PROCESSOR_PPC_UNKNOWN,
-   /* .properties  = */ PPCOpProp_None,
-   },
-
    {
    /* .mnemonic    = */ OMR::InstOpCode::vgdnop,
    /* .name        = */ "vgdnop",

diff --git a/compiler/riscv/codegen/OMRInstOpCode.enum b/compiler/riscv/codegen/OMRInstOpCode.enum
@@ -33,7 +33,6 @@
 #include <riscv-opc.h>
 #undef DECLARE_INSN
 /* Internal OpCodes */
-		proc,  // Entry to the method
 		retn,  // Return
 		RVLastOp = retn,
 		RVNumOpCodes = RVLastOp+1,
diff --git a/compiler/riscv/codegen/RVDebug.cpp b/compiler/riscv/codegen/RVDebug.cpp
@@ -44,13 +44,13 @@ static const char *opCodeToNameMap[] =
    "dd",
    "fence",
    "label",
+   "proc",
 /*
  * RISC-V instructions
  */
 #define DECLARE_INSN(mnemonic, match, mask) #mnemonic,
 #include <riscv-opc.h>
 #undef DECLARE_INSN
-   "proc",
    "return",
    };
 

diff --git a/compiler/z/codegen/InstOpCode.cpp b/compiler/z/codegen/InstOpCode.cpp
@@ -63,7 +63,7 @@ OMR::Z::InstOpCode::isAdmin()
            _mnemonic == assocreg ||
            _mnemonic == DEPEND ||
            _mnemonic == fence ||
-           _mnemonic == PROC ||
+           _mnemonic == proc ||
            _mnemonic == dd ||
            _mnemonic == DC2 ||
            _mnemonic == DCB);

diff --git a/compiler/z/codegen/OMRCodeGenerator.cpp b/compiler/z/codegen/OMRCodeGenerator.cpp
@@ -1051,7 +1051,7 @@ OMR::Z::CodeGenerator::beginInstructionSelection()
       _returnTypeInfoInstruction = new (self()->trHeapMemory()) TR::S390ImmInstruction(TR::InstOpCode::dd, startNode, 0, NULL, cursor, self());
       }
 
-   generateS390PseudoInstruction(self(), TR::InstOpCode::PROC, startNode);
+   generateS390PseudoInstruction(self(), TR::InstOpCode::proc, startNode);
    }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -1971,7 +1971,7 @@ OMR::Z::CodeGenerator::doBinaryEncoding()
    TR::Instruction* cursor = data.cursorInstruction;
 
    // TODO: We should be caching the PROC instruction as it's used in several places and is pretty important
-   while (cursor && cursor->getOpCodeValue() != TR::InstOpCode::PROC)
+   while (cursor && cursor->getOpCodeValue() != TR::InstOpCode::proc)
       {
       cursor = cursor->getNext();
       }

diff --git a/compiler/z/codegen/OMRInstOpCode.enum b/compiler/z/codegen/OMRInstOpCode.enum
@@ -32,7 +32,6 @@
    DC2,                 // DC2
    DCB,                 // Debug Counter Bump
    DEPEND,              // Someplace to hang dependencies
-   PROC,                // Entry to the method
    RET,                 // Return
    VGNOP,               // ValueGuardNOP
 

diff --git a/compiler/z/codegen/OMRInstOpCodeProperties.hpp b/compiler/z/codegen/OMRInstOpCodeProperties.hpp
@@ -80,6 +80,17 @@
    /* .properties  = */ S390OpProp_None
    },
 
+   {
+   /* .mnemonic    = */ OMR::InstOpCode::proc,
+   /* .name        = */ "PROC",
+   /* .description = */ "Entry to the method",
+   /* .opcode[0]   = */ 0x00,
+   /* .opcode[1]   = */ 0x00,
+   /* .format      = */ PSEUDO,
+   /* .minimumALS  = */ OMR_PROCESSOR_S390_UNKNOWN,
+   /* .properties  = */ S390OpProp_None
+   },
+
    {
    /* .mnemonic    = */ OMR::InstOpCode::BREAK,
    /* .name        = */ "BREAK",
@@ -128,17 +139,6 @@
    /* .properties  = */ S390OpProp_None
    },
 
-   {
-   /* .mnemonic    = */ OMR::InstOpCode::PROC,
-   /* .name        = */ "PROC",
-   /* .description = */ "Entry to the method",
-   /* .opcode[0]   = */ 0x00,
-   /* .opcode[1]   = */ 0x00,
-   /* .format      = */ PSEUDO,
-   /* .minimumALS  = */ OMR_PROCESSOR_S390_UNKNOWN,
-   /* .properties  = */ S390OpProp_None
-   },
-
    {
    /* .mnemonic    = */ OMR::InstOpCode::RET,
    /* .name        = */ "RET",

diff --git a/compiler/z/codegen/OMRMachine.cpp b/compiler/z/codegen/OMRMachine.cpp
@@ -364,7 +364,7 @@ boundNext(TR::Instruction * currentInstruction, int32_t realNum, TR::Register *
    TR::RealRegister::RegNum realReg = (TR::RealRegister::RegNum) realNum;
    TR::Node * nodeBBStart = NULL;
 
-   while (cursor->getOpCodeValue() != TR::InstOpCode::PROC)
+   while (cursor->getOpCodeValue() != TR::InstOpCode::proc)
       {
       TR::RegisterDependencyConditions * conditions;
       if ((conditions = cursor->getDependencyConditions()) != NULL)
@@ -2532,7 +2532,7 @@ OMR::Z::Machine::freeBestRegister(TR::Instruction * currentInstruction, TR::Regi
       }
 
    TR::Instruction * cursor = currentInstruction->getPrev();
-   while (numCandidates > 1 && cursor != NULL && cursor->getOpCodeValue() != TR::InstOpCode::label && cursor->getOpCodeValue() != TR::InstOpCode::PROC)
+   while (numCandidates > 1 && cursor != NULL && cursor->getOpCodeValue() != TR::InstOpCode::label && cursor->getOpCodeValue() != TR::InstOpCode::proc)
       {
       for (int32_t i = 0; i < numCandidates; i++)
          {

diff --git a/compiler/z/codegen/snippet/PPA1Snippet.cpp b/compiler/z/codegen/snippet/PPA1Snippet.cpp
@@ -94,7 +94,7 @@ TR::PPA1Snippet::emitSnippetBody()
    // value. Those need to also be improved.
    TR::Instruction* prologueBegin = cg()->getFirstInstruction();
 
-   while (prologueBegin != NULL && prologueBegin->getOpCodeValue() != TR::InstOpCode::PROC)
+   while (prologueBegin != NULL && prologueBegin->getOpCodeValue() != TR::InstOpCode::proc)
       {
       prologueBegin = prologueBegin->getNext();
       }

diff --git a/fvtest/compilertest/z/codegen/Evaluator.cpp b/fvtest/compilertest/z/codegen/Evaluator.cpp
@@ -78,7 +78,7 @@ TestCompiler::FrontEnd::generateBinaryEncodingPrologue(
       data->estimate += 256;
       }
 
-   while (data->cursorInstruction && data->cursorInstruction->getOpCodeValue() != TR::InstOpCode::PROC)
+   while (data->cursorInstruction && data->cursorInstruction->getOpCodeValue() != TR::InstOpCode::proc)
       {
       data->estimate = data->cursorInstruction->estimateBinaryLength(data->estimate);
       data->cursorInstruction = data->cursorInstruction->getNext();

diff --git a/jitbuilder/z/codegen/Evaluator.cpp b/jitbuilder/z/codegen/Evaluator.cpp
@@ -79,7 +79,7 @@ JitBuilder::FrontEnd::generateBinaryEncodingPrologue(
       data->estimate += 256;
       }
 
-   while (data->cursorInstruction && data->cursorInstruction->getOpCodeValue() != TR::InstOpCode::PROC)
+   while (data->cursorInstruction && data->cursorInstruction->getOpCodeValue() != TR::InstOpCode::proc)
       {
       data->estimate = data->cursorInstruction->estimateBinaryLength(data->estimate);
       data->cursorInstruction = data->cursorInstruction->getNext();