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

Use JITServer check to create a relocation record for interface calls on Power #7803

Merged
merged 1 commit into from
Nov 21, 2019
Merged

Use JITServer check to create a relocation record for interface calls on Power #7803

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
10 changes: 9 additions & 1 deletion runtime/compiler/p/codegen/CallSnippet.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -719,7 +719,11 @@ uint8_t *TR::PPCInterfaceCallSnippet::emitSnippetBody()
{
int32_t *patchAddr = (int32_t *)getLowerInstruction()->getBinaryEncoding();
intptrj_t addrValue = (intptrj_t)cursor;
if (!comp->compileRelocatableCode())
if (!comp->compileRelocatableCode()
#ifdef JITSERVER_SUPPORT
&& !comp->isOutOfProcessCompilation()
#endif
)
{
// If the high nibble is 0 and the next nibble's high bit is clear, change the first instruction to a nop and the third to a li
// Next nibble's high bit needs to be clear in order to use li (because li will sign extend the immediate)
Expand All @@ -744,6 +748,10 @@ uint8_t *TR::PPCInterfaceCallSnippet::emitSnippetBody()
}
else
{
// We must take this path for all compiles that need to generate relocatable code (ex. AOT, outOfProcess).
// The immediate fields of relocatable instructions must be clear. This is because when performing the relocation,
// we OR the new address into the fields. So if the fields are not already clear, then OR'ing the new address can
// result in garbage data.
cg()->addExternalRelocation(new (cg()->trHeapMemory()) TR::BeforeBinaryEncodingExternalRelocation(getUpperInstruction(),
(uint8_t *)(addrValue),
(uint8_t *)fixedSequence4,
Expand Down