Skip to content

Commit 58e954e

Browse files
dsouzaidsouzai
committed
Replace intptrj_t with intptr_t
Signed-off-by: Irwin D'Souza <dsouzai.gh@gmail.com>
1 parent a2e230e commit 58e954e

File tree

101 files changed

+900
-900
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

101 files changed

+900
-900
lines changed

‎runtime/compiler/aarch64/codegen/ARM64PrivateLinkage.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -150,16 +150,16 @@ uint32_t J9::ARM64::PrivateLinkage::getRightToLeft()
150150
return getProperties().getRightToLeft();
151151
}
152152

153-
intptrj_t
153+
intptr_t
154154
J9::ARM64::PrivateLinkage::entryPointFromCompiledMethod()
155155
{
156-
return reinterpret_cast<intptrj_t>(getJittedMethodEntryPoint()->getBinaryEncoding());
156+
return reinterpret_cast<intptr_t>(getJittedMethodEntryPoint()->getBinaryEncoding());
157157
}
158158

159-
intptrj_t
159+
intptr_t
160160
J9::ARM64::PrivateLinkage::entryPointFromInterpretedMethod()
161161
{
162-
return reinterpret_cast<intptrj_t>(getInterpretedMethodEntryPoint()->getBinaryEncoding());
162+
return reinterpret_cast<intptr_t>(getInterpretedMethodEntryPoint()->getBinaryEncoding());
163163
}
164164

165165
void J9::ARM64::PrivateLinkage::mapStack(TR::ResolvedMethodSymbol *method)
@@ -1476,8 +1476,8 @@ void J9::ARM64::PrivateLinkage::performPostBinaryEncoding()
14761476
TR::ARM64ImmInstruction *linkageInfoWordInstruction = cg()->getReturnTypeInfoInstruction();
14771477
uint32_t linkageInfoWord = linkageInfoWordInstruction->getSourceImmediate();
14781478

1479-
intptrj_t jittedMethodEntryAddress = reinterpret_cast<intptrj_t>(getJittedMethodEntryPoint()->getBinaryEncoding());
1480-
intptrj_t interpretedMethodEntryAddress = reinterpret_cast<intptrj_t>(getInterpretedMethodEntryPoint()->getBinaryEncoding());
1479+
intptr_t jittedMethodEntryAddress = reinterpret_cast<intptr_t>(getJittedMethodEntryPoint()->getBinaryEncoding());
1480+
intptr_t interpretedMethodEntryAddress = reinterpret_cast<intptr_t>(getInterpretedMethodEntryPoint()->getBinaryEncoding());
14811481

14821482
linkageInfoWord = (static_cast<uint32_t>(jittedMethodEntryAddress - interpretedMethodEntryAddress) << 16) | linkageInfoWord;
14831483
linkageInfoWordInstruction->setSourceImmediate(linkageInfoWord);

‎runtime/compiler/aarch64/codegen/ARM64PrivateLinkage.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -220,12 +220,12 @@ class PrivateLinkage : public J9::PrivateLinkage
220220
/**
221221
* @brief J9 private linkage override of OMR function
222222
*/
223-
virtual intptrj_t entryPointFromCompiledMethod();
223+
virtual intptr_t entryPointFromCompiledMethod();
224224

225225
/**
226226
* @brief J9 private linkage override of OMR function
227227
*/
228-
virtual intptrj_t entryPointFromInterpretedMethod();
228+
virtual intptr_t entryPointFromInterpretedMethod();
229229

230230
/**
231231
* J9 private linkage override of OMR function

‎runtime/compiler/aarch64/codegen/CallSnippet.cpp

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ uint8_t *TR::ARM64CallSnippet::emitSnippetBody()
255255
cursor += 4;
256256

257257
// Store the code cache RA
258-
*(intptrj_t *)cursor = (intptrj_t)getCallRA();
258+
*(intptr_t *)cursor = (intptr_t)getCallRA();
259259
cg()->addExternalRelocation(new (cg()->trHeapMemory()) TR::ExternalRelocation(
260260
cursor,
261261
NULL,
@@ -270,7 +270,7 @@ uint8_t *TR::ARM64CallSnippet::emitSnippetBody()
270270
// Store the method pointer: it is NULL for unresolved
271271
if (methodSymRef->isUnresolved() || comp->compileRelocatableCode())
272272
{
273-
*(intptrj_t *)cursor = 0;
273+
*(intptr_t *)cursor = 0;
274274
if (comp->getOption(TR_EnableHCR))
275275
{
276276
cg()->jitAddPicToPatchOnClassRedefinition((void*)-1, (void *)cursor, true);
@@ -281,7 +281,7 @@ uint8_t *TR::ARM64CallSnippet::emitSnippetBody()
281281
}
282282
else
283283
{
284-
*(intptrj_t *)cursor = (intptrj_t)methodSymbol->getMethodAddress();
284+
*(intptr_t *)cursor = (intptr_t)methodSymbol->getMethodAddress();
285285
if (comp->getOption(TR_EnableHCR))
286286
{
287287
cg()->jitAddPicToPatchOnClassRedefinition((void *)methodSymbol->getMethodAddress(), (void *)cursor);
@@ -335,12 +335,12 @@ uint8_t *TR::ARM64UnresolvedCallSnippet::emitSnippetBody()
335335

336336
TR::SymbolReference *methodSymRef = getNode()->getSymbolReference();
337337
TR::MethodSymbol *methodSymbol = methodSymRef->getSymbol()->castToMethodSymbol();
338-
intptrj_t helperLookupOffset;
338+
intptr_t helperLookupOffset;
339339

340340
TR::Compilation* comp = cg()->comp();
341341

342342
// CP
343-
*(intptrj_t *)cursor = (intptrj_t)methodSymRef->getOwningMethod(comp)->constantPool();
343+
*(intptr_t *)cursor = (intptr_t)methodSymRef->getOwningMethod(comp)->constantPool();
344344

345345
if (comp->compileRelocatableCode() && comp->getOption(TR_TraceRelocatableDataDetailsCG))
346346
{
@@ -382,7 +382,7 @@ uint8_t *TR::ARM64UnresolvedCallSnippet::emitSnippetBody()
382382
}
383383

384384
// CP index and helper offset
385-
*(intptrj_t *)cursor = (helperLookupOffset<<56) | methodSymRef->getCPIndexForVM();
385+
*(intptr_t *)cursor = (helperLookupOffset<<56) | methodSymRef->getCPIndexForVM();
386386

387387
return cursor + 8;
388388
}
@@ -417,7 +417,7 @@ uint8_t *TR::ARM64VirtualUnresolvedSnippet::emitSnippetBody()
417417
cursor += 4;
418418

419419
// Store the code cache RA
420-
*(intptrj_t *)cursor = (intptrj_t)getReturnLabel()->getCodeLocation();
420+
*(intptr_t *)cursor = (intptr_t)getReturnLabel()->getCodeLocation();
421421
cg()->addExternalRelocation(new (cg()->trHeapMemory()) TR::ExternalRelocation(
422422
cursor,
423423
NULL,
@@ -426,8 +426,8 @@ uint8_t *TR::ARM64VirtualUnresolvedSnippet::emitSnippetBody()
426426
cursor += 8;
427427

428428
// CP
429-
intptrj_t cpAddr = (intptrj_t)methodSymRef->getOwningMethod(comp)->constantPool();
430-
*(intptrj_t *)cursor = cpAddr;
429+
intptr_t cpAddr = (intptr_t)methodSymRef->getOwningMethod(comp)->constantPool();
430+
*(intptr_t *)cursor = cpAddr;
431431
uint8_t *j2iThunkRelocationPoint = cursor;
432432
cg()->addExternalRelocation(new (cg()->trHeapMemory()) TR::ExternalRelocation(
433433
cursor,
@@ -438,18 +438,18 @@ uint8_t *TR::ARM64VirtualUnresolvedSnippet::emitSnippetBody()
438438
cursor += 8;
439439

440440
// CP index
441-
*(intptrj_t *)cursor = methodSymRef->getCPIndexForVM();
441+
*(intptr_t *)cursor = methodSymRef->getCPIndexForVM();
442442
cursor += 8;
443443

444444
// Reserved spot to hold J9Method pointer of the callee
445445
// This is used for private nestmate calls
446446
// Initial value is 0
447-
*(intptrj_t *)cursor = 0;
447+
*(intptr_t *)cursor = 0;
448448
cursor += 8;
449449

450450
// J2I thunk address
451451
// This is used for private nestmate calls
452-
*(intptrj_t*)cursor = (intptrj_t)thunk;
452+
*(intptr_t*)cursor = (intptr_t)thunk;
453453

454454
auto info =
455455
(TR_RelocationRecordInformation *)comp->trMemory()->allocateMemory(
@@ -463,7 +463,7 @@ uint8_t *TR::ARM64VirtualUnresolvedSnippet::emitSnippetBody()
463463
info->data2 = callNode ? callNode->getInlinedSiteIndex() : (uintptr_t)-1;
464464

465465
// data3 = distance in bytes from Constant Pool Pointer to J2I Thunk
466-
info->data3 = (intptrj_t)cursor - (intptrj_t)j2iThunkRelocationPoint;
466+
info->data3 = (intptr_t)cursor - (intptr_t)j2iThunkRelocationPoint;
467467

468468
cg()->addExternalRelocation(new (cg()->trHeapMemory()) TR::ExternalRelocation(
469469
j2iThunkRelocationPoint,
@@ -494,7 +494,7 @@ TR_Debug::print(TR::FILE *pOutFile, TR::ARM64VirtualUnresolvedSnippet * snippet)
494494
cursor += sizeof(intptr_t);
495495

496496
printPrefix(pOutFile, NULL, cursor, sizeof(intptr_t));
497-
trfprintf(pOutFile, ".dword \t" POINTER_PRINTF_FORMAT "\t\t; Constant pool address", *(intptrj_t *)cursor);
497+
trfprintf(pOutFile, ".dword \t" POINTER_PRINTF_FORMAT "\t\t; Constant pool address", *(intptr_t *)cursor);
498498
cursor += sizeof(intptr_t);
499499

500500
printPrefix(pOutFile, NULL, cursor, sizeof(intptr_t));
@@ -519,7 +519,7 @@ uint8_t *TR::ARM64InterfaceCallSnippet::emitSnippetBody()
519519
cursor += 4;
520520

521521
// Store the code cache RA
522-
*(intptrj_t *)cursor = (intptrj_t)getReturnLabel()->getCodeLocation();
522+
*(intptr_t *)cursor = (intptr_t)getReturnLabel()->getCodeLocation();
523523
cg()->addExternalRelocation(new (cg()->trHeapMemory()) TR::ExternalRelocation(
524524
cursor,
525525
NULL,
@@ -528,7 +528,7 @@ uint8_t *TR::ARM64InterfaceCallSnippet::emitSnippetBody()
528528
cursor += 8;
529529

530530
// CP
531-
*(intptrj_t *)cursor = (intptrj_t)methodSymRef->getOwningMethod(cg()->comp())->constantPool();
531+
*(intptr_t *)cursor = (intptr_t)methodSymRef->getOwningMethod(cg()->comp())->constantPool();
532532
cg()->addExternalRelocation(new (cg()->trHeapMemory()) TR::ExternalRelocation(
533533
cursor,
534534
*(uint8_t **)cursor,
@@ -538,13 +538,13 @@ uint8_t *TR::ARM64InterfaceCallSnippet::emitSnippetBody()
538538
cursor += 8;
539539

540540
// CP index
541-
*(intptrj_t *)cursor = methodSymRef->getCPIndexForVM();
541+
*(intptr_t *)cursor = methodSymRef->getCPIndexForVM();
542542
cursor += 8;
543543

544544
// Add 2 more slots for resolved values (interface class and iTable offset)
545-
*(intptrj_t *)cursor = 0;
545+
*(intptr_t *)cursor = 0;
546546
cursor += 8;
547-
*(intptrj_t *)cursor = 0;
547+
*(intptr_t *)cursor = 0;
548548
cursor += 8;
549549

550550
return cursor;
@@ -569,15 +569,15 @@ TR_Debug::print(TR::FILE *pOutFile, TR::ARM64InterfaceCallSnippet * snippet)
569569
cursor += sizeof(intptr_t);
570570

571571
printPrefix(pOutFile, NULL, cursor, sizeof(intptr_t));
572-
trfprintf(pOutFile, ".dword \t" POINTER_PRINTF_FORMAT "\t\t; Constant pool address", *(intptrj_t *)cursor);
572+
trfprintf(pOutFile, ".dword \t" POINTER_PRINTF_FORMAT "\t\t; Constant pool address", *(intptr_t *)cursor);
573573
cursor += sizeof(intptr_t);
574574

575575
printPrefix(pOutFile, NULL, cursor, sizeof(intptr_t));
576576
trfprintf(pOutFile, ".dword \t0x%08x\t\t; cpIndex", *(intptr_t *)cursor);
577577
cursor += sizeof(intptr_t);
578578

579579
printPrefix(pOutFile, NULL, cursor, sizeof(intptr_t));
580-
trfprintf(pOutFile, ".dword \t" POINTER_PRINTF_FORMAT "\t\t; Interface class", *(intptrj_t *)cursor);
580+
trfprintf(pOutFile, ".dword \t" POINTER_PRINTF_FORMAT "\t\t; Interface class", *(intptr_t *)cursor);
581581
cursor += sizeof(intptr_t);
582582

583583
printPrefix(pOutFile, NULL, cursor, sizeof(intptr_t));

‎runtime/compiler/aarch64/codegen/J9CodeGenerator.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,11 +96,11 @@ J9::ARM64::CodeGenerator::encodeHelperBranchAndLink(TR::SymbolReference *symRef,
9696
TR::CodeGenerator *cg = self();
9797
uintptr_t target = (uintptr_t)symRef->getMethodAddress();
9898

99-
if (cg->directCallRequiresTrampoline(target, (intptrj_t)cursor))
99+
if (cg->directCallRequiresTrampoline(target, (intptr_t)cursor))
100100
{
101101
target = TR::CodeCacheManager::instance()->findHelperTrampoline(symRef->getReferenceNumber(), (void *)cursor);
102102

103-
TR_ASSERT_FATAL(cg->comp()->target().cpu.isTargetWithinUnconditionalBranchImmediateRange(target, (intptrj_t)cursor),
103+
TR_ASSERT_FATAL(cg->comp()->target().cpu.isTargetWithinUnconditionalBranchImmediateRange(target, (intptr_t)cursor),
104104
"Target address is out of range");
105105
}
106106

‎runtime/compiler/aarch64/codegen/J9TreeEvaluator.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -934,7 +934,7 @@ VMinlineCompareAndSwap(TR::Node *node, TR::CodeGenerator *cg, bool isLong)
934934
TR::Register *objReg = cg->evaluate(secondChild);
935935
TR::RegisterDependencyConditions *conditions = NULL;
936936
TR::LabelSymbol *doneLabel = generateLabelSymbol(cg);
937-
intptrj_t oldValue = 0;
937+
intptr_t oldValue = 0;
938938
bool oldValueInReg = true;
939939
offsetReg = cg->evaluate(thirdChild);
940940

‎runtime/compiler/aarch64/codegen/J9UnresolvedDataSnippet.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ TR_Debug::print(TR::FILE *pOutFile, TR::UnresolvedDataSnippet * snippet)
175175
cursor += sizeof(intptr_t);
176176

177177
printPrefix(pOutFile, NULL, cursor, sizeof(intptr_t));
178-
trfprintf(pOutFile, ".dword \t" POINTER_PRINTF_FORMAT "\t\t; Constant pool address", *(intptrj_t *)cursor);
178+
trfprintf(pOutFile, ".dword \t" POINTER_PRINTF_FORMAT "\t\t; Constant pool address", *(intptr_t *)cursor);
179179
cursor += sizeof(intptr_t);
180180

181181
printPrefix(pOutFile, NULL, cursor, 4);

‎runtime/compiler/aarch64/codegen/StackCheckFailureSnippet.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -174,11 +174,11 @@ TR_Debug::print(TR::FILE *pOutFile, TR::ARM64StackCheckFailureSnippet * snippet)
174174
bufferPos += ARM64_INSTRUCTION_LENGTH;
175175

176176
char *info = "";
177-
intptrj_t target = (intptrj_t)(sofRef->getMethodAddress());
177+
intptr_t target = (intptr_t)(sofRef->getMethodAddress());
178178
int32_t distance;
179179
if (isBranchToTrampoline(sofRef, bufferPos, distance))
180180
{
181-
target = (intptrj_t)distance + (intptrj_t)bufferPos;
181+
target = (intptr_t)distance + (intptr_t)bufferPos;
182182
info = " Through trampoline";
183183
}
184184
printPrefix(pOutFile, NULL, bufferPos, 4);

‎runtime/compiler/aarch64/runtime/ARM64RelocationTarget.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ bool
103103
TR_ARM64RelocationTarget::useTrampoline(uint8_t *helperAddress, uint8_t *baseLocation)
104104
{
105105
return
106-
!reloRuntime()->comp()->target().cpu.isTargetWithinUnconditionalBranchImmediateRange((intptrj_t)helperAddress, (intptrj_t)baseLocation) ||
106+
!reloRuntime()->comp()->target().cpu.isTargetWithinUnconditionalBranchImmediateRange((intptr_t)helperAddress, (intptr_t)baseLocation) ||
107107
TR::Options::getCmdLineOptions()->getOption(TR_StressTrampolines);
108108
}
109109

‎runtime/compiler/arm/codegen/ARMHelperCallSnippet.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,13 @@
3939
uint8_t *TR::ARMHelperCallSnippet::emitSnippetBody()
4040
{
4141
uint8_t *buffer = cg()->getBinaryBufferCursor();
42-
intptrj_t distance = (intptrj_t)getDestination()->getSymbol()->castToMethodSymbol()->getMethodAddress() - (intptrj_t)buffer - 8;
42+
intptr_t distance = (intptr_t)getDestination()->getSymbol()->castToMethodSymbol()->getMethodAddress() - (intptr_t)buffer - 8;
4343

4444
getSnippetLabel()->setCodeLocation(buffer);
4545

4646
if (!(distance>=BRANCH_BACKWARD_LIMIT && distance<=BRANCH_FORWARD_LIMIT))
4747
{
48-
distance = TR::CodeCacheManager::instance()->findHelperTrampoline(getDestination()->getReferenceNumber(), (void *)buffer) - (intptrj_t)buffer - 8;
48+
distance = TR::CodeCacheManager::instance()->findHelperTrampoline(getDestination()->getReferenceNumber(), (void *)buffer) - (intptr_t)buffer - 8;
4949
TR_ASSERT(distance>=BRANCH_BACKWARD_LIMIT && distance<=BRANCH_FORWARD_LIMIT,
5050
"CodeCache is more than 32MB.\n");
5151
}

‎runtime/compiler/arm/codegen/ARMRecompilation.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ TR::Instruction *TR_ARMRecompilation::generatePrePrologue()
9090
cursor = new (cg()->trHeapMemory()) TR::ARMTrg1Src1Instruction(cursor, ARMOp_mov, firstNode, gr4, lr, cg());
9191
cursor = generateImmSymInstruction(cg(), ARMOp_bl, firstNode, (uintptr_t)recompileMethodSymRef->getMethodAddress(), new (cg()->trHeapMemory()) TR::RegisterDependencyConditions((uint8_t)0, 0, cg()->trMemory()), recompileMethodSymRef, NULL, cursor);
9292
}
93-
cursor = new (cg()->trHeapMemory()) TR::ARMImmInstruction(cursor, ARMOp_dd, firstNode, (int32_t)(intptrj_t)info, cg());
93+
cursor = new (cg()->trHeapMemory()) TR::ARMImmInstruction(cursor, ARMOp_dd, firstNode, (int32_t)(intptr_t)info, cg());
9494
cursor->setNeedsAOTRelocation();
9595
((TR::ARMImmInstruction *)cursor)->setReloKind(TR_BodyInfoAddress);
9696

@@ -110,7 +110,7 @@ TR::Instruction *TR_ARMRecompilation::generatePrologue(TR::Instruction *cursor)
110110
TR::Register *gr5 = machine->getRealRegister(TR::RealRegister::gr5);
111111
TR::Register *lr = machine->getRealRegister(TR::RealRegister::gr14); // link register
112112
TR::Node *firstNode = _compilation->getStartTree()->getNode();
113-
intptrj_t addr = (intptrj_t)getCounterAddress();
113+
intptr_t addr = (intptr_t)getCounterAddress();
114114
TR::LabelSymbol *snippetLabel = TR::LabelSymbol::create(cg()->trHeapMemory(), cg());
115115
intParts localVal(addr);
116116

0 commit comments

Comments
 (0)