Skip to content

Commit 23e3b3f

Browse files
committed
8351156: C1: Remove FPU stack support after 32-bit x86 removal
Reviewed-by: vlivanov, kvn
1 parent 2592513 commit 23e3b3f

39 files changed

+47
-2555
lines changed

src/hotspot/cpu/aarch64/c1_FpuStackSim_aarch64.cpp

Lines changed: 0 additions & 30 deletions
This file was deleted.

src/hotspot/cpu/aarch64/c1_FpuStackSim_aarch64.hpp

Lines changed: 0 additions & 32 deletions
This file was deleted.

src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.cpp

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -584,14 +584,14 @@ void LIR_Assembler::const2stack(LIR_Opr src, LIR_Opr dest) {
584584
__ str(zr, frame_map()->address_for_slot(dest->single_stack_ix()));
585585
else {
586586
const2reg(src, FrameMap::rscratch1_opr, lir_patch_none, nullptr);
587-
reg2stack(FrameMap::rscratch1_opr, dest, c->type(), false);
587+
reg2stack(FrameMap::rscratch1_opr, dest, c->type());
588588
}
589589
}
590590
break;
591591
case T_ADDRESS:
592592
{
593593
const2reg(src, FrameMap::rscratch1_opr, lir_patch_none, nullptr);
594-
reg2stack(FrameMap::rscratch1_opr, dest, c->type(), false);
594+
reg2stack(FrameMap::rscratch1_opr, dest, c->type());
595595
}
596596
case T_INT:
597597
case T_FLOAT:
@@ -716,7 +716,7 @@ void LIR_Assembler::reg2reg(LIR_Opr src, LIR_Opr dest) {
716716
}
717717
}
718718

719-
void LIR_Assembler::reg2stack(LIR_Opr src, LIR_Opr dest, BasicType type, bool pop_fpu_stack) {
719+
void LIR_Assembler::reg2stack(LIR_Opr src, LIR_Opr dest, BasicType type) {
720720
precond(src->is_register() && dest->is_stack());
721721

722722
uint const c_sz32 = sizeof(uint32_t);
@@ -752,7 +752,7 @@ void LIR_Assembler::reg2stack(LIR_Opr src, LIR_Opr dest, BasicType type, bool po
752752
}
753753

754754

755-
void LIR_Assembler::reg2mem(LIR_Opr src, LIR_Opr dest, BasicType type, LIR_PatchCode patch_code, CodeEmitInfo* info, bool pop_fpu_stack, bool wide) {
755+
void LIR_Assembler::reg2mem(LIR_Opr src, LIR_Opr dest, BasicType type, LIR_PatchCode patch_code, CodeEmitInfo* info, bool wide) {
756756
LIR_Address* to_addr = dest->as_address_ptr();
757757
PatchingStub* patch = nullptr;
758758
Register compressed_src = rscratch1;
@@ -905,7 +905,7 @@ void LIR_Assembler::stack2stack(LIR_Opr src, LIR_Opr dest, BasicType type) {
905905
temp = FrameMap::rscratch1_opr;
906906

907907
stack2reg(src, temp, src->type());
908-
reg2stack(temp, dest, dest->type(), false);
908+
reg2stack(temp, dest, dest->type());
909909
}
910910

911911

@@ -1598,7 +1598,7 @@ void LIR_Assembler::cmove(LIR_Condition condition, LIR_Opr opr1, LIR_Opr opr2, L
15981598
__ csel(result->as_register(), opr1->as_register(), opr2->as_register(), acond);
15991599
}
16001600

1601-
void LIR_Assembler::arith_op(LIR_Code code, LIR_Opr left, LIR_Opr right, LIR_Opr dest, CodeEmitInfo* info, bool pop_fpu_stack) {
1601+
void LIR_Assembler::arith_op(LIR_Code code, LIR_Opr left, LIR_Opr right, LIR_Opr dest, CodeEmitInfo* info) {
16021602
assert(info == nullptr, "should never be used, idiv/irem and ldiv/lrem not handled by this method");
16031603

16041604
if (left->is_single_cpu()) {
@@ -1769,9 +1769,6 @@ void LIR_Assembler::arith_op(LIR_Code code, LIR_Opr left, LIR_Opr right, LIR_Opr
17691769
}
17701770
}
17711771

1772-
void LIR_Assembler::arith_fpu_implementation(LIR_Code code, int left_index, int right_index, int dest_index, bool pop_fpu_stack) { Unimplemented(); }
1773-
1774-
17751772
void LIR_Assembler::intrinsic_op(LIR_Code code, LIR_Opr value, LIR_Opr tmp, LIR_Opr dest, LIR_Op* op) {
17761773
switch(code) {
17771774
case lir_abs : __ fabsd(dest->as_double_reg(), value->as_double_reg()); break;
@@ -2849,8 +2846,7 @@ void LIR_Assembler::rt_call(LIR_Opr result, address dest, const LIR_OprList* arg
28492846

28502847
void LIR_Assembler::volatile_move_op(LIR_Opr src, LIR_Opr dest, BasicType type, CodeEmitInfo* info) {
28512848
if (dest->is_address() || src->is_address()) {
2852-
move_op(src, dest, type, lir_patch_none, info,
2853-
/*pop_fpu_stack*/false, /*wide*/false);
2849+
move_op(src, dest, type, lir_patch_none, info, /*wide*/false);
28542850
} else {
28552851
ShouldNotReachHere();
28562852
}

src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.hpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,6 @@ friend class ArrayCopyStub;
3333

3434
int array_element_size(BasicType type) const;
3535

36-
void arith_fpu_implementation(LIR_Code code, int left_index, int right_index, int dest_index, bool pop_fpu_stack);
37-
3836
// helper functions which checks for overflow and sets bailout if it
3937
// occurs. Always returns a valid embeddable pointer but in the
4038
// bailout case the pointer won't be to unique storage.

src/hotspot/cpu/aarch64/c1_LinearScan_aarch64.cpp

Lines changed: 0 additions & 31 deletions
This file was deleted.

src/hotspot/cpu/arm/c1_FpuStackSim_arm.cpp

Lines changed: 0 additions & 25 deletions
This file was deleted.

src/hotspot/cpu/arm/c1_FpuStackSim_arm.hpp

Lines changed: 0 additions & 30 deletions
This file was deleted.

src/hotspot/cpu/arm/c1_LIRAssembler_arm.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -454,7 +454,7 @@ void LIR_Assembler::reg2reg(LIR_Opr src, LIR_Opr dest) {
454454
}
455455
}
456456

457-
void LIR_Assembler::reg2stack(LIR_Opr src, LIR_Opr dest, BasicType type, bool pop_fpu_stack) {
457+
void LIR_Assembler::reg2stack(LIR_Opr src, LIR_Opr dest, BasicType type) {
458458
assert(src->is_register(), "should not call otherwise");
459459
assert(dest->is_stack(), "should not call otherwise");
460460

@@ -493,7 +493,7 @@ void LIR_Assembler::reg2stack(LIR_Opr src, LIR_Opr dest, BasicType type, bool po
493493

494494
void LIR_Assembler::reg2mem(LIR_Opr src, LIR_Opr dest, BasicType type,
495495
LIR_PatchCode patch_code, CodeEmitInfo* info,
496-
bool pop_fpu_stack, bool wide) {
496+
bool wide) {
497497
LIR_Address* to_addr = dest->as_address_ptr();
498498
Register base_reg = to_addr->base()->as_pointer_register();
499499
const bool needs_patching = (patch_code != lir_patch_none);
@@ -1512,7 +1512,7 @@ static int reg_size(LIR_Opr op) {
15121512
}
15131513
#endif
15141514

1515-
void LIR_Assembler::arith_op(LIR_Code code, LIR_Opr left, LIR_Opr right, LIR_Opr dest, CodeEmitInfo* info, bool pop_fpu_stack) {
1515+
void LIR_Assembler::arith_op(LIR_Code code, LIR_Opr left, LIR_Opr right, LIR_Opr dest, CodeEmitInfo* info) {
15161516
assert(info == nullptr, "unused on this code path");
15171517
assert(dest->is_register(), "wrong items state");
15181518

src/hotspot/cpu/arm/c1_LinearScan_arm.cpp

Lines changed: 0 additions & 31 deletions
This file was deleted.

src/hotspot/cpu/ppc/c1_FpuStackSim_ppc.hpp

Lines changed: 0 additions & 32 deletions
This file was deleted.

0 commit comments

Comments
 (0)