diff --git a/runtime/compiler/aarch64/codegen/ARM64PrivateLinkage.cpp b/runtime/compiler/aarch64/codegen/ARM64PrivateLinkage.cpp index 68f143e8633..83d452b749e 100644 --- a/runtime/compiler/aarch64/codegen/ARM64PrivateLinkage.cpp +++ b/runtime/compiler/aarch64/codegen/ARM64PrivateLinkage.cpp @@ -331,7 +331,7 @@ void J9::ARM64::PrivateLinkage::mapStack(TR::ResolvedMethodSymbol *method) ListIterator parameterIterator(&method->getParameterList()); TR::ParameterSymbol *parmCursor = parameterIterator.getFirst(); - int32_t offsetToFirstParm = self()->getOffsetToFirstParm(); + int32_t offsetToFirstParm = getOffsetToFirstParm(); uint32_t sizeOfParameterArea = method->getNumParameterSlots() * TR::Compiler->om.sizeofReferenceAddress(); while (parmCursor != NULL) @@ -532,7 +532,7 @@ void J9::ARM64::PrivateLinkage::createPrologue(TR::Instruction *cursor) // The offset to the first parm is the offset between the entry JavaSP and the first // mapped parameter. It is a positive (or zero) offset. // - int32_t outgoingArgsSize = cg()->getLargestOutgoingArgSize() + self()->getOffsetToFirstParm(); + int32_t outgoingArgsSize = cg()->getLargestOutgoingArgSize() + getOffsetToFirstParm(); int32_t frameSizeIncludingReturnAddress = preservedRegisterSaveSize + localsSize + outgoingArgsSize; @@ -734,7 +734,7 @@ void J9::ARM64::PrivateLinkage::createEpilogue(TR::Instruction *cursor) TR::RealRegister *javaSP = machine->getRealRegister(properties.getStackPointerRegister()); // x20 // restore preserved GPRs - int32_t preservedRegisterOffsetFromJavaSP = cg()->getLargestOutgoingArgSize() + self()->getOffsetToFirstParm(); // outgoingArgsSize + int32_t preservedRegisterOffsetFromJavaSP = cg()->getLargestOutgoingArgSize() + getOffsetToFirstParm(); // outgoingArgsSize TR::RealRegister::RegNum firstPreservedGPR = TR::RealRegister::x21; TR::RealRegister::RegNum lastPreservedGPR = TR::RealRegister::x28; for (TR::RealRegister::RegNum r = firstPreservedGPR; r <= lastPreservedGPR; r = (TR::RealRegister::RegNum)((uint32_t)r+1)) diff --git a/runtime/compiler/arm/codegen/ARMJNILinkage.cpp b/runtime/compiler/arm/codegen/ARMJNILinkage.cpp index d9680220eb3..18f1b1a86c4 100644 --- a/runtime/compiler/arm/codegen/ARMJNILinkage.cpp +++ b/runtime/compiler/arm/codegen/ARMJNILinkage.cpp @@ -166,7 +166,7 @@ TR::MemoryReference *J9::ARM::JNILinkage::getOutgoingArgumentMemRef(int32_t printf("JNI: offset %d\n", offset); fflush(stdout); #endif const TR::ARMLinkageProperties &jniLinkageProperties = getProperties(); - int32_t spOffset = offset + self()->getOffsetToFirstParm(); + int32_t spOffset = offset + getOffsetToFirstParm(); TR::RealRegister *sp = cg()->machine()->getRealRegister(jniLinkageProperties.getStackPointerRegister()); TR::MemoryReference *result = new (trHeapMemory()) TR::MemoryReference(sp, spOffset, cg()); memArg.argRegister = argReg; diff --git a/runtime/compiler/arm/codegen/ARMPrivateLinkage.cpp b/runtime/compiler/arm/codegen/ARMPrivateLinkage.cpp index a9cfcdbec69..7d866da22b4 100644 --- a/runtime/compiler/arm/codegen/ARMPrivateLinkage.cpp +++ b/runtime/compiler/arm/codegen/ARMPrivateLinkage.cpp @@ -289,7 +289,7 @@ void J9::ARM::PrivateLinkage::mapStack(TR::ResolvedMethodSymbol *method) ListIterator parameterIterator(&method->getParameterList()); TR::ParameterSymbol *parmCursor = parameterIterator.getFirst(); - int32_t offsetToFirstParm = self()->getOffsetToFirstParm(); + int32_t offsetToFirstParm = getOffsetToFirstParm(); if (linkage.getRightToLeft()) { while (parmCursor != NULL) @@ -449,7 +449,7 @@ void J9::ARM::PrivateLinkage::createPrologue(TR::Instruction *cursor) int32_t registerSaveSize = intRegistersSaved * 4 + fpRegistersSaved * 8; - int32_t outgoingArgSize = self()->getOffsetToFirstParm() + codeGen->getLargestOutgoingArgSize(); + int32_t outgoingArgSize = getOffsetToFirstParm() + codeGen->getLargestOutgoingArgSize(); int32_t totalFrameSize = localSize + registerSaveSize + outgoingArgSize; // Align frame to 8-byte boundaries. @@ -745,7 +745,7 @@ void J9::ARM::PrivateLinkage::createEpilogue(TR::Instruction *cursor) int32_t registerSaveSize = intRegistersSaved * 4 + fpRegistersSaved * 8; - int32_t outgoingArgSize = self()->getOffsetToFirstParm() + codeGen->getLargestOutgoingArgSize(); + int32_t outgoingArgSize = getOffsetToFirstParm() + codeGen->getLargestOutgoingArgSize(); int32_t totalFrameSize = localSize + registerSaveSize + outgoingArgSize; if (debug("alignStackFrame")) diff --git a/runtime/compiler/codegen/PrivateLinkage.cpp b/runtime/compiler/codegen/PrivateLinkage.cpp index 440a4ff847d..8007e186516 100644 --- a/runtime/compiler/codegen/PrivateLinkage.cpp +++ b/runtime/compiler/codegen/PrivateLinkage.cpp @@ -46,8 +46,9 @@ J9::PrivateLinkage::entryPointFromInterpretedMethod() void J9::PrivateLinkage::mapIncomingParms(TR::ResolvedMethodSymbol *method) { - int32_t offsetToFirstArg = method->getNumParameterSlots() * TR::Compiler->om.sizeofReferenceAddress() + self()->getOffsetToFirstParm(); + int32_t offsetToFirstArg = method->getNumParameterSlots() * TR::Compiler->om.sizeofReferenceAddress() + getOffsetToFirstParm(); + const bool is64Bit = cg()->comp()->target().is64Bit(); ListIterator paramIterator(&method->getParameterList()); for (TR::ParameterSymbol* paramCursor = paramIterator.getFirst(); paramCursor != NULL; paramCursor = paramIterator.getNext()) { @@ -55,7 +56,7 @@ J9::PrivateLinkage::mapIncomingParms(TR::ResolvedMethodSymbol *method) // variables take up two stack slots. A stack slot in OpenJ9 is a `uintptr_t`, so on 64-bit int variables // are still placed in 64-bit stack slots, hence the need to check for 64-bit in the query below. For more // details please see eclipse/openj9#8360. - int32_t slotMultiplier = cg()->comp()->target().is64Bit() && paramCursor->getDataType() != TR::Address ? 2 : 1; + int32_t slotMultiplier = is64Bit && paramCursor->getDataType() != TR::Address ? 2 : 1; paramCursor->setParameterOffset(offsetToFirstArg - paramCursor->getParameterOffset() - diff --git a/runtime/compiler/p/codegen/PPCPrivateLinkage.cpp b/runtime/compiler/p/codegen/PPCPrivateLinkage.cpp index 8ee0648da3a..4f4e57fc239 100644 --- a/runtime/compiler/p/codegen/PPCPrivateLinkage.cpp +++ b/runtime/compiler/p/codegen/PPCPrivateLinkage.cpp @@ -569,7 +569,7 @@ void J9::Power::PrivateLinkage::mapStack(TR::ResolvedMethodSymbol *method) mapIncomingParms(method); atlas->setLocalBaseOffset(lowGCOffset - firstLocalOffset); - atlas->setParmBaseOffset(atlas->getParmBaseOffset() + self()->getOffsetToFirstParm() - firstLocalOffset); + atlas->setParmBaseOffset(atlas->getParmBaseOffset() + getOffsetToFirstParm() - firstLocalOffset); } void J9::Power::PrivateLinkage::mapSingleAutomatic(TR::AutomaticSymbol *p, uint32_t &stackIndex) @@ -1313,11 +1313,11 @@ void J9::Power::PrivateLinkage::createEpilogue(TR::Instruction *cursor) if (0 && cg()->comp()->target().is64Bit()) { - saveSize = (cg()->getLargestOutgoingArgSize() * 2) + self()->getOffsetToFirstParm(); + saveSize = (cg()->getLargestOutgoingArgSize() * 2) + getOffsetToFirstParm(); } else { - saveSize = cg()->getLargestOutgoingArgSize() + self()->getOffsetToFirstParm(); + saveSize = cg()->getLargestOutgoingArgSize() + getOffsetToFirstParm(); } while (savedFirst<=TR::RealRegister::LastGPR && !machine->getRealRegister(savedFirst)->getHasBeenAssignedInMethod()) @@ -1381,7 +1381,7 @@ int32_t J9::Power::PrivateLinkage::buildPrivateLinkageArgs(TR::Node TR::PPCMemoryArgument *pushToMemory = NULL; TR::Register *tempRegister; int32_t argIndex = 0, memArgs = 0, from, to, step; - int32_t argSize = -self()->getOffsetToFirstParm(), totalSize = 0; + int32_t argSize = -getOffsetToFirstParm(), totalSize = 0; uint32_t numIntegerArgs = 0; uint32_t numFloatArgs = 0; uint32_t firstExplicitArg = 0; @@ -2852,7 +2852,7 @@ TR::MemoryReference *J9::Power::PrivateLinkage::getOutgoingArgumentMemRef(int32_ TR::Machine *machine = cg()->machine(); TR::MemoryReference *result=new (trHeapMemory()) TR::MemoryReference(machine->getRealRegister(properties.getNormalStackPointerRegister()), - argSize+self()->getOffsetToFirstParm(), length, cg()); + argSize+getOffsetToFirstParm(), length, cg()); memArg.argRegister = argReg; memArg.argMemory = result; memArg.opCode = opCode; diff --git a/runtime/compiler/z/codegen/S390PrivateLinkage.cpp b/runtime/compiler/z/codegen/S390PrivateLinkage.cpp index 25e394856c6..427f44dbd8c 100644 --- a/runtime/compiler/z/codegen/S390PrivateLinkage.cpp +++ b/runtime/compiler/z/codegen/S390PrivateLinkage.cpp @@ -613,7 +613,7 @@ J9::Z::PrivateLinkage::mapCompactedStack(TR::ResolvedMethodSymbol * method) mapIncomingParms(method); atlas->setLocalBaseOffset(lowGCOffset - firstLocalOffset); - atlas->setParmBaseOffset(atlas->getParmBaseOffset() + self()->getOffsetToFirstParm() - firstLocalOffset); + atlas->setParmBaseOffset(atlas->getParmBaseOffset() + getOffsetToFirstParm() - firstLocalOffset); } // scope of the stack memory region @@ -807,7 +807,7 @@ J9::Z::PrivateLinkage::mapStack(TR::ResolvedMethodSymbol * method) mapIncomingParms(method); atlas->setLocalBaseOffset(lowGCOffset - firstLocalOffset); - atlas->setParmBaseOffset(atlas->getParmBaseOffset() + self()->getOffsetToFirstParm() - firstLocalOffset); + atlas->setParmBaseOffset(atlas->getParmBaseOffset() + getOffsetToFirstParm() - firstLocalOffset); #ifdef DEBUG automaticIterator.reset(); @@ -1155,11 +1155,11 @@ J9::Z::PrivateLinkage::createPrologue(TR::Instruction * cursor) if (0 && cg()->comp()->target().is64Bit()) { - argSize = cg()->getLargestOutgoingArgSize() * 2 + self()->getOffsetToFirstParm(); + argSize = cg()->getLargestOutgoingArgSize() * 2 + getOffsetToFirstParm(); } else { - argSize = cg()->getLargestOutgoingArgSize() + self()->getOffsetToFirstParm(); + argSize = cg()->getLargestOutgoingArgSize() + getOffsetToFirstParm(); } size = regSaveSize + localSize + argSize;