archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-21 11:34:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8188857: [s390]: CPU feature detection incomplete

Browse source 
Reviewed-by: mdoerr
This commit is contained in:
Lutz Schmidt 2017-10-09 11:51:20 +02:00
parent 75a4bdf218
commit ccbba3fe48
3 changed files with 33 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/hotspot/os_cpu/linux_s390/os_linux_s390.cpp
View file

@ -448,11 +448,17 @@ JVM_handle_linux_signal(int sig,
}
else { // thread->thread_state() != _thread_in_Java
if (sig == SIGILL && VM_Version::is_determine_features_test_running()) {
// SIGILL must be caused by VM_Version::determine_features().
if ((sig == SIGILL) && VM_Version::is_determine_features_test_running()) {
// SIGILL must be caused by VM_Version::determine_features()
// when attempting to execute a non-existing instruction.
//*(int *) (pc-6)=0; // Patch instruction to 0 to indicate that it causes a SIGILL.
// Flushing of icache is not necessary.
stub = pc; // Continue with next instruction.
} else if ((sig == SIGFPE) && VM_Version::is_determine_features_test_running()) {
// SIGFPE is known to be caused by trying to execute a vector instruction
// when the vector facility is installed, but operating system support is missing.
VM_Version::reset_has_VectorFacility();
stub = pc; // Continue with next instruction.
} else if (thread->thread_state() == _thread_in_vm &&
sig == SIGBUS && thread->doing_unsafe_access()) {
// We don't really need a stub here! Just set the pending exeption and
@ -510,7 +516,7 @@ JVM_handle_linux_signal(int sig,
// Note: this should be combined with the trap_pc handling above,
// because it handles the same issue.
if (sig == SIGILL || sig == SIGFPE) {
pc = (address) info->si_addr;
pc = (address)info->si_addr;
}
VMError::report_and_die(t, sig, pc, info, ucVoid);