Skip to content

Commit 1c95046

Browse files
hzongarohzongaro
authored
Merge pull request eclipse-openj9#20499 from a7ehuo/techdebt-cleanup-opcode-comments
Clean up references to old opcodes
2 parents c03a349 + 98919ca commit 1c95046

14 files changed

+71
-71
lines changed

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -7397,7 +7397,7 @@ J9::ARM64::TreeEvaluator::evaluateNULLCHKWithPossibleResolve(TR::Node *node, boo
73977397
{
73987398
needExplicitCheck = false;
73997399

7400-
// If the child is an arraylength which has been reduced to an iiload,
7400+
// If the child is an arraylength which has been reduced to an iloadi,
74017401
// and is only going to be used immediately in a BNDCHK, combine the checks.
74027402
//
74037403
TR::TreeTop *nextTreeTop = cg->getCurrentEvaluationTreeTop()->getNextTreeTop();
@@ -7808,7 +7808,7 @@ J9::ARM64::TreeEvaluator::BNDCHKwithSpineCHKEvaluator(TR::Node *node, TR::CodeGe
78087808
TR_ASSERT(
78097809
arrayLengthChild->getOpCode().isConversion() || arrayLengthChild->getOpCodeValue() == TR::iloadi || arrayLengthChild->getOpCodeValue() == TR::iload
78107810
|| arrayLengthChild->getOpCodeValue() == TR::iRegLoad || arrayLengthChild->getOpCode().isLoadConst(),
7811-
"Expecting array length child under BNDCHKwithSpineCHK to be a conversion, iiload, iload, iRegLoad or iconst");
7811+
"Expecting array length child under BNDCHKwithSpineCHK to be a conversion, iloadi, iload, iRegLoad or iconst");
78127812

78137813
arrayLengthReg = arrayLengthChild->getRegister();
78147814

‎runtime/compiler/codegen/J9CodeGenerator.cpp

+9-9
Original file line numberDiff line numberDiff line change
@@ -257,23 +257,23 @@ J9::CodeGenerator::lowerCompressedRefs(
257257
and compression:
258258
compress = actual - heap_base
259259
260-
iaload f l2a
260+
aloadi f l2a
261261
aload O ladd
262262
lshl
263263
i2l
264-
iiload f
264+
iloadi f
265265
aload O
266266
iconst shftKonst
267267
lconst HB
268268
269269
-or- if the field is known to be null
270270
l2a
271271
i2l
272-
iiload f
272+
iloadi f
273273
aload O
274274
275275
276-
iastore f iistore f
276+
astorei f istorei f
277277
aload O aload O
278278
value l2i
279279
lshr
@@ -284,7 +284,7 @@ J9::CodeGenerator::lowerCompressedRefs(
284284
iconst shftKonst
285285
286286
-or- if the field is known to be null
287-
iistore f
287+
istorei f
288288
aload O
289289
l2i
290290
a2l <- nop on most platforms
@@ -297,16 +297,16 @@ J9::CodeGenerator::lowerCompressedRefs(
297297
compress = actual - heapBase + shadowBase = actual + disp
298298
actual = compress - disp
299299
300-
iaload f i2a
300+
aloadi f i2a
301301
aload O isub
302-
iiload f
302+
iloadi f
303303
aload O
304304
iconst HB
305305
306-
iastore f iistore f
306+
astorei f istorei f
307307
aload O aload O
308308
iushr // iushr only there to distinguish between
309-
iadd // real iistores with iadds as the value
309+
iadd // real istoreis with iadds as the value
310310
a2i
311311
value
312312
iconst HB

‎runtime/compiler/env/VMJ9.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -7537,10 +7537,10 @@ TR_J9VM::transformJavaLangClassIsArrayOrIsPrimitive(TR::Compilation * comp, TR::
75377537
// i2b <= callNode
75387538
// ishr <= shiftNode
75397539
// iand <= andNode
7540-
// iiload <= isArrayField
7541-
// iaload
7540+
// iloadi <= isArrayField
7541+
// aloadi
75427542
// if (generateClassesOnHeap())
7543-
// iaload
7543+
// aloadi
75447544
// endif
75457545
// aload <parm 1> <= vftField
75467546
// iconst <andMask> <= andConstNode

‎runtime/compiler/optimizer/IdiomRecognition.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -2789,7 +2789,7 @@ TR_CISCTransformer::renumberDagId(TR_CISCGraph *graph, int32_t tempMaxDagId, int
27892789
// 2L isub [] [40 41]
27902790
// 2L aiadd [] [39 42]
27912791
// 0L bconst 1 [] []
2792-
// 2L ibstore [] [43 44]
2792+
// 2L bstorei [] [43 44]
27932793
// 2L iadd [] [40 22]
27942794
// 2L istore [] [46 4]
27952795
// 2L ificmpge [] [4 6]

‎runtime/compiler/optimizer/IdiomRecognition.hpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -66,15 +66,15 @@ typedef enum
6666
TR_ahconst, // constant for array header
6767
TR_variableORconst,
6868
TR_quasiConst, // Currently, variable or constant or arraylength
69-
TR_quasiConst2, // Currently, variable or constant, arraylength, or *iiload* (for non-array)
70-
// We shouldn't use it in an idiom including iistore to *non-array* variable.
69+
TR_quasiConst2, // Currently, variable or constant, arraylength, or *iloadi* (for non-array)
70+
// We shouldn't use it in an idiom including istorei to *non-array* variable.
7171
TR_iaddORisub, // addition or subtraction
7272
TR_conversion, // all data conversions, such as b2i, c2i, i2l, ...
7373
TR_ifcmpall, // all if instructions
7474
TR_ishrall, // ishr and iushr
7575
TR_bitop1, // AND, OR, and XOR
7676
TR_arrayindex, // variable or addition
77-
TR_arraybase, // variable or iaload
77+
TR_arraybase, // variable or aloadi
7878
TR_inbload, // indirect non-byte load
7979
TR_inbstore, // indirect non-byte store
8080
TR_indload, // indirect load

‎runtime/compiler/optimizer/IdiomTransformations.cpp

+9-9
Original file line numberDiff line numberDiff line change
@@ -747,7 +747,7 @@ IANDSpecialNodeTransformer(TR_CISCTransformer *trans)
747747
static void
748748
findIndexLoad(TR::Node *aiaddNode, TR::Node *&index1, TR::Node *&index2, TR::Node *&topLevelIndex)
749749
{
750-
// iiload
750+
// iloadi
751751
// aiadd <-- aiaddNode
752752
// aload
753753
// isub
@@ -757,15 +757,15 @@ findIndexLoad(TR::Node *aiaddNode, TR::Node *&index1, TR::Node *&index2, TR::Nod
757757
// iconst -16
758758
//
759759
// -or-
760-
// iiload
760+
// iloadi
761761
// aiadd
762762
// aload
763763
// isub
764764
// iload
765765
// iconst
766766
//
767767
// -or-
768-
// iiload
768+
// iloadi
769769
// aiadd <-- aiaddNode
770770
// aload
771771
// isub
@@ -777,7 +777,7 @@ findIndexLoad(TR::Node *aiaddNode, TR::Node *&index1, TR::Node *&index2, TR::Nod
777777
// iconst -16
778778
//
779779
// -or-
780-
// iiload
780+
// iloadi
781781
// aiadd
782782
// aload
783783
// isub
@@ -1348,15 +1348,15 @@ checkByteToChar(TR::Compilation *comp, TR::Node *iorNode, TR::Node *&inputNode,
13481348
// ior
13491349
// imul
13501350
// bu2i
1351-
// ibload #261 Shadow[<array-shadow>]
1351+
// bloadi #261 Shadow[<array-shadow>]
13521352
// aiadd <flags:"0x8000" (internalPtr )/>
13531353
// aload #523 Auto[<temp slot 10>]
13541354
// isub
13551355
// ==>iload i
13561356
// iconst -17
13571357
// iconst 256
13581358
// bu2i
1359-
// ibload #261 Shadow[<array-shadow>]
1359+
// bloadi #261 Shadow[<array-shadow>]
13601360
// aiadd <flags:"0x8000" (internalPtr )/>
13611361
// ==>aload at #523
13621362
// isub
@@ -1384,10 +1384,10 @@ checkByteToChar(TR::Compilation *comp, TR::Node *iorNode, TR::Node *&inputNode,
13841384
{
13851385
// find the index to be either i, i+1
13861386
// if (le)
1387-
// if index is i+1 then inputNode = other ibload of the ior
1387+
// if index is i+1 then inputNode = other bloadi of the ior
13881388
// else fail
13891389
// if (be)
1390-
// if index is i then inputNode = ibload child of imul
1390+
// if index is i then inputNode = bloadi child of imul
13911391
// else fail
13921392
//
13931393
TR::Node *ibloadNode = imulNode->getFirstChild()->skipConversions();
@@ -5825,7 +5825,7 @@ namespace
58255825
// ImportantNode(1) - array store
58265826
// ImportantNode(2) - the size of elements (NULL for the byte array)
58275827
// ImportantNode(3) - exit if node
5828-
// ImportantNode(4) - optional iistore
5828+
// ImportantNode(4) - optional istorei
58295829
//*****************************************************************************************
58305830
static bool
58315831
CISCTransform2ArrayCopySub(TR_CISCTransformer *trans, TR::Node *indexRepNode, TR::Node *dstIndexRepNode,

‎runtime/compiler/optimizer/InlinerTempForJ9.cpp

+6-6
Original file line numberDiff line numberDiff line change
@@ -1369,19 +1369,19 @@ The functions used to construct the trees for all the cases outlined above are a
13691369
Note that in case (2), i.e., when the conversion is needed, we generate code like the
13701370
following for the "direct access with conversion" for Unsafe.getByte
13711371
b2i
1372-
ibload
1372+
bloadi
13731373
aiadd
13741374
while the direct access code looks like
1375-
iiload
1375+
iloadi
13761376
aiadd
1377-
We will replace b2i and ibload by c2iu and icload for Unsafe.getChar, by
1378-
s2i and isload for Unsafe.getShort, and by bu2i and ibload for Unsafe.getBoolean
1377+
We will replace b2i and bloadi by c2iu and icload for Unsafe.getChar, by
1378+
s2i and isload for Unsafe.getShort, and by bu2i and bloadi for Unsafe.getBoolean
13791379

13801380
For Unsafe.putByte and Unsafe.putBoolean, we generate
1381-
ibstore
1381+
bstorei
13821382
i2b
13831383
<some load node>
1384-
We replace i2b and ibstore by i2c and icstore for Unsafe.getChar, and by i2s and isstore for
1384+
We replace i2b and bstorei by i2c and icstore for Unsafe.getChar, and by i2s and isstore for
13851385
Unsafe.getShort.
13861386
*/
13871387

‎runtime/compiler/optimizer/J9Simplifier.cpp

+9-9
Original file line numberDiff line numberDiff line change
@@ -748,7 +748,7 @@ J9::Simplifier::simplifyiOrPatterns(TR::Node *node)
748748
// ior
749749
// imul
750750
// bu2i
751-
// ibload #245[0x107AF564] Shadow[<Unsafe shadow sym>]
751+
// bloadi #245[0x107AF564] Shadow[<Unsafe shadow sym>]
752752
// isub
753753
// l2i
754754
// lload #202[0x107A1050] Parm[<parm 1 J>]
@@ -757,20 +757,20 @@ J9::Simplifier::simplifyiOrPatterns(TR::Node *node)
757757
// ior
758758
// imul
759759
// bu2i
760-
// ibload #245[0x107AF564] Shadow[<Unsafe shadow sym>]
760+
// bloadi #245[0x107AF564] Shadow[<Unsafe shadow sym>]
761761
// isub
762762
// ==>l2i at [0x107AE8F4]
763763
// iconst -3
764764
// iconst 16777216
765765
// imul
766766
// bu2i
767-
// ibload #245[0x107AF564] Shadow[<Unsafe shadow sym>]
767+
// bloadi #245[0x107AF564] Shadow[<Unsafe shadow sym>]
768768
// isub
769769
// ==>l2i at [0x107AE8F4]
770770
// iconst -2
771771
// iconst 65536
772772
// bu2i
773-
// ibload #245[0x107AF564] Shadow[<Unsafe shadow sym>]
773+
// bloadi #245[0x107AF564] Shadow[<Unsafe shadow sym>]
774774
// ==>l2i at [0x107AE8F4]
775775
//
776776

@@ -792,7 +792,7 @@ J9::Simplifier::simplifyiOrPatterns(TR::Node *node)
792792
if ((addr = getUnsafeBaseAddr(byte2, -1)) && addr == byte1 &&
793793
(addr = getUnsafeBaseAddr(byte3, -2)) && addr == byte1 &&
794794
(addr = getUnsafeBaseAddr(byte4, -3)) && addr == byte1 &&
795-
performTransformation(comp(), "%sconvert ior to iiload node [" POINTER_PRINTF_FORMAT "]\n", optDetailString(), node))
795+
performTransformation(comp(), "%sconvert ior to iloadi node [" POINTER_PRINTF_FORMAT "]\n", optDetailString(), node))
796796
{
797797
TR::Node::recreate(node, TR::iloadi);
798798
node->setNumChildren(1);
@@ -986,11 +986,11 @@ J9::Simplifier::getOrOfTwoConsecutiveBytes(TR::Node * ior)
986986
// ior
987987
// imul
988988
// b2i
989-
// ibload #231[0x10D06670] Shadow[unknown field]
989+
// bloadi #231[0x10D06670] Shadow[unknown field]
990990
// address
991991
// iconst 256
992992
// bu2i
993-
// ibload #231[0x10D06670] Shadow[unknown field]
993+
// bloadi #231[0x10D06670] Shadow[unknown field]
994994
// isub
995995
// ==>address
996996
// iconst -1
@@ -999,13 +999,13 @@ J9::Simplifier::getOrOfTwoConsecutiveBytes(TR::Node * ior)
999999
// ior
10001000
// imul
10011001
// b2i
1002-
// ibload #231[0x10D06670] Shadow[unknown field]
1002+
// bloadi #231[0x10D06670] Shadow[unknown field]
10031003
// isub
10041004
// address
10051005
// iconst -1
10061006
// iconst 256
10071007
// bu2i
1008-
// ibload #231[0x10D06670] Shadow[unknown field]
1008+
// bloadi #231[0x10D06670] Shadow[unknown field]
10091009
// ==>address
10101010
//
10111011
TR::Node *byte1, *byte2, *temp, *addr;

‎runtime/compiler/optimizer/SequentialStoreSimplifier.cpp

+6-6
Original file line numberDiff line numberDiff line change
@@ -1866,7 +1866,7 @@ TR::Node* TR_arraycopySequentialStores::constValNode()
18661866
// Transform a set of sequential stores into increasing storage from an integral type into
18671867
// an arraycopy call
18681868
// Order varies depending if on Big Endian or Little Endian target hardware
1869-
// ibstore <array element>
1869+
// bstorei <array element>
18701870
// aiadd
18711871
// aload <arr>
18721872
// isub
@@ -1939,7 +1939,7 @@ static TR::TreeTop* generateArraycopyFromSequentialStores(TR::Compilation* comp,
19391939
symRef->setOffset(arraycopy.getTreeTop()->getNode()->getSymbolReference()->getOffset());
19401940

19411941
//
1942-
// delete the ibstore trees and replace them with a new, improved iXstore tree
1942+
// delete the bstorei trees and replace them with a new, improved iXstore tree
19431943
//
19441944
arraycopy.removeTrees(symRef);
19451945

@@ -3229,7 +3229,7 @@ static TR::TreeTop* generateArraysetFromSequentialStores(TR::Compilation* comp,
32293229
//traceMsg(comp, " First store in sequence %p Load Ref:%p Number of bytes: %d. Offset range:%d to %d. Byte Value:%d\n", istoreNode, arrayset.getALoadRef(), numBytes, arrayset.getBaseOffset(), arrayset.getBaseOffset() + numBytes - 1, arrayset.getConstant());
32303230

32313231
//
3232-
// break the iistore trees into tree_tops of the aload and const
3232+
// break the istorei trees into tree_tops of the aload and const
32333233
// so that it can be subsequently deleted by simplifier phase
32343234
//
32353235
TR_arraysetSequentialStores arraysetUpdate = TR_arraysetSequentialStores(comp);
@@ -3324,15 +3324,15 @@ static TR::TreeTop* generateArraysetFromSequentialStores(TR::Compilation* comp,
33243324
TR::Node *topNode = TR::Node::create(TR::treetop, 1, arraysetNode);
33253325
arraysetTreeTop = TR::TreeTop::create(comp, topNode);
33263326

3327-
// delete all the old iistore trees by eliminating them from the tree list
3327+
// delete all the old istorei trees by eliminating them from the tree list
33283328
prevTreeTop->join(arraysetTreeTop);
33293329
arraysetTreeTop->join(curTreeTop);
33303330
}
33313331
else
33323332
{
33333333
TR_ASSERT((numBytes <= 8), "Number of bytes is more than expected\n");
33343334
//
3335-
// delete the ibstore trees and replace them with a new, improved iXstore tree
3335+
// delete the bstorei trees and replace them with a new, improved iXstore tree
33363336
//
33373337
//dumpOptDetails(comp, " Remove trees %p to %p\n", istoreTreeTop->getNode(), curTreeTop->getNode());
33383338
//TR::TreeTop::removeDeadTrees(comp, istoreTreeTop, curTreeTop);
@@ -4108,7 +4108,7 @@ TR_SequentialStoreSimplifier::optDetailString() const throw()
41084108
/*
41094109
* Seen in atmstac0.cbl after removing the reassociation opts from Simplifier:
41104110
*
4111-
* [0x2A0A5874] ibstore #182[id=42:"WS-ATM-ACCT-ENTRY-USED-F"][0x29201614] Shadow[<refined-array-shadow>] <intPrec=2>
4111+
* [0x2A0A5874] bstorei #182[id=42:"WS-ATM-ACCT-ENTRY-USED-F"][0x29201614] Shadow[<refined-array-shadow>] <intPrec=2>
41124112
* ==>aiadd at [0x2A0A561C]
41134113
* [0x2A0A58B4] buconst -16 <intPrec=2> <flags:"0x204" (X!=0 X<=0 )/>
41144114
* [0x2A0A5A94] astore #201[id=305:"Subscr-AddrTemp"][0x2A08552C] Auto[<auto slot 84>]

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

+6-6
Original file line numberDiff line numberDiff line change
@@ -2603,7 +2603,7 @@ TR::Register *J9::Power::TreeEvaluator::BNDCHKwithSpineCHKEvaluator(TR::Node *no
26032603
TR_ASSERT(
26042604
arrayLengthChild->getOpCode().isConversion() || arrayLengthChild->getOpCodeValue() == TR::iloadi || arrayLengthChild->getOpCodeValue() == TR::iload
26052605
|| arrayLengthChild->getOpCodeValue() == TR::iRegLoad || arrayLengthChild->getOpCode().isLoadConst(),
2606-
"Expecting array length child under BNDCHKwithSpineCHK to be a conversion, iiload, iload, iRegLoad or iconst");
2606+
"Expecting array length child under BNDCHKwithSpineCHK to be a conversion, iloadi, iload, iRegLoad or iconst");
26072607

26082608
TR::Register *condReg = srm->findOrCreateScratchRegister(TR_CCR);
26092609

@@ -6963,7 +6963,7 @@ static bool simpleReadMonitor(TR::Node *node, TR::CodeGenerator *cg, TR::Node *o
69636963
// look for the special case of a read monitor sequence that protects
69646964
// a single fixed-point load, ie:
69656965
// monenter (object)
6966-
// a simple form of iaload or iiload
6966+
// a simple form of aloadi or iloadi
69676967
// monexit (object)
69686968

69696969
// note: before we make the following checks it is important that the
@@ -7026,8 +7026,8 @@ static bool simpleReadMonitor(TR::Node *node, TR::CodeGenerator *cg, TR::Node *o
70267026
return false;
70277027
}
70287028
// possible TODO: expand the complexity of loads we can handle
7029-
// iaload and iiload are indirect and have a child
7030-
// if we don't need to evaluate that child then the iaload or iiload
7029+
// aloadi and iloadi are indirect and have a child
7030+
// if we don't need to evaluate that child then the aloadi or iloadi
70317031
// consists of a single hardware instruction and satisfies our current
70327032
// constraint of simple
70337033
if (!nextTopNode->getFirstChild()->getRegister())
@@ -7152,7 +7152,7 @@ static bool simpleReadMonitor(TR::Node *node, TR::CodeGenerator *cg, TR::Node *o
71527152
TR::addDependency(conditions, offsetReg, TR::RealRegister::NoReg, TR_GPR, cg);
71537153
TR::addDependency(conditions, cndReg, TR::RealRegister::cr0, TR_CCR, cg);
71547154

7155-
// the following code is derived from the iaload and iiload evaluators
7155+
// the following code is derived from the aloadi and iloadi evaluators
71567156
TR::Register *loadResultReg;
71577157
OMR::Power::NodeMemoryReference tempMR;
71587158
if (nextTopNode->getOpCodeValue() == TR::aloadi)
@@ -7184,7 +7184,7 @@ static bool simpleReadMonitor(TR::Node *node, TR::CodeGenerator *cg, TR::Node *o
71847184
tempMR = TR::LoadStoreHandler::generateSimpleLoadMemoryReference(cg, nextTopNode, 4);
71857185
loadOpCode = TR::InstOpCode::lwz;
71867186
}
7187-
// end of code derived from the iaload and iiload evaluators
7187+
// end of code derived from the aloadi and iloadi evaluators
71887188

71897189
TR::addDependency(conditions, loadResultReg, TR::RealRegister::NoReg, TR_GPR, cg);
71907190
if (tempMR.getMemoryReference()->getBaseRegister() != objReg)

0 commit comments

Comments
 (0)