Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Relocate the J2I virtual thunk in PIC data on x86 #2875

Merged
merged 1 commit into from
Sep 18, 2018
Merged

Relocate the J2I virtual thunk in PIC data on x86 #2875

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 35 additions & 3 deletions runtime/compiler/x/codegen/CallSnippet.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,12 +67,44 @@ uint8_t *TR::X86PicDataSnippet::encodeConstantPoolInfo(uint8_t *cursor)
uintptrj_t cpAddr = (uintptrj_t)_methodSymRef->getOwningMethod(cg()->comp())->constantPool();
*(uintptrj_t *)cursor = cpAddr;

if (_thunkAddress)
uintptr_t inlinedSiteIndex = (uintptr_t)-1;
if (_startOfPicInstruction->getNode() != NULL)
inlinedSiteIndex = _startOfPicInstruction->getNode()->getInlinedSiteIndex();

if (_hasJ2IThunkInPicData)
{
TR_ASSERT(
TR::Compiler->target.is64Bit(),
"expecting a 64-bit target for thunk relocations");

auto info =
(TR_RelocationRecordInformation *)comp()->trMemory()->allocateMemory(
sizeof (TR_RelocationRecordInformation),
heapAlloc);

int offsetToJ2IVirtualThunk = isInterface() ? 0x22 : 0x18;

info->data1 = cpAddr;
info->data2 = inlinedSiteIndex;
info->data3 = offsetToJ2IVirtualThunk;

cg()->addExternalRelocation(
new (cg()->trHeapMemory()) TR::ExternalRelocation(
cursor,
(uint8_t *)info,
NULL,
TR_J2IVirtualThunkPointer,
cg()),
__FILE__,
__LINE__,
_startOfPicInstruction->getNode());
}
else if (_thunkAddress)
{
TR_ASSERT(TR::Compiler->target.is64Bit(), "expecting a 64-bit target for thunk relocations");
cg()->addExternalRelocation(new (cg()->trHeapMemory()) TR::ExternalRelocation(cursor,
*(uint8_t **)cursor,
_startOfPicInstruction->getNode() ? (uint8_t *)_startOfPicInstruction->getNode()->getInlinedSiteIndex() : (uint8_t *)-1,
(uint8_t *)inlinedSiteIndex,
TR_Thunks, cg()),
__FILE__,
__LINE__,
Expand All @@ -82,7 +114,7 @@ uint8_t *TR::X86PicDataSnippet::encodeConstantPoolInfo(uint8_t *cursor)
{
cg()->addExternalRelocation(new (cg()->trHeapMemory()) TR::ExternalRelocation(cursor,
(uint8_t *)cpAddr,
_startOfPicInstruction->getNode() ? (uint8_t *)_startOfPicInstruction->getNode()->getInlinedSiteIndex() : (uint8_t *)-1,
(uint8_t *)inlinedSiteIndex,
TR_ConstantPool,
cg()),
__FILE__,
Expand Down