--- a/src/hotspot/cpu/s390/macroAssembler_s390.hpp Thu Dec 14 12:02:16 2017 +0100
+++ b/src/hotspot/cpu/s390/macroAssembler_s390.hpp Thu Dec 14 13:05:20 2017 +0100
@@ -260,8 +260,6 @@
//
// Constants, loading constants, TOC support
//
- // Safepoint check factored out.
- void generate_safepoint_check(Label& slow_path, Register scratch = noreg, bool may_relocate = true);
// Load generic address: d <- base(a) + index(a) + disp(a).
inline void load_address(Register d, const Address &a);
@@ -443,6 +441,9 @@
// Get current PC + offset. Offset given in bytes, must be even!
address get_PC(Register result, int64_t offset);
+ // Get size of instruction at pc (which must point to valid code).
+ void instr_size(Register size, Register pc);
+
// Accessing, and in particular modifying, a stack location is only safe if
// the stack pointer (Z_SP) is set such that the accessed stack location is
// in the reserved range.
@@ -641,6 +642,9 @@
// Support for serializing memory accesses between threads.
void serialize_memory(Register thread, Register tmp1, Register tmp2);
+ // Check if safepoint requested and if so branch
+ void safepoint_poll(Label& slow_path, Register temp_reg);
+
// Stack overflow checking
void bang_stack_with_offset(int offset);