Skip to content

Commit cfdae57

Browse files
committed
cleanup
1 parent 67b86ae commit cfdae57

File tree

1 file changed

+3
-6
lines changed

1 file changed

+3
-6
lines changed

src/hotspot/cpu/s390/interp_masm_s390.cpp

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
*/
2525

2626
// Major contributions by AHa, AS, JL, ML.
27-
long fubar = 0;
27+
2828
#include "asm/macroAssembler.inline.hpp"
2929
#include "gc/shared/barrierSet.hpp"
3030
#include "gc/shared/barrierSetAssembler.hpp"
@@ -186,13 +186,10 @@ void InterpreterMacroAssembler::call_VM_preemptable(Register oop_result, address
186186
push_cont_fastpath();
187187

188188
assert(arg_1 != Z_ARG1, "register corruption");
189-
load_const_optimized(Z_R1, (uintptr_t)&fubar);
190-
z_agsi(0, Z_R1, 1);
191-
z_lg(Z_ARG1, Address(Z_SP, _z_abi(callers_sp)));
192189

193190
// We set resume_pc as last java pc. It will be saved if the vthread gets preempted.
194191
// Later execution will continue right there.
195-
lr_if_needed(Z_ARG2, arg_1);
192+
lgr_if_needed(Z_ARG2, arg_1);
196193

197194
call_VM(oop_result, entry_point, false /*check_exceptions*/, &resume_pc /* last_java_pc */);
198195

@@ -204,7 +201,7 @@ void InterpreterMacroAssembler::call_VM_preemptable(Register oop_result, address
204201
z_brz(not_preempted);
205202

206203
z_mvghi(Address(Z_thread, in_bytes(JavaThread::preempt_alternate_return_offset())), 0);
207-
z_br(Z_R1_scratch); // branch to handler in Z_R1_scratch
204+
z_br(Z_R1_scratch); // branch to handler in Z_R1_scratch
208205

209206
bind(resume_pc); // Location to resume execution
210207

0 commit comments

Comments
 (0)