comparison src/cpu/x86/vm/sharedRuntime_x86_32.cpp @ 8883:b9a918201d47

Merge with hsx25
author Gilles Duboscq <duboscq@ssw.jku.at>
date Sat, 06 Apr 2013 20:04:06 +0200
parents b8f261ba79c6 e961c11b85fe
children 02f27ecb4f3a
comparison
equal deleted inserted replaced
8660:d47b52b0ff68 8883:b9a918201d47
2063 // Now set thread in native 2063 // Now set thread in native
2064 __ movl(Address(thread, JavaThread::thread_state_offset()), _thread_in_native); 2064 __ movl(Address(thread, JavaThread::thread_state_offset()), _thread_in_native);
2065 2065
2066 __ call(RuntimeAddress(native_func)); 2066 __ call(RuntimeAddress(native_func));
2067 2067
2068 // Verify or restore cpu control state after JNI call
2069 __ restore_cpu_control_state_after_jni();
2070
2068 // WARNING - on Windows Java Natives use pascal calling convention and pop the 2071 // WARNING - on Windows Java Natives use pascal calling convention and pop the
2069 // arguments off of the stack. We could just re-adjust the stack pointer here 2072 // arguments off of the stack. We could just re-adjust the stack pointer here
2070 // and continue to do SP relative addressing but we instead switch to FP 2073 // and continue to do SP relative addressing but we instead switch to FP
2071 // relative addressing. 2074 // relative addressing.
2072 2075