Skip to content

Commit 14e29b4

Browse files
gacholiogacholio
authored
Revert "Remove uses of INTERP_COMPRESSED_OBJECT_HEADER"
1 parent 884e05c commit 14e29b4

35 files changed

+178
-174
lines changed

‎debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCHeapLinkedFreeHeader_V1.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright (c) 1991, 2019 IBM Corp. and others
2+
* Copyright (c) 1991, 2018 IBM Corp. and others
33
*
44
* This program and the accompanying materials are made available under
55
* the terms of the Eclipse Public License 2.0 which accompanies this
@@ -47,7 +47,7 @@ private UDATA getNextImpl() throws CorruptDataException
4747
{
4848
Pointer nextEA = heapLinkedFreeHeaderPointer._nextEA();
4949

50-
if (J9BuildFlags.gc_compressedPointers) {
50+
if (J9BuildFlags.interp_compressedObjectHeader) {
5151
U32Pointer nextPointer = U32Pointer.cast(nextEA);
5252
U32 lowBits = nextPointer.at(0);
5353
U32 highBits = nextPointer.at(1);

‎debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCScavengerForwardedHeader_V1.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright (c) 1991, 2019 IBM Corp. and others
2+
* Copyright (c) 1991, 2014 IBM Corp. and others
33
*
44
* This program and the accompanying materials are made available under
55
* the terms of the Eclipse Public License 2.0 which accompanies this
@@ -55,7 +55,7 @@ public J9ObjectPointer getForwardedObject() throws CorruptDataException
5555

5656
protected J9ObjectPointer getForwardedObjectNoCheck() throws CorruptDataException
5757
{
58-
if(J9BuildFlags.gc_compressedPointers && !J9BuildFlags.env_littleEndian) {
58+
if(J9BuildFlags.interp_compressedObjectHeader && !J9BuildFlags.env_littleEndian) {
5959
/* compressed big endian - read two halves separately */
6060
U32 low = U32Pointer.cast(objectPointer.clazzEA()).at(0).bitAnd(~ALL_TAGS);
6161
U32 high = U32Pointer.cast(objectPointer.clazzEA()).at(1);

‎debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/AbstractPointer.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright (c) 1991, 2019 IBM Corp. and others
2+
* Copyright (c) 1991, 2018 IBM Corp. and others
33
*
44
* This program and the accompanying materials are made available under
55
* the terms of the Eclipse Public License 2.0 which accompanies this
@@ -505,7 +505,7 @@ protected J9ClassPointer getObjectClassAtOffset(long offset) throws CorruptDataE
505505
{
506506
long location = address + offset;
507507
long classPointer;
508-
if (J9BuildFlags.gc_compressedPointers) {
508+
if (J9BuildFlags.interp_compressedObjectHeader) {
509509
classPointer = (long)getAddressSpace().getIntAt(location) & 0xFFFFFFFFL;
510510
} else {
511511
classPointer = getAddressSpace().getPointerAt(location);

‎debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/ObjectClassReferencePointer.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright (c) 2001, 2019 IBM Corp. and others
2+
* Copyright (c) 2001, 2014 IBM Corp. and others
33
*
44
* This program and the accompanying materials are made available under
55
* the terms of the Eclipse Public License 2.0 which accompanies this
@@ -31,7 +31,7 @@
3131
public class ObjectClassReferencePointer extends Pointer
3232
{
3333
public static final ObjectClassReferencePointer NULL = new ObjectClassReferencePointer(0);
34-
public static final long SIZEOF = J9BuildFlags.gc_compressedPointers ? U32.SIZEOF : UDATA.SIZEOF;
34+
public static final long SIZEOF = J9BuildFlags.interp_compressedObjectHeader ? U32.SIZEOF : UDATA.SIZEOF;
3535

3636
protected ObjectClassReferencePointer(long address)
3737
{
@@ -81,7 +81,7 @@ public ObjectClassReferencePointer addOffset(Scalar offset)
8181
@Override
8282
public J9ClassPointer at(long index) throws CorruptDataException
8383
{
84-
if(J9BuildFlags.gc_compressedPointers) {
84+
if(J9BuildFlags.interp_compressedObjectHeader) {
8585
return J9ClassPointer.cast(0xFFFFFFFFL & (long)getIntAtOffset(index * SIZEOF));
8686
} else {
8787
return J9ClassPointer.cast(getUDATAAtOffset(SIZEOF * index));

‎runtime/codert_vm/cnathelp.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -2067,7 +2067,7 @@ impl_jitReferenceArrayCopy(J9VMThread *currentThread, UDATA lengthInBytes)
20672067
(I_32)(lengthInBytes >> 2)
20682068
#else
20692069
(I_32)(lengthInBytes >> 3)
2070-
#endif /* J9VM_GC_COMPRESSED_POINTERS || !J9VM_ENV_DATA64 */
2070+
#endif /* J9VM_INTERP_COMPRESSED_OBJECT_HEADER || !J9VM_ENV_DATA64 */
20712071
)) {
20722072
exception = (void*)-1;
20732073
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ TR::Instruction *OMR::ARM::TreeEvaluator::generateVFTMaskInstruction(TR::CodeGen
118118
{
119119
TR_J9VMBase *fej9 = (TR_J9VMBase *) (cg->fe());
120120
uintptrj_t mask = TR::Compiler->om.maskOfObjectVftField();
121-
#ifdef J9VM_GC_COMPRESSED_POINTERS
121+
#ifdef J9VM_INTERP_COMPRESSED_OBJECT_HEADER
122122
bool isCompressed = true;
123123
#else
124124
bool isCompressed = false;

‎runtime/compiler/env/J9ObjectModel.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ J9::ObjectModel::nativeAddressesCanChangeSize()
225225
bool
226226
J9::ObjectModel::generateCompressedObjectHeaders()
227227
{
228-
#if defined(J9VM_GC_COMPRESSED_POINTERS)
228+
#if defined(J9VM_INTERP_COMPRESSED_OBJECT_HEADER)
229229
return true;
230230
#else
231231
return false;

‎runtime/compiler/env/VMJ9.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -2091,7 +2091,7 @@ int32_t TR_J9VMBase::getCAASaveOffset()
20912091
uint32_t
20922092
TR_J9VMBase::getWordOffsetToGCFlags()
20932093
{
2094-
#if defined(J9VM_INTERP_FLAGS_IN_CLASS_SLOT) && defined(TR_TARGET_64BIT) && !defined(J9VM_GC_COMPRESSED_POINTERS)
2094+
#if defined(J9VM_INTERP_FLAGS_IN_CLASS_SLOT) && defined(TR_TARGET_64BIT) && !defined(J9VM_INTERP_COMPRESSED_OBJECT_HEADER)
20952095
return TR::Compiler->om.offsetOfHeaderFlags() + 4;
20962096
#else
20972097
return TR::Compiler->om.offsetOfHeaderFlags();

‎runtime/compiler/p/codegen/J9PPCSnippet.cpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -2258,7 +2258,7 @@ static uint8_t* initializeCCPreLoadedObjectAlloc(uint8_t *buffer, void **CCPreLo
22582258

22592259
TR::Instruction *entry = generateLabelInstruction(cg, TR::InstOpCode::label, n, entryLabel);
22602260
TR::Instruction *cursor = entry;
2261-
#if defined(J9VM_GC_COMPRESSED_POINTERS)
2261+
#if defined(J9VM_INTERP_COMPRESSED_OBJECT_HEADER)
22622262
const TR::InstOpCode::Mnemonic Op_stclass = TR::InstOpCode::stw;
22632263
#else
22642264
const TR::InstOpCode::Mnemonic Op_stclass =TR::InstOpCode::Op_st;
@@ -2475,7 +2475,7 @@ static uint8_t* initializeCCPreLoadedArrayAlloc(uint8_t *buffer, void **CCPreLoa
24752475

24762476
TR::Instruction *entry = generateLabelInstruction(cg, TR::InstOpCode::label, n, entryLabel);
24772477
TR::Instruction *cursor = entry;
2478-
#if defined(J9VM_GC_COMPRESSED_POINTERS)
2478+
#if defined(J9VM_INTERP_COMPRESSED_OBJECT_HEADER)
24792479
const TR::InstOpCode::Mnemonic Op_stclass = TR::InstOpCode::stw;
24802480
#else
24812481
const TR::InstOpCode::Mnemonic Op_stclass =TR::InstOpCode::Op_st;
@@ -2749,7 +2749,7 @@ static uint8_t* initializeCCPreLoadedWriteBarrier(uint8_t *buffer, void **CCPreL
27492749
helperTrampolineLabel->setCodeLocation((uint8_t *)TR::CodeCacheManager::instance()->findHelperTrampoline(TR_writeBarrierStoreGenerational, buffer));
27502750
TR::Instruction *entry = generateLabelInstruction(cg, TR::InstOpCode::label, n, entryLabel);
27512751
TR::Instruction *cursor = entry;
2752-
#if defined(J9VM_GC_COMPRESSED_POINTERS)
2752+
#if defined(J9VM_INTERP_COMPRESSED_OBJECT_HEADER)
27532753
const TR::InstOpCode::Mnemonic Op_lclass = TR::InstOpCode::lwz;
27542754
#else
27552755
const TR::InstOpCode::Mnemonic Op_lclass =TR::InstOpCode::Op_load;
@@ -2851,7 +2851,7 @@ static uint8_t* initializeCCPreLoadedWriteBarrierAndCardMark(uint8_t *buffer, vo
28512851
helperTrampolineLabel->setCodeLocation((uint8_t *)TR::CodeCacheManager::instance()->findHelperTrampoline(TR_writeBarrierStoreGenerationalAndConcurrentMark, buffer));
28522852
TR::Instruction *entry = generateLabelInstruction(cg, TR::InstOpCode::label, n, entryLabel);
28532853
TR::Instruction *cursor = entry;
2854-
#if defined(J9VM_GC_COMPRESSED_POINTERS)
2854+
#if defined(J9VM_INTERP_COMPRESSED_OBJECT_HEADER)
28552855
const TR::InstOpCode::Mnemonic Op_lclass = TR::InstOpCode::lwz;
28562856
#else
28572857
const TR::InstOpCode::Mnemonic Op_lclass =TR::InstOpCode::Op_load;
@@ -3066,7 +3066,7 @@ static uint8_t* initializeCCPreLoadedArrayStoreCHK(uint8_t *buffer, void **CCPre
30663066
helperTrampolineLabel->setCodeLocation((uint8_t *)TR::CodeCacheManager::instance()->findHelperTrampoline(TR_typeCheckArrayStore, buffer));
30673067
TR::Instruction *entry = generateLabelInstruction(cg, TR::InstOpCode::label, n, entryLabel);
30683068
TR::Instruction *cursor = entry;
3069-
#if defined(J9VM_GC_COMPRESSED_POINTERS)
3069+
#if defined(J9VM_INTERP_COMPRESSED_OBJECT_HEADER)
30703070
const TR::InstOpCode::Mnemonic Op_lclass = TR::InstOpCode::lwz;
30713071
#else
30723072
const TR::InstOpCode::Mnemonic Op_lclass =TR::InstOpCode::Op_load;

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

+22-22
Original file line numberDiff line numberDiff line change
@@ -474,7 +474,7 @@ TR::Register *outlinedHelperWrtbarEvaluator(TR::Node *node, TR::CodeGenerator *c
474474
static int32_t getOffsetOfJ9ObjectFlags()
475475
{
476476
#if defined(J9VM_INTERP_FLAGS_IN_CLASS_SLOT)
477-
#if defined(TR_TARGET_64BIT) && !defined(J9VM_GC_COMPRESSED_POINTERS)
477+
#if defined(TR_TARGET_64BIT) && !defined(J9VM_INTERP_COMPRESSED_OBJECT_HEADER)
478478
#if defined(__LITTLE_ENDIAN__)
479479
return TMP_OFFSETOF_J9OBJECT_CLAZZ;
480480
#else
@@ -2934,7 +2934,7 @@ TR::Instruction *J9::Power::TreeEvaluator::generateVFTMaskInstruction(TR::CodeGe
29342934
{
29352935
TR_J9VMBase *fej9 = (TR_J9VMBase *) (cg->fe());
29362936
uintptrj_t mask = TR::Compiler->om.maskOfObjectVftField();
2937-
#ifdef J9VM_GC_COMPRESSED_POINTERS
2937+
#ifdef J9VM_INTERP_COMPRESSED_OBJECT_HEADER
29382938
bool isCompressed = true;
29392939
#else
29402940
bool isCompressed = false;
@@ -2962,7 +2962,7 @@ static TR::Instruction *genTestIsSuper(TR::Node *node, TR::Register *objClassReg
29622962
TR::Compilation* comp = cg->comp();
29632963
int32_t superClassOffset = castClassDepth * TR::Compiler->om.sizeofReferenceAddress();
29642964
bool outOfBound = (!depthInReg2 && (superClassOffset > UPPER_IMMED || superClassOffset < LOWER_IMMED)) ? true : false;
2965-
#ifdef J9VM_GC_COMPRESSED_POINTERS
2965+
#ifdef J9VM_INTERP_COMPRESSED_OBJECT_HEADER
29662966
// objClassReg contains the class offset so we may need to generate code
29672967
// to convert from class offset to real J9Class pointer
29682968
#endif
@@ -2991,7 +2991,7 @@ static TR::Instruction *genTestIsSuper(TR::Node *node, TR::Register *objClassReg
29912991
else
29922992
cursor = generateShiftLeftImmediate(cg, node, scratch2Reg, scratch2Reg, 2, cursor);
29932993
}
2994-
#ifdef J9VM_GC_COMPRESSED_POINTERS
2994+
#ifdef J9VM_INTERP_COMPRESSED_OBJECT_HEADER
29952995
// objClassReg contains the class offset so we may need to generate code
29962996
// to convert from class offset to real J9Class pointer
29972997
#endif
@@ -3008,7 +3008,7 @@ static TR::Instruction *genTestIsSuper(TR::Node *node, TR::Register *objClassReg
30083008
cursor = generateTrg1MemInstruction(cg,TR::InstOpCode::Op_load, node, scratch1Reg,
30093009
new (cg->trHeapMemory()) TR::MemoryReference(scratch1Reg, superClassOffset, TR::Compiler->om.sizeofReferenceAddress(), cg), cursor);
30103010
}
3011-
#ifdef J9VM_GC_COMPRESSED_POINTERS
3011+
#ifdef J9VM_INTERP_COMPRESSED_OBJECT_HEADER
30123012
// castClassReg has a class offset and scratch1Reg contains a J9Class pointer
30133013
// May need to convert the J9Class pointer to a class offset
30143014
#endif
@@ -3022,7 +3022,7 @@ static void VMarrayStoreCHKEvaluator(TR::Node *node, TR::Register *src, TR::Regi
30223022
TR::Compilation * comp = cg->comp();
30233023
TR_J9VMBase *fej9 = (TR_J9VMBase *) (cg->fe());
30243024

3025-
#ifdef J9VM_GC_COMPRESSED_POINTERS
3025+
#ifdef J9VM_INTERP_COMPRESSED_OBJECT_HEADER
30263026
// must read only 32 bits
30273027
generateTrg1MemInstruction(cg, TR::InstOpCode::lwz, node, t1Reg,
30283028
new (cg->trHeapMemory()) TR::MemoryReference(dst, (int32_t)TR::Compiler->om.offsetOfObjectVftField(), 4, cg));
@@ -3090,7 +3090,7 @@ static void VMarrayStoreCHKEvaluator(TR::Node *node, TR::Register *src, TR::Regi
30903090
generateConditionalBranchInstruction(cg, TR::InstOpCode::beq, node, toWB, cndReg);
30913091
}
30923092

3093-
#ifdef J9VM_GC_COMPRESSED_POINTERS
3093+
#ifdef J9VM_INTERP_COMPRESSED_OBJECT_HEADER
30943094
// For the following two instructions
30953095
// we may need to convert the class offset from t1Reg into J9Class
30963096
#endif
@@ -3868,7 +3868,7 @@ TR::Register *J9::Power::TreeEvaluator::VMcheckcastEvaluator2(TR::Node *node, TR
38683868
TR_ASSERT(!objectClassReg, "Object class already loaded");
38693869
objectClassReg = srm->findOrCreateScratchRegister();
38703870
generateTrg1MemInstruction(cg,
3871-
#ifdef J9VM_GC_COMPRESSED_POINTERS
3871+
#ifdef J9VM_INTERP_COMPRESSED_OBJECT_HEADER
38723872
TR::InstOpCode::lwz,
38733873
#else
38743874
TR::InstOpCode::Op_load,
@@ -4038,7 +4038,7 @@ TR::Register *J9::Power::TreeEvaluator::VMinstanceOfEvaluator2(TR::Node *node, T
40384038
TR_ASSERT(!objectClassReg, "Object class already loaded");
40394039
objectClassReg = srm->findOrCreateScratchRegister();
40404040
generateTrg1MemInstruction(cg,
4041-
#ifdef J9VM_GC_COMPRESSED_POINTERS
4041+
#ifdef J9VM_INTERP_COMPRESSED_OBJECT_HEADER
40424042
TR::InstOpCode::lwz,
40434043
#else
40444044
TR::InstOpCode::Op_load,
@@ -4314,7 +4314,7 @@ TR::Register *J9::Power::TreeEvaluator::VMcheckcastEvaluator(TR::Node *node, TR:
43144314
generateConditionalBranchInstruction(cg, TR::InstOpCode::beq, node, doneLabel, cndReg);
43154315
}
43164316

4317-
#ifdef J9VM_GC_COMPRESSED_POINTERS
4317+
#ifdef J9VM_INTERP_COMPRESSED_OBJECT_HEADER
43184318
// read only 32 bits
43194319
generateTrg1MemInstruction(cg, TR::InstOpCode::lwz, node, objClassReg,
43204320
new (cg->trHeapMemory()) TR::MemoryReference(objReg, (int32_t) TR::Compiler->om.offsetOfObjectVftField(), 4, cg));
@@ -4851,7 +4851,7 @@ TR::Register * J9::Power::TreeEvaluator::VMgenCoreInstanceofEvaluator(TR::Node *
48514851

48524852
if (testEqualClass || testCache || testCastClassIsSuper)
48534853
{
4854-
#ifdef J9VM_GC_COMPRESSED_POINTERS
4854+
#ifdef J9VM_INTERP_COMPRESSED_OBJECT_HEADER
48554855
// read only 32 bits
48564856
iCursor = generateTrg1MemInstruction(cg, TR::InstOpCode::lwz, node, objClassReg,
48574857
new (cg->trHeapMemory()) TR::MemoryReference(objectReg,
@@ -5316,7 +5316,7 @@ TR::Register *J9::Power::TreeEvaluator::VMmonexitEvaluator(TR::Node *node, TR::C
53165316
objectClassReg = cg->allocateRegister();
53175317
condReg = cg->allocateRegister(TR_CCR);
53185318

5319-
#ifdef J9VM_GC_COMPRESSED_POINTERS
5319+
#ifdef J9VM_INTERP_COMPRESSED_OBJECT_HEADER
53205320
// must read only 32 bits
53215321
generateTrg1MemInstruction(cg, TR::InstOpCode::lwz, node, objectClassReg,
53225322
new (cg->trHeapMemory()) TR::MemoryReference(objReg, (int32_t) TR::Compiler->om.offsetOfObjectVftField(), 4, cg));
@@ -6446,7 +6446,7 @@ static void genInitObjectHeader(TR::Node *node, TR::Instruction *&iCursor, TR_Op
64466446
iCursor = loadConstant(cg, node, (int32_t) clazz | (int32_t) orFlag, temp1Reg, iCursor);
64476447
#endif /* TR_TARGET_64BIT */
64486448
}
6449-
#ifdef J9VM_GC_COMPRESSED_POINTERS
6449+
#ifdef J9VM_INTERP_COMPRESSED_OBJECT_HEADER
64506450
// must store only 32 bits
64516451
iCursor = generateMemSrc1Instruction(cg, TR::InstOpCode::stw, node,
64526452
new (cg->trHeapMemory()) TR::MemoryReference(resReg, (int32_t)TR::Compiler->om.offsetOfObjectVftField(), 4, cg),
@@ -6462,7 +6462,7 @@ static void genInitObjectHeader(TR::Node *node, TR::Instruction *&iCursor, TR_Op
64626462
{
64636463
iCursor = generateTrg1Src1ImmInstruction(cg, TR::InstOpCode::ori, node, clzReg, clzReg, orFlag, iCursor);
64646464
}
6465-
#ifdef J9VM_GC_COMPRESSED_POINTERS
6465+
#ifdef J9VM_INTERP_COMPRESSED_OBJECT_HEADER
64666466
// must store only 32 bits
64676467
iCursor = generateMemSrc1Instruction(cg, TR::InstOpCode::stw, node,
64686468
new (cg->trHeapMemory()) TR::MemoryReference(resReg, (int32_t)TR::Compiler->om.offsetOfObjectVftField(), 4, cg),
@@ -7780,7 +7780,7 @@ static bool simpleReadMonitor(TR::Node *node, TR::CodeGenerator *cg, TR::Node *o
77807780
TR::InstOpCode::Mnemonic loadOpCode;
77817781
if (nextTopNode->getOpCodeValue() == TR::aloadi && TR::Compiler->target.is64Bit())
77827782
{
7783-
#ifdef J9VM_GC_COMPRESSED_POINTERS
7783+
#ifdef J9VM_INTERP_COMPRESSED_OBJECT_HEADER
77847784
if (nextTopNode->getSymbol()->isClassObject())
77857785
{
77867786
tempMR = new (cg->trHeapMemory()) TR::MemoryReference(nextTopNode, 4, cg);
@@ -7974,7 +7974,7 @@ TR::Register *J9::Power::TreeEvaluator::VMmonentEvaluator(TR::Node *node, TR::Co
79747974
objectClassReg = cg->allocateRegister();
79757975
condReg = cg->allocateRegister(TR_CCR);
79767976

7977-
#ifdef J9VM_GC_COMPRESSED_POINTERS
7977+
#ifdef J9VM_INTERP_COMPRESSED_OBJECT_HEADER
79787978
// must read only 32 bits
79797979
generateTrg1MemInstruction(cg, TR::InstOpCode::lwz, node, objectClassReg,
79807980
new (cg->trHeapMemory()) TR::MemoryReference(objReg, (int32_t) TR::Compiler->om.offsetOfObjectVftField(), 4, cg));
@@ -8330,7 +8330,7 @@ TR::Register *J9::Power::TreeEvaluator::VMarrayCheckEvaluator(TR::Node *node, TR
83308330
//
83318331
if (!node->isArrayChkPrimitiveArray1() && !node->isArrayChkReferenceArray1() && !node->isArrayChkPrimitiveArray2() && !node->isArrayChkReferenceArray2())
83328332
{
8333-
#ifdef J9VM_GC_COMPRESSED_POINTERS
8333+
#ifdef J9VM_INTERP_COMPRESSED_OBJECT_HEADER
83348334
generateTrg1MemInstruction(cg, TR::InstOpCode::lwz, node, tmp1Reg,
83358335
new (cg->trHeapMemory()) TR::MemoryReference(obj1Reg, (int32_t) TR::Compiler->om.offsetOfObjectVftField(), 4, cg));
83368336
#else
@@ -8353,7 +8353,7 @@ TR::Register *J9::Power::TreeEvaluator::VMarrayCheckEvaluator(TR::Node *node, TR
83538353

83548354
// One of the object is array. Test equality of two objects' classes.
83558355
//
8356-
#ifdef J9VM_GC_COMPRESSED_POINTERS
8356+
#ifdef J9VM_INTERP_COMPRESSED_OBJECT_HEADER
83578357
// must read only 32 bits
83588358
generateTrg1MemInstruction(cg, TR::InstOpCode::lwz, node, tmp2Reg,
83598359
new (cg->trHeapMemory()) TR::MemoryReference(obj2Reg, (int32_t) TR::Compiler->om.offsetOfObjectVftField(), 4, cg));
@@ -8393,7 +8393,7 @@ TR::Register *J9::Power::TreeEvaluator::VMarrayCheckEvaluator(TR::Node *node, TR
83938393
{
83948394

83958395
// Loading the Class Pointer -> classDepthandFlags
8396-
#ifdef J9VM_GC_COMPRESSED_POINTERS
8396+
#ifdef J9VM_INTERP_COMPRESSED_OBJECT_HEADER
83978397
generateTrg1MemInstruction(cg, TR::InstOpCode::lwz, node, tmp1Reg,
83988398
new (cg->trHeapMemory()) TR::MemoryReference(obj1Reg, (int32_t) TR::Compiler->om.offsetOfObjectVftField(), 4, cg));
83998399
#else
@@ -8425,7 +8425,7 @@ TR::Register *J9::Power::TreeEvaluator::VMarrayCheckEvaluator(TR::Node *node, TR
84258425
// Object2 must be of reference component type array, otherwise throw exception
84268426
if (!node->isArrayChkReferenceArray2())
84278427
{
8428-
#ifdef J9VM_GC_COMPRESSED_POINTERS
8428+
#ifdef J9VM_INTERP_COMPRESSED_OBJECT_HEADER
84298429
generateTrg1MemInstruction(cg, TR::InstOpCode::lwz, node, tmp1Reg,
84308430
new (cg->trHeapMemory()) TR::MemoryReference(obj2Reg, (int32_t) TR::Compiler->om.offsetOfObjectVftField(), 4, cg));
84318431
#else
@@ -9429,7 +9429,7 @@ static TR::Register *inlineAtomicOps(TR::Node *node, TR::CodeGenerator *cg, int8
94299429
scratchRegister = cg->allocateCollectedReferenceRegister();
94309430
TR::Register *memRefRegister = scratchRegister;
94319431

9432-
#ifdef J9VM_GC_COMPRESSED_POINTERS
9432+
#ifdef J9VM_INTERP_COMPRESSED_OBJECT_HEADER
94339433
// read only 32 bits
94349434
generateTrg1MemInstruction(cg, TR::InstOpCode::lwz, node, memRefRegister,
94359435
new (cg->trHeapMemory()) TR::MemoryReference(valueReg, arrayFieldOffset, 4, cg));
@@ -9950,7 +9950,7 @@ static TR::Register *inlineAtomicOperation(TR::Node *node, TR::CodeGenerator *cg
99509950
TR::MemoryReference *tempMR = new (cg->trHeapMemory()) TR::MemoryReference(valueReg, arrayFieldOffset, size, cg);
99519951
scratchReg = cg->allocateCollectedReferenceRegister();
99529952

9953-
#ifdef J9VM_GC_COMPRESSED_POINTERS
9953+
#ifdef J9VM_INTERP_COMPRESSED_OBJECT_HEADER
99549954
// read only 32 bits
99559955
generateTrg1MemInstruction(cg, TR::InstOpCode::lwz, node, scratchReg,
99569956
new (cg->trHeapMemory()) TR::MemoryReference(valueReg, arrayFieldOffset, 4, cg));

0 commit comments

Comments
 (0)