RISC-V: Add getReturnTypeInfoInstruction() / getReturnTypeInfoInstruc…

…tion() Signed-off-by: Jan Vrany <jan.vrany@fit.cvut.cz>
eclipse · Dec 14, 2020 · 0f81a4f · 0f81a4f
1 parent 12588f6
commit 0f81a4f
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 7 deletions.
diff --git a/compiler/riscv/codegen/OMRCodeGenerator.cpp b/compiler/riscv/codegen/OMRCodeGenerator.cpp
@@ -136,9 +136,7 @@ OMR::RV::CodeGenerator::beginInstructionSelection()
    TR::Node *startNode = comp->getStartTree()->getNode();
    if (comp->getMethodSymbol()->getLinkageConvention() == TR_Private)
       {
-      TR_UNIMPLEMENTED();
-
-      //_returnTypeInfoInstruction = new (self()->trHeapMemory()) TR::RVImmInstruction(TR::InstOpCode::dd, startNode, 0, self());
+      _returnTypeInfoInstruction = new (self()->trHeapMemory()) TR::DataInstruction(TR::InstOpCode::dd, startNode, 0, self());
       }
    else
       {
@@ -153,9 +151,7 @@ OMR::RV::CodeGenerator::endInstructionSelection()
    {
    if (_returnTypeInfoInstruction != NULL)
       {
-      TR_UNIMPLEMENTED();
-
-      //_returnTypeInfoInstruction->setSourceImmediate(static_cast<uint32_t>(self()->comp()->getReturnInfo()));
+      _returnTypeInfoInstruction->setSourceImmediate(static_cast<uint32_t>(self()->comp()->getReturnInfo()));
       }
    }
 

diff --git a/compiler/riscv/codegen/OMRCodeGenerator.hpp b/compiler/riscv/codegen/OMRCodeGenerator.hpp
@@ -314,6 +314,24 @@ class OMR_EXTENSIBLE CodeGenerator : public OMR::CodeGenerator
    TR_GlobalRegisterNumber _gprLinkageGlobalRegisterNumbers[TR::RealRegister::NumRegisters]; // could be smaller
    TR_GlobalRegisterNumber _fprLinkageGlobalRegisterNumbers[TR::RealRegister::NumRegisters]; // could be smaller
 
+
+   /**
+    * @return Retrieves the cached returnTypeInfo instruction
+    */
+   TR::DataInstruction* getReturnTypeInfoInstruction()
+      {
+      return _returnTypeInfoInstruction;
+      }
+
+   /**
+    * @brief Caches the returnTypeInfo instruction
+    * @param[in] rtii : the returnTypeInfo instruction
+    */
+   void setReturnTypeInfoInstruction(TR::DataInstruction *rtii)
+      {
+      _returnTypeInfoInstruction = rtii;
+      }
+
    private:
 
    enum // flags
@@ -329,7 +347,7 @@ class OMR_EXTENSIBLE CodeGenerator : public OMR::CodeGenerator
 
    TR::RealRegister *_stackPtrRegister;
    TR::RealRegister *_methodMetaDataRegister;
-   TR::Instruction *_returnTypeInfoInstruction;
+   TR::DataInstruction *_returnTypeInfoInstruction;
    TR::ConstantDataSnippet *_constantData;
    const TR::RVLinkageProperties *_linkageProperties;
    TR::list<TR_RVOutOfLineCodeSection*> _outOfLineCodeSectionList;