--- a/hotspot/src/cpu/x86/vm/templateInterpreter_x86_32.cpp Tue Apr 02 09:30:07 2013 +0200
+++ b/hotspot/src/cpu/x86/vm/templateInterpreter_x86_32.cpp Wed Apr 03 11:12:57 2013 -0700
@@ -1080,22 +1080,8 @@
// result potentially in rdx:rax or ST0
- // Either restore the MXCSR register after returning from the JNI Call
- // or verify that it wasn't changed.
- if (VM_Version::supports_sse()) {
- if (RestoreMXCSROnJNICalls) {
- __ ldmxcsr(ExternalAddress(StubRoutines::addr_mxcsr_std()));
- }
- else if (CheckJNICalls ) {
- __ call(RuntimeAddress(StubRoutines::x86::verify_mxcsr_entry()));
- }
- }
-
- // Either restore the x87 floating pointer control word after returning
- // from the JNI call or verify that it wasn't changed.
- if (CheckJNICalls) {
- __ call(RuntimeAddress(StubRoutines::x86::verify_fpu_cntrl_wrd_entry()));
- }
+ // Verify or restore cpu control state after JNI call
+ __ restore_cpu_control_state_after_jni();
// save potential result in ST(0) & rdx:rax
// (if result handler is the T_FLOAT or T_DOUBLE handler, result must be in ST0 -