Skip to content

Commit ae7ab5e

Browse files
committed
call_VM_preemptable
1 parent c7d4dbf commit ae7ab5e

File tree

2 files changed

+15
-3
lines changed

2 files changed

+15
-3
lines changed

src/hotspot/cpu/s390/interp_masm_s390.cpp

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,16 @@ void InterpreterMacroAssembler::dispatch_via(TosState state, address *table) {
165165
// to perform additional, template interpreter specific tasks before actually
166166
// calling their MacroAssembler counterparts.
167167

168+
void InterpreterMacroAssembler::call_VM_preemptable(Register oop_result, address entry_point,
169+
Register arg_1, bool check_exceptions) {
170+
if (!Continuations::enabled()) {
171+
call_VM(oop_result, entry_point, arg_1);
172+
return;
173+
}
174+
175+
__ stop("not yet implemented call_VM_preemptable");
176+
}
177+
168178
void InterpreterMacroAssembler::call_VM_leaf_base(address entry_point) {
169179
bool allow_relocation = true; // Fenerally valid variant. Assume code is relocated.
170180
// interpreter specific
@@ -1018,9 +1028,9 @@ void InterpreterMacroAssembler::lock_object(Register monitor, Register object) {
10181028
z_bru(done);
10191029

10201030
bind(slow_case);
1021-
call_VM(noreg,
1022-
CAST_FROM_FN_PTR(address, InterpreterRuntime::monitorenter),
1023-
monitor);
1031+
call_VM_preemptable(noreg,
1032+
CAST_FROM_FN_PTR(address, InterpreterRuntime::monitorenter),
1033+
monitor);
10241034
bind(done);
10251035
}
10261036

src/hotspot/cpu/s390/interp_masm_s390.hpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,8 @@ class InterpreterMacroAssembler: public MacroAssembler {
4848
bool allow_relocation,
4949
bool check_exceptions);
5050

51+
void call_VM_preemptable(Register oop_result, address entry_point, Register arg_1, bool check_exceptions = true);
52+
5153
// Base routine for all dispatches.
5254
void dispatch_base(TosState state, address* table, bool generate_poll = false);
5355

0 commit comments

Comments
 (0)