Skip to content

Commit e2cd70a

Browse files
committed
8351151: Clean up x86 template interpreter after 32-bit x86 removal
Reviewed-by: coleenp, fparain, vlivanov
1 parent b990780 commit e2cd70a

15 files changed

+125
-1163
lines changed

src/hotspot/cpu/aarch64/interp_masm_aarch64.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1401,9 +1401,6 @@ void InterpreterMacroAssembler::_interp_verify_oop(Register reg, TosState state,
14011401
}
14021402
}
14031403

1404-
void InterpreterMacroAssembler::verify_FPU(int stack_depth, TosState state) { ; }
1405-
1406-
14071404
void InterpreterMacroAssembler::notify_method_entry() {
14081405
// Whenever JVMTI is interp_only_mode, method entry/exit events are sent to
14091406
// track stack depth. If it is possible to enter interp_only_mode we add

src/hotspot/cpu/aarch64/interp_masm_aarch64.hpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -303,8 +303,6 @@ class InterpreterMacroAssembler: public MacroAssembler {
303303
// only if +VerifyOops && state == atos
304304
#define interp_verify_oop(reg, state) _interp_verify_oop(reg, state, __FILE__, __LINE__);
305305
void _interp_verify_oop(Register reg, TosState state, const char* file, int line);
306-
// only if +VerifyFPU && (state == ftos || state == dtos)
307-
void verify_FPU(int stack_depth, TosState state = ftos);
308306

309307
typedef enum { NotifyJVMTI, SkipNotifyJVMTI } NotifyMethodExitMode;
310308

src/hotspot/cpu/arm/interp_masm_arm.hpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -198,10 +198,6 @@ class InterpreterMacroAssembler: public MacroAssembler {
198198
// Debugging
199199
void interp_verify_oop(Register reg, TosState state, const char* file, int line); // only if +VerifyOops && state == atos
200200

201-
void verify_FPU(int stack_depth, TosState state = ftos) {
202-
// No VFP state verification is required for ARM
203-
}
204-
205201
// Object locking
206202
void lock_object (Register lock_reg);
207203
void unlock_object(Register lock_reg);

src/hotspot/cpu/ppc/interp_masm_ppc.hpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,6 @@ class InterpreterMacroAssembler: public MacroAssembler {
265265
// Debugging
266266
void verify_oop(Register reg, TosState state = atos); // only if +VerifyOops && state == atos
267267
void verify_oop_or_return_address(Register reg, Register rtmp); // for astore
268-
void verify_FPU(int stack_depth, TosState state = ftos);
269268

270269
typedef enum { NotifyJVMTI, SkipNotifyJVMTI } NotifyMethodExitMode;
271270

src/hotspot/cpu/ppc/interp_masm_ppc_64.cpp

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2381,12 +2381,6 @@ static bool verify_return_address(Method* m, int bci) {
23812381
return false;
23822382
}
23832383

2384-
void InterpreterMacroAssembler::verify_FPU(int stack_depth, TosState state) {
2385-
if (VerifyFPU) {
2386-
unimplemented("verfiyFPU");
2387-
}
2388-
}
2389-
23902384
void InterpreterMacroAssembler::verify_oop_or_return_address(Register reg, Register Rtmp) {
23912385
if (!VerifyOops) return;
23922386

src/hotspot/cpu/riscv/interp_masm_riscv.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1431,8 +1431,6 @@ void InterpreterMacroAssembler::profile_switch_case(Register index,
14311431
}
14321432
}
14331433

1434-
void InterpreterMacroAssembler::verify_FPU(int stack_depth, TosState state) { ; }
1435-
14361434
void InterpreterMacroAssembler::notify_method_entry() {
14371435
// Whenever JVMTI is interp_only_mode, method entry/exit events are sent to
14381436
// track stack depth. If it is possible to enter interp_only_mode we add

src/hotspot/cpu/riscv/interp_masm_riscv.hpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -284,10 +284,6 @@ class InterpreterMacroAssembler: public MacroAssembler {
284284
void profile_return_type(Register mdp, Register ret, Register tmp);
285285
void profile_parameters_type(Register mdp, Register tmp1, Register tmp2, Register tmp3);
286286

287-
// Debugging
288-
// only if +VerifyFPU && (state == ftos || state == dtos)
289-
void verify_FPU(int stack_depth, TosState state = ftos);
290-
291287
typedef enum { NotifyJVMTI, SkipNotifyJVMTI } NotifyMethodExitMode;
292288

293289
// support for jvmti/dtrace

src/hotspot/cpu/s390/interp_masm_s390.cpp

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,6 @@ void InterpreterMacroAssembler::dispatch_next(TosState state, int bcp_incr, bool
9393
// Dispatch value in Lbyte_code and increment Lbcp.
9494

9595
void InterpreterMacroAssembler::dispatch_base(TosState state, address* table, bool generate_poll) {
96-
verify_FPU(1, state);
97-
9896
#ifdef ASSERT
9997
address reentry = nullptr;
10098
{ Label OK;
@@ -2189,9 +2187,3 @@ void InterpreterMacroAssembler::pop_interpreter_frame(Register return_pc, Regist
21892187
z_stg(Z_ARG3, _z_parent_ijava_frame_abi(return_pc), Z_SP);
21902188
#endif
21912189
}
2192-
2193-
void InterpreterMacroAssembler::verify_FPU(int stack_depth, TosState state) {
2194-
if (VerifyFPU) {
2195-
unimplemented("verifyFPU");
2196-
}
2197-
}

src/hotspot/cpu/s390/interp_masm_s390.hpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,6 @@ class InterpreterMacroAssembler: public MacroAssembler {
313313
// Debugging
314314
void verify_oop(Register reg, TosState state = atos); // Only if +VerifyOops && state == atos.
315315
void verify_oop_or_return_address(Register reg, Register rtmp); // for astore
316-
void verify_FPU(int stack_depth, TosState state = ftos);
317316

318317
// JVMTI helpers
319318
void skip_if_jvmti_mode(Label &Lskip, Register Rscratch = Z_R0);

0 commit comments

Comments
 (0)