Skip to content

Commit bfccbb7

Browse files
author
Lukas Lorimer
committed
Move TR_*Instruction into TR namespace
This is part of moving all classes from using the TR_ prefix to the TR namespace. Typedefs are added since some downstream projects still use the old types. They will be removed in the near future. Signed-off-by: Lukas Lorimer <lukasl@ca.ibm.com>
1 parent f78035c commit bfccbb7

24 files changed

+858
-828
lines changed

‎compiler/arm/codegen/ARMBinaryEncoding.cpp

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ uint32_t encodeHelperBranch(bool isBranchAndLink, TR::SymbolReference *symRef, u
8888
return (isBranchAndLink ? 0x0B000000 : 0x0A000000) | encodeBranchDistance((uintptr_t) cursor, target) | (((uint32_t) cc) << 28);
8989
}
9090

91-
uint8_t *TR_ARMLabelInstruction::generateBinaryEncoding()
91+
uint8_t *TR::ARMLabelInstruction::generateBinaryEncoding()
9292
{
9393
uint8_t *instructionStart = cg()->getBinaryBufferCursor();
9494
TR::LabelSymbol *label = getLabelSymbol();
@@ -128,7 +128,7 @@ uint8_t *TR_ARMLabelInstruction::generateBinaryEncoding()
128128
return cursor;
129129
}
130130

131-
int32_t TR_ARMLabelInstruction::estimateBinaryLength(int32_t currentEstimate)
131+
int32_t TR::ARMLabelInstruction::estimateBinaryLength(int32_t currentEstimate)
132132
{
133133
if (getOpCode().isLabel()) // LABEL
134134
{
@@ -145,17 +145,17 @@ int32_t TR_ARMLabelInstruction::estimateBinaryLength(int32_t currentEstimate)
145145
// Conditional branches are just like label instructions but have their
146146
// CC set - for now, simply forward - TODO remove entirely.
147147

148-
uint8_t *TR_ARMConditionalBranchInstruction::generateBinaryEncoding()
148+
uint8_t *TR::ARMConditionalBranchInstruction::generateBinaryEncoding()
149149
{
150-
return TR_ARMLabelInstruction::generateBinaryEncoding();
150+
return TR::ARMLabelInstruction::generateBinaryEncoding();
151151
}
152152

153-
int32_t TR_ARMConditionalBranchInstruction::estimateBinaryLength(int32_t currentEstimate)
153+
int32_t TR::ARMConditionalBranchInstruction::estimateBinaryLength(int32_t currentEstimate)
154154
{
155-
return TR_ARMLabelInstruction::estimateBinaryLength(currentEstimate);
155+
return TR::ARMLabelInstruction::estimateBinaryLength(currentEstimate);
156156
}
157157

158-
uint8_t *TR_ARMAdminInstruction::generateBinaryEncoding()
158+
uint8_t *TR::ARMAdminInstruction::generateBinaryEncoding()
159159
{
160160
uint8_t *instructionStart = cg()->getBinaryBufferCursor();
161161
uint32_t i;
@@ -196,13 +196,13 @@ uint8_t *TR_ARMAdminInstruction::generateBinaryEncoding()
196196
return instructionStart;
197197
}
198198

199-
int32_t TR_ARMAdminInstruction::estimateBinaryLength(int32_t currentEstimate)
199+
int32_t TR::ARMAdminInstruction::estimateBinaryLength(int32_t currentEstimate)
200200
{
201201
setEstimatedBinaryLength(0);
202202
return currentEstimate;
203203
}
204204

205-
uint8_t *TR_ARMImmInstruction::generateBinaryEncoding()
205+
uint8_t *TR::ARMImmInstruction::generateBinaryEncoding()
206206
{
207207
TR::Compilation *comp = cg()->comp();
208208
uint8_t *instructionStart = cg()->getBinaryBufferCursor();
@@ -244,7 +244,7 @@ uint8_t *TR_ARMImmInstruction::generateBinaryEncoding()
244244
return cursor;
245245
}
246246

247-
uint8_t *TR_ARMImmSymInstruction::generateBinaryEncoding()
247+
uint8_t *TR::ARMImmSymInstruction::generateBinaryEncoding()
248248
{
249249
TR::Compilation *comp = TR::comp();
250250
uint8_t *instructionStart = cg()->getBinaryBufferCursor();
@@ -359,7 +359,7 @@ uint8_t *TR_ARMImmSymInstruction::generateBinaryEncoding()
359359
return cursor;
360360
}
361361

362-
int32_t TR_ARMImmSymInstruction::estimateBinaryLength(int32_t currentEstimate)
362+
int32_t TR::ARMImmSymInstruction::estimateBinaryLength(int32_t currentEstimate)
363363
{
364364
// *this swipeable for debugging purposes
365365
int32_t length;
@@ -375,7 +375,7 @@ int32_t TR_ARMImmSymInstruction::estimateBinaryLength(int32_t currentEstimate)
375375
return(currentEstimate + length);
376376
}
377377

378-
uint8_t *TR_ARMTrg1Instruction::generateBinaryEncoding()
378+
uint8_t *TR::ARMTrg1Instruction::generateBinaryEncoding()
379379
{
380380
uint8_t *instructionStart = cg()->getBinaryBufferCursor();
381381
uint8_t *cursor = instructionStart;
@@ -388,7 +388,7 @@ uint8_t *TR_ARMTrg1Instruction::generateBinaryEncoding()
388388
return cursor;
389389
}
390390

391-
uint8_t *TR_ARMTrg1Src2Instruction::generateBinaryEncoding()
391+
uint8_t *TR::ARMTrg1Src2Instruction::generateBinaryEncoding()
392392
{
393393
TR::Compilation *comp = cg()->comp();
394394
uint8_t *instructionStart = cg()->getBinaryBufferCursor();
@@ -416,7 +416,7 @@ uint8_t *TR_ARMTrg1Src2Instruction::generateBinaryEncoding()
416416
return cursor;
417417
}
418418

419-
uint8_t *TR_ARMLoadStartPCInstruction::generateBinaryEncoding()
419+
uint8_t *TR::ARMLoadStartPCInstruction::generateBinaryEncoding()
420420
{
421421
/* Calculates the offset from the current instruction to startPCAddr, then set it to the operand2 */
422422
uint8_t *startPCAddr = (uint8_t *)getSymbolReference()->getSymbol()->getStaticSymbol()->getStaticAddress();
@@ -434,7 +434,7 @@ uint8_t *TR_ARMLoadStartPCInstruction::generateBinaryEncoding()
434434
getNext()->remove();
435435
getNext()->remove();
436436

437-
return TR_ARMTrg1Src2Instruction::generateBinaryEncoding();
437+
return TR::ARMTrg1Src2Instruction::generateBinaryEncoding();
438438
}
439439
else
440440
{
@@ -447,14 +447,14 @@ uint8_t *TR_ARMLoadStartPCInstruction::generateBinaryEncoding()
447447
TR_ARMOperand2 *op2_1 = new (cg()->trHeapMemory()) TR_ARMOperand2((base >> 8) & 0x000000FF, 8 + bitTrailing);
448448
TR_ARMOperand2 *op2_0 = new (cg()->trHeapMemory()) TR_ARMOperand2(base & 0x000000FF, bitTrailing);
449449
setSource2Operand(op2_1);
450-
TR_ARMTrg1Src2Instruction *secondInstruction = (TR_ARMTrg1Src2Instruction *)getNext();
450+
TR::ARMTrg1Src2Instruction *secondInstruction = (TR::ARMTrg1Src2Instruction *)getNext();
451451
secondInstruction->setSource2Operand(op2_0);
452452

453453
/* Remove the trailing 2 Trg1Src2Instructions */
454454
secondInstruction->getNext()->remove();
455455
secondInstruction->getNext()->remove();
456456

457-
return TR_ARMTrg1Src2Instruction::generateBinaryEncoding();
457+
return TR::ARMTrg1Src2Instruction::generateBinaryEncoding();
458458
}
459459
else
460460
{
@@ -465,22 +465,22 @@ uint8_t *TR_ARMLoadStartPCInstruction::generateBinaryEncoding()
465465
TR_ARMOperand2 *op2_0 = new (cg()->trHeapMemory()) TR_ARMOperand2(localVal.getByte0(), 0);
466466

467467
setSource2Operand(op2_3);
468-
TR_ARMTrg1Src2Instruction *secondInstruction = (TR_ARMTrg1Src2Instruction *)getNext();
468+
TR::ARMTrg1Src2Instruction *secondInstruction = (TR::ARMTrg1Src2Instruction *)getNext();
469469
secondInstruction->setSource2Operand(op2_2);
470470

471-
TR_ARMTrg1Src2Instruction *thirdInstruction = (TR_ARMTrg1Src2Instruction *)secondInstruction->getNext();
471+
TR::ARMTrg1Src2Instruction *thirdInstruction = (TR::ARMTrg1Src2Instruction *)secondInstruction->getNext();
472472
thirdInstruction->setSource2Operand(op2_1);
473473

474-
TR_ARMTrg1Src2Instruction *fourthInstruction = (TR_ARMTrg1Src2Instruction *)thirdInstruction->getNext();
474+
TR::ARMTrg1Src2Instruction *fourthInstruction = (TR::ARMTrg1Src2Instruction *)thirdInstruction->getNext();
475475
fourthInstruction->setSource2Operand(op2_0);
476476

477-
return TR_ARMTrg1Src2Instruction::generateBinaryEncoding();
477+
return TR::ARMTrg1Src2Instruction::generateBinaryEncoding();
478478
}
479479
}
480480
}
481481

482482
#if defined(__VFP_FP__) && !defined(__SOFTFP__)
483-
uint8_t *TR_ARMTrg2Src1Instruction::generateBinaryEncoding()
483+
uint8_t *TR::ARMTrg2Src1Instruction::generateBinaryEncoding()
484484
{
485485
uint8_t *instructionStart = cg()->getBinaryBufferCursor();
486486
uint8_t *cursor = instructionStart;
@@ -496,7 +496,7 @@ uint8_t *TR_ARMTrg2Src1Instruction::generateBinaryEncoding()
496496
}
497497
#endif
498498

499-
uint8_t *TR_ARMMulInstruction::generateBinaryEncoding()
499+
uint8_t *TR::ARMMulInstruction::generateBinaryEncoding()
500500
{
501501
uint8_t *instructionStart = cg()->getBinaryBufferCursor();
502502
uint8_t *cursor = instructionStart;
@@ -511,7 +511,7 @@ uint8_t *TR_ARMMulInstruction::generateBinaryEncoding()
511511
return cursor;
512512
}
513513

514-
uint8_t *TR_ARMMemInstruction::generateBinaryEncoding()
514+
uint8_t *TR::ARMMemInstruction::generateBinaryEncoding()
515515
{
516516
uint8_t *instructionStart = cg()->getBinaryBufferCursor();
517517
uint8_t *cursor = instructionStart;
@@ -525,13 +525,13 @@ uint8_t *TR_ARMMemInstruction::generateBinaryEncoding()
525525
return cursor;
526526
}
527527

528-
int32_t TR_ARMMemInstruction::estimateBinaryLength(int32_t currentEstimate)
528+
int32_t TR::ARMMemInstruction::estimateBinaryLength(int32_t currentEstimate)
529529
{
530530
setEstimatedBinaryLength(getMemoryReference()->estimateBinaryLength(getOpCodeValue()));
531531
return(currentEstimate + getEstimatedBinaryLength());
532532
}
533533

534-
uint8_t *TR_ARMTrg1MemSrc1Instruction::generateBinaryEncoding()
534+
uint8_t *TR::ARMTrg1MemSrc1Instruction::generateBinaryEncoding()
535535
{
536536
uint8_t *instructionStart = cg()->getBinaryBufferCursor();
537537
uint8_t *cursor = instructionStart;
@@ -546,7 +546,7 @@ uint8_t *TR_ARMTrg1MemSrc1Instruction::generateBinaryEncoding()
546546
return cursor;
547547
}
548548

549-
uint8_t *TR_ARMControlFlowInstruction::generateBinaryEncoding()
549+
uint8_t *TR::ARMControlFlowInstruction::generateBinaryEncoding()
550550
{
551551
uint8_t *instructionStart = cg()->getBinaryBufferCursor();
552552
uint8_t *cursor = instructionStart;
@@ -556,7 +556,7 @@ uint8_t *TR_ARMControlFlowInstruction::generateBinaryEncoding()
556556
return cursor;
557557
}
558558

559-
int32_t TR_ARMControlFlowInstruction::estimateBinaryLength(int32_t currentEstimate)
559+
int32_t TR::ARMControlFlowInstruction::estimateBinaryLength(int32_t currentEstimate)
560560
{
561561
switch(getOpCodeValue())
562562
{
@@ -581,7 +581,7 @@ int32_t TR_ARMControlFlowInstruction::estimateBinaryLength(int32_t currentEstima
581581
return currentEstimate + getEstimatedBinaryLength();
582582
}
583583

584-
uint8_t *TR_ARMMultipleMoveInstruction::generateBinaryEncoding()
584+
uint8_t *TR::ARMMultipleMoveInstruction::generateBinaryEncoding()
585585
{
586586
uint8_t *instructionStart = cg()->getBinaryBufferCursor();
587587
uint8_t *cursor = instructionStart;
@@ -602,7 +602,7 @@ uint8_t *TR_ARMMultipleMoveInstruction::generateBinaryEncoding()
602602
}
603603

604604
#ifdef J9_PROJECT_SPECIFIC
605-
uint8_t *TR_ARMVirtualGuardNOPInstruction::generateBinaryEncoding()
605+
uint8_t *TR::ARMVirtualGuardNOPInstruction::generateBinaryEncoding()
606606
{
607607
uint8_t *cursor = cg()->getBinaryBufferCursor();
608608
TR::LabelSymbol *label = getLabelSymbol();
@@ -645,7 +645,7 @@ uint8_t *TR_ARMVirtualGuardNOPInstruction::generateBinaryEncoding()
645645
return cursor+length;
646646
}
647647

648-
int32_t TR_ARMVirtualGuardNOPInstruction::estimateBinaryLength(int32_t currentEstimate)
648+
int32_t TR::ARMVirtualGuardNOPInstruction::estimateBinaryLength(int32_t currentEstimate)
649649
{
650650
// This is a conservative estimation for reserving NOP space.
651651
setEstimatedBinaryLength(ARM_INSTRUCTION_LENGTH);

0 commit comments

Comments
 (0)