Skip to content

Commit 700447f

Browse files
committed
8255909: Remove unused delayed_value methods
Reviewed-by: minqi, coleenp, thartmann
1 parent 397972e commit 700447f

15 files changed

+0
-181
lines changed

src/hotspot/cpu/aarch64/assembler_aarch64.hpp

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3220,13 +3220,6 @@ void mvnw(Register Rd, Register Rm,
32203220
Assembler(CodeBuffer* code) : AbstractAssembler(code) {
32213221
}
32223222

3223-
virtual RegisterOrConstant delayed_value_impl(intptr_t* delayed_value_addr,
3224-
Register tmp,
3225-
int offset) {
3226-
ShouldNotCallThis();
3227-
return RegisterOrConstant();
3228-
}
3229-
32303223
// Stack overflow checking
32313224
virtual void bang_stack_with_offset(int offset);
32323225

src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -934,23 +934,6 @@ void MacroAssembler::check_and_handle_earlyret(Register java_thread) { }
934934

935935
void MacroAssembler::check_and_handle_popframe(Register java_thread) { }
936936

937-
938-
RegisterOrConstant MacroAssembler::delayed_value_impl(intptr_t* delayed_value_addr,
939-
Register tmp,
940-
int offset) {
941-
intptr_t value = *delayed_value_addr;
942-
if (value != 0)
943-
return RegisterOrConstant(value + offset);
944-
945-
// load indirectly to solve generation ordering problem
946-
ldr(tmp, ExternalAddress((address) delayed_value_addr));
947-
948-
if (offset != 0)
949-
add(tmp, tmp, offset);
950-
951-
return RegisterOrConstant(tmp);
952-
}
953-
954937
// Look up the method for a megamorphic invokeinterface call.
955938
// The target method is determined by <intf_klass, itable_index>.
956939
// The receiver klass is in recv_klass.

src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1013,10 +1013,6 @@ class MacroAssembler: public Assembler {
10131013
// Check for reserved stack access in method being exited (for JIT)
10141014
void reserved_stack_check();
10151015

1016-
virtual RegisterOrConstant delayed_value_impl(intptr_t* delayed_value_addr,
1017-
Register tmp,
1018-
int offset);
1019-
10201016
// Arithmetics
10211017

10221018
void addptr(const Address &dst, int32_t src);

src/hotspot/cpu/arm/macroAssembler_arm.cpp

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -85,20 +85,6 @@ void AddressLiteral::set_rspec(relocInfo::relocType rtype) {
8585
}
8686
}
8787

88-
// Initially added to the Assembler interface as a pure virtual:
89-
// RegisterConstant delayed_value(..)
90-
// for:
91-
// 6812678 macro assembler needs delayed binding of a few constants (for 6655638)
92-
// this was subsequently modified to its present name and return type
93-
RegisterOrConstant MacroAssembler::delayed_value_impl(intptr_t* delayed_value_addr,
94-
Register tmp,
95-
int offset) {
96-
ShouldNotReachHere();
97-
return RegisterOrConstant(-1);
98-
}
99-
100-
101-
10288

10389
// virtual method calling
10490
void MacroAssembler::lookup_virtual_method(Register recv_klass,

src/hotspot/cpu/arm/macroAssembler_arm.hpp

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -222,14 +222,6 @@ class MacroAssembler: public Assembler {
222222
// returning false to preserve all relocation information.
223223
inline bool ignore_non_patchable_relocations() { return true; }
224224

225-
// Initially added to the Assembler interface as a pure virtual:
226-
// RegisterConstant delayed_value(..)
227-
// for:
228-
// 6812678 macro assembler needs delayed binding of a few constants (for 6655638)
229-
// this was subsequently modified to its present name and return type
230-
virtual RegisterOrConstant delayed_value_impl(intptr_t* delayed_value_addr, Register tmp, int offset);
231-
232-
233225
void align(int modulus);
234226

235227
// Support for VM calls

src/hotspot/cpu/ppc/macroAssembler_ppc.cpp

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -382,25 +382,6 @@ AddressLiteral MacroAssembler::constant_oop_address(jobject obj) {
382382
return AddressLiteral(address(obj), oop_Relocation::spec(oop_index));
383383
}
384384

385-
RegisterOrConstant MacroAssembler::delayed_value_impl(intptr_t* delayed_value_addr,
386-
Register tmp, int offset) {
387-
intptr_t value = *delayed_value_addr;
388-
if (value != 0) {
389-
return RegisterOrConstant(value + offset);
390-
}
391-
392-
// Load indirectly to solve generation ordering problem.
393-
// static address, no relocation
394-
int simm16_offset = load_const_optimized(tmp, delayed_value_addr, noreg, true);
395-
ld(tmp, simm16_offset, tmp); // must be aligned ((xa & 3) == 0)
396-
397-
if (offset != 0) {
398-
addi(tmp, tmp, offset);
399-
}
400-
401-
return RegisterOrConstant(tmp);
402-
}
403-
404385
#ifndef PRODUCT
405386
void MacroAssembler::pd_print_patched_instruction(address branch) {
406387
Unimplemented(); // TODO: PPC port

src/hotspot/cpu/ppc/macroAssembler_ppc.hpp

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -152,12 +152,6 @@ class MacroAssembler: public Assembler {
152152
// Same as load_address.
153153
inline void set_oop (AddressLiteral obj_addr, Register d);
154154

155-
// Read runtime constant: Issue load if constant not yet established,
156-
// else use real constant.
157-
virtual RegisterOrConstant delayed_value_impl(intptr_t* delayed_value_addr,
158-
Register tmp,
159-
int offset);
160-
161155
//
162156
// branch, jump
163157
//

src/hotspot/cpu/s390/macroAssembler_s390.cpp

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1810,34 +1810,6 @@ void MacroAssembler::c2bool(Register r, Register t) {
18101810
z_srl(r, 31); // Yields 0 if r was 0, 1 otherwise.
18111811
}
18121812

1813-
RegisterOrConstant MacroAssembler::delayed_value_impl(intptr_t* delayed_value_addr,
1814-
Register tmp,
1815-
int offset) {
1816-
intptr_t value = *delayed_value_addr;
1817-
if (value != 0) {
1818-
return RegisterOrConstant(value + offset);
1819-
}
1820-
1821-
BLOCK_COMMENT("delayed_value {");
1822-
// Load indirectly to solve generation ordering problem.
1823-
load_absolute_address(tmp, (address) delayed_value_addr); // tmp = a;
1824-
z_lg(tmp, 0, tmp); // tmp = *tmp;
1825-
1826-
#ifdef ASSERT
1827-
NearLabel L;
1828-
compare64_and_branch(tmp, (intptr_t)0L, Assembler::bcondNotEqual, L);
1829-
z_illtrap();
1830-
bind(L);
1831-
#endif
1832-
1833-
if (offset != 0) {
1834-
z_agfi(tmp, offset); // tmp = tmp + offset;
1835-
}
1836-
1837-
BLOCK_COMMENT("} delayed_value");
1838-
return RegisterOrConstant(tmp);
1839-
}
1840-
18411813
// Patch instruction `inst' at offset `inst_pos' to refer to `dest_pos'
18421814
// and return the resulting instruction.
18431815
// Dest_pos and inst_pos are 32 bit only. These parms can only designate

src/hotspot/cpu/s390/macroAssembler_s390.hpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -350,9 +350,6 @@ class MacroAssembler: public Assembler {
350350
// Uses constant_metadata_address.
351351
inline bool set_metadata_constant(Metadata* md, Register d);
352352

353-
virtual RegisterOrConstant delayed_value_impl(intptr_t* delayed_value_addr,
354-
Register tmp,
355-
int offset);
356353
//
357354
// branch, jump
358355
//

src/hotspot/cpu/x86/macroAssembler_x86.cpp

Lines changed: 0 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -3929,44 +3929,6 @@ void MacroAssembler::vallones(XMMRegister dst, int vector_len) {
39293929
}
39303930
}
39313931

3932-
RegisterOrConstant MacroAssembler::delayed_value_impl(intptr_t* delayed_value_addr,
3933-
Register tmp,
3934-
int offset) {
3935-
intptr_t value = *delayed_value_addr;
3936-
if (value != 0)
3937-
return RegisterOrConstant(value + offset);
3938-
3939-
// load indirectly to solve generation ordering problem
3940-
movptr(tmp, ExternalAddress((address) delayed_value_addr));
3941-
3942-
#ifdef ASSERT
3943-
{ Label L;
3944-
testptr(tmp, tmp);
3945-
if (WizardMode) {
3946-
const char* buf = NULL;
3947-
{
3948-
ResourceMark rm;
3949-
stringStream ss;
3950-
ss.print("DelayedValue=" INTPTR_FORMAT, delayed_value_addr[1]);
3951-
buf = code_string(ss.as_string());
3952-
}
3953-
jcc(Assembler::notZero, L);
3954-
STOP(buf);
3955-
} else {
3956-
jccb(Assembler::notZero, L);
3957-
hlt();
3958-
}
3959-
bind(L);
3960-
}
3961-
#endif
3962-
3963-
if (offset != 0)
3964-
addptr(tmp, offset);
3965-
3966-
return RegisterOrConstant(tmp);
3967-
}
3968-
3969-
39703932
Address MacroAssembler::argument_address(RegisterOrConstant arg_slot,
39713933
int extra_slot_offset) {
39723934
// cf. TemplateTable::prepare_invoke(), if (load_receiver).

0 commit comments

Comments
 (0)