Move CodeGenerator object into base of OMRLinkage

Each architecture requires and caches the CodeGenerator object in its own specialization. Cache the object in the base class to share functionality. Signed-off-by: Daryl Maier <[email protected]>
DemonsOfTruth · Apr 15, 2019 · 51bf2be · 51bf2be
1 parent de6fc95
commit 51bf2be
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 32 deletions.
diff --git a/compiler/aarch64/codegen/OMRLinkage.hpp b/compiler/aarch64/codegen/OMRLinkage.hpp
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2018, 2018 IBM Corp. and others
+ * Copyright (c) 2018, 2019 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
@@ -272,15 +272,11 @@ class OMR_EXTENSIBLE Linkage : public OMR::Linkage
    {
    public:
 
-   /**
-    * @brief Constructor
-    */
-   Linkage () : OMR::Linkage() {}
    /**
     * @brief Constructor
     * @param[in] cg : CodeGenerator
     */
-   Linkage (TR::CodeGenerator *cg) : _cg(cg) {}
+   Linkage (TR::CodeGenerator *cg) : OMR::Linkage(cg) {}
 
    /**
     * @brief Parameter has to be on stack or not
@@ -426,9 +422,6 @@ class OMR_EXTENSIBLE Linkage : public OMR::Linkage
     */
    TR_StackMemory trStackMemory();
 
-   protected:
-
-   TR::CodeGenerator*_cg;
    };
 } // ARM64
 } // TR

diff --git a/compiler/arm/codegen/OMRLinkage.hpp b/compiler/arm/codegen/OMRLinkage.hpp
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2016 IBM Corp. and others
+ * Copyright (c) 2000, 2019 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
@@ -294,7 +294,7 @@ class OMR_EXTENSIBLE Linkage : public OMR::Linkage
    {
    public:
 
-   Linkage (TR::CodeGenerator *cg) : _cg(cg) {}
+   Linkage (TR::CodeGenerator *cg) : OMR::Linkage(cg) {}
 
    virtual bool hasToBeOnStack(TR::ParameterSymbol *parm);
    virtual void mapStack(TR::ResolvedMethodSymbol *method);
@@ -351,10 +351,6 @@ class OMR_EXTENSIBLE Linkage : public OMR::Linkage
                                TR::Register*                       &vftReg,
                                TR_LinkageConventions               conventions,
                                bool                                isVirtualOrJNI);
-
-protected:
-
-   TR::CodeGenerator*_cg;
    };
 }
 }

diff --git a/compiler/codegen/OMRLinkage.hpp b/compiler/codegen/OMRLinkage.hpp
@@ -43,7 +43,7 @@ namespace OMR { typedef OMR::Linkage LinkageConnector; }
 
 class TR_BitVector;
 namespace TR { class AutomaticSymbol; }
-namespace TR { class Compilation; }
+namespace TR { class CodeGenerator; }
 namespace TR { class Linkage; }
 namespace TR { class Instruction; }
 namespace TR { class Node; }
@@ -63,7 +63,7 @@ class OMR_EXTENSIBLE Linkage
 
    TR_ALLOC(TR_Memory::Linkage)
 
-   Linkage() { }
+   Linkage(TR::CodeGenerator *cg) : _cg(cg) { }
 
    virtual void createPrologue(TR::Instruction *cursor) = 0;
    virtual void createEpilogue(TR::Instruction *cursor) = 0;
@@ -87,6 +87,9 @@ class OMR_EXTENSIBLE Linkage
 
    virtual TR_RegisterKinds argumentRegisterKind(TR::Node *argumentNode);
 
+protected:
+
+   TR::CodeGenerator *_cg;
    };
 }
 

diff --git a/compiler/p/codegen/OMRLinkage.hpp b/compiler/p/codegen/OMRLinkage.hpp
@@ -381,9 +381,7 @@ class OMR_EXTENSIBLE Linkage : public OMR::Linkage
    {
    public:
 
-   Linkage () : OMR::Linkage() {}
-
-   Linkage (TR::CodeGenerator *cg) : _cg(cg) {}
+   Linkage (TR::CodeGenerator *cg) : OMR::Linkage(cg) {}
 
    virtual bool hasToBeOnStack(TR::ParameterSymbol *parm);
    virtual void mapStack(TR::ResolvedMethodSymbol *method);
@@ -445,10 +443,6 @@ class OMR_EXTENSIBLE Linkage : public OMR::Linkage
    virtual uintptr_t calculateParameterRegisterOffset(uintptr_t o, TR::ParameterSymbol& p) { return o; }
 
    TR_ReturnInfo getReturnInfoFromReturnType(TR::DataType);
-
-protected:
-
-   TR::CodeGenerator*_cg;
    };
 }
 }

diff --git a/compiler/x/codegen/OMRLinkage.hpp b/compiler/x/codegen/OMRLinkage.hpp
@@ -401,7 +401,7 @@ class OMR_EXTENSIBLE Linkage : public OMR::Linkage
 
    protected:
 
-   Linkage(TR::CodeGenerator *cg) : _cg(cg), _minimumFirstInstructionSize(0)
+   Linkage(TR::CodeGenerator *cg) : OMR::Linkage(cg), _minimumFirstInstructionSize(0)
       {
       // Initialize the movOp table based on preferred load instructions for this target.
       //
@@ -443,7 +443,6 @@ class OMR_EXTENSIBLE Linkage : public OMR::Linkage
    private:
 
    static TR_X86OpCodes _movOpcodes[NumMovOperandTypes][NumMovDataTypes];
-   TR::CodeGenerator*   _cg;
    uint8_t              _minimumFirstInstructionSize;
 
    };

diff --git a/compiler/z/codegen/OMRLinkage.cpp b/compiler/z/codegen/OMRLinkage.cpp
@@ -105,8 +105,8 @@ static int32_t getFirstMaskedBit(int16_t mask); ///< formward reference
 ////////////////////////////////////////////////////////////////////////////////
 
 OMR::Z::Linkage::Linkage(TR::CodeGenerator * codeGen)
-   : OMR::Linkage(),
-      _codeGen(codeGen), _explicitLinkageType(TR_S390LinkageDefault), _linkageType(TR_None), _stackSizeCheckNeeded(true), _raContextSaveNeeded(true),
+   : OMR::Linkage(codeGen),
+      _explicitLinkageType(TR_S390LinkageDefault), _linkageType(TR_None), _stackSizeCheckNeeded(true), _raContextSaveNeeded(true),
       _integerReturnRegister(TR::RealRegister::NoReg),
       _floatReturnRegister(TR::RealRegister::NoReg),
       _doubleReturnRegister(TR::RealRegister::NoReg),
@@ -141,8 +141,8 @@ OMR::Z::Linkage::Linkage(TR::CodeGenerator * codeGen)
  * Even though this method is common, its implementation is machine-specific.
  */
 OMR::Z::Linkage::Linkage(TR::CodeGenerator * codeGen,TR_S390LinkageConventions elc, TR_LinkageConventions lc)
-   : OMR::Linkage(),
-      _codeGen(codeGen), _explicitLinkageType(elc), _linkageType(lc), _stackSizeCheckNeeded(true), _raContextSaveNeeded(true),
+   : OMR::Linkage(codeGen),
+      _explicitLinkageType(elc), _linkageType(lc), _stackSizeCheckNeeded(true), _raContextSaveNeeded(true),
       _integerReturnRegister(TR::RealRegister::NoReg),
       _floatReturnRegister(TR::RealRegister::NoReg),
       _doubleReturnRegister(TR::RealRegister::NoReg),

diff --git a/compiler/z/codegen/OMRLinkage.hpp b/compiler/z/codegen/OMRLinkage.hpp
@@ -601,7 +601,7 @@ enum TR_DispatchType
    virtual int32_t setupLiteralPoolRegister(TR::Snippet *firstSnippet) { return -1; }
 
 // Just for convenience
-   TR::CodeGenerator * cg() { return _codeGen; }
+   TR::CodeGenerator * cg() { return _cg; }
    TR::Compilation *   comp();
    TR_FrontEnd *       fe();
 
@@ -631,7 +631,6 @@ enum TR_DispatchType
 
    enum FrameType _frameType;
 
-   TR::CodeGenerator * _codeGen;
    TR::Instruction * _lastPrologueInstr;
    TR::Instruction * _firstPrologueInstr;
    };