stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8190781: ppc64 + s390: Fix CriticalJNINatives

Browse Source 
Reviewed-by: goetz
This commit is contained in:
Martin Doerr 2017-11-06 17:56:29 +01:00
parent f37bbe430d
commit 614fca959b
4 changed files with 59 additions and 8 deletions

2
src/hotspot/cpu/ppc/assembler_ppc.inline.hpp

@ -941,7 +941,7 @@ inline void Assembler::vpmsumh( VectorRegister d, VectorRegister a, VectorRegis
inline void Assembler::vpmsumw( VectorRegister d, VectorRegister a, VectorRegister b) { emit_int32( VPMSUMW_OPCODE | vrt(d) | vra(a) | vrb(b)); }
// Vector Permute and Xor (introduced with Power 8)
inline void Assembler::vpermxor( VectorRegister d, VectorRegister a, VectorRegister b, VectorRegister c) { emit_int32( VPMSUMW_OPCODE | vrt(d) | vra(a) | vrb(b) | vrc(c)); }
inline void Assembler::vpermxor( VectorRegister d, VectorRegister a, VectorRegister b, VectorRegister c) { emit_int32( VPERMXOR_OPCODE | vrt(d) | vra(a) | vrb(b) | vrc(c)); }
// Transactional Memory instructions (introduced with Power 8)
inline void Assembler::tbegin_() { emit_int32( TBEGIN_OPCODE | rc(1)); }

27
src/hotspot/cpu/ppc/sharedRuntime_ppc.cpp

@ -1469,8 +1469,31 @@ static void save_or_restore_arguments(MacroAssembler* masm,
}
// Save or restore single word registers.
for (int i = 0; i < total_in_args; i++) {
// PPC64: pass ints as longs: must only deal with floats here.
if (in_regs[i].first()->is_FloatRegister()) {
if (in_regs[i].first()->is_Register()) {
int offset = slot * VMRegImpl::stack_slot_size;
// Value lives in an input register. Save it on stack.
switch (in_sig_bt[i]) {
case T_BOOLEAN:
case T_CHAR:
case T_BYTE:
case T_SHORT:
case T_INT:
if (map != NULL) {
__ stw(in_regs[i].first()->as_Register(), offset, R1_SP);
} else {
__ lwa(in_regs[i].first()->as_Register(), offset, R1_SP);
}
slot++;
assert(slot <= stack_slots, "overflow (after INT or smaller stack slot)");
break;
case T_ARRAY:
case T_LONG:
// handled above
break;
case T_OBJECT:
default: ShouldNotReachHere();
}
} else if (in_regs[i].first()->is_FloatRegister()) {
if (in_sig_bt[i] == T_FLOAT) {
int offset = slot * VMRegImpl::stack_slot_size;
slot++;

3
src/hotspot/cpu/ppc/vm_version_ppc.cpp

@ -109,7 +109,8 @@ void VM_Version::initialize() {
if (PowerArchitecturePPC64 >= 8) {
if (FLAG_IS_DEFAULT(SuperwordUseVSX)) {
FLAG_SET_ERGO(bool, SuperwordUseVSX, true);
// TODO: Switch on when it works stable. Currently, MachSpillCopyNode::implementation code is missing.
//FLAG_SET_ERGO(bool, SuperwordUseVSX, true);
}
} else {
if (SuperwordUseVSX) {

35
src/hotspot/cpu/s390/sharedRuntime_s390.cpp

@ -1309,15 +1309,42 @@ static void save_or_restore_arguments(MacroAssembler *masm,
}
} else {
__ z_lg(reg, offset, Z_SP);
slot += VMRegImpl::slots_per_word;
assert(slot <= stack_slots, "overflow (after LONG/ARRAY stack slot)");
}
slot += VMRegImpl::slots_per_word;
assert(slot <= stack_slots, "overflow (after LONG/ARRAY stack slot)");
}
}
// Save or restore single word registers.
for (int i = 0; i < total_in_args; i++) {
if (in_regs[i].first()->is_FloatRegister()) {
if (in_regs[i].first()->is_Register()) {
int offset = slot * VMRegImpl::stack_slot_size;
// Value lives in an input register. Save it on stack.
switch (in_sig_bt[i]) {
case T_BOOLEAN:
case T_CHAR:
case T_BYTE:
case T_SHORT:
case T_INT: {
const Register reg = in_regs[i].first()->as_Register();
Address stackaddr(Z_SP, offset);
if (map != NULL) {
__ z_st(reg, stackaddr);
} else {
__ z_lgf(reg, stackaddr);
}
slot++;
assert(slot <= stack_slots, "overflow (after INT or smaller stack slot)");
break;
}
case T_ARRAY:
case T_LONG:
// handled above
break;
case T_OBJECT:
default: ShouldNotReachHere();
}
} else if (in_regs[i].first()->is_FloatRegister()) {
if (in_sig_bt[i] == T_FLOAT) {
int offset = slot * VMRegImpl::stack_slot_size;
slot++;
@ -1908,7 +1935,7 @@ nmethod *SharedRuntime::generate_native_wrapper(MacroAssembler *masm,
case T_ARRAY:
if (is_critical_native) {
int body_arg = cix;
cix -= 2; // Point to length arg.
cix -= 1; // Point to length arg.
unpack_array_argument(masm, in_regs[jix], in_elem_bt[jix], out_regs[body_arg], out_regs[cix], stack_slots);
break;
}