1.1 --- a/src/cpu/ppc/vm/cppInterpreter_ppc.cpp Thu Feb 20 11:05:12 2014 +0100
1.2 +++ b/src/cpu/ppc/vm/cppInterpreter_ppc.cpp Thu Mar 06 10:55:28 2014 -0800
1.3 @@ -1136,7 +1136,9 @@
1.4 // (outgoing C args), R3_ARG1 to R10_ARG8, and F1_ARG1 to
1.5 // F13_ARG13.
1.6 __ mr(R3_ARG1, R18_locals);
1.7 +#if !defined(ABI_ELFv2)
1.8 __ ld(signature_handler_fd, 0, signature_handler_fd);
1.9 +#endif
1.10 __ call_stub(signature_handler_fd);
1.11 // reload method
1.12 __ ld(R19_method, state_(_method));
1.13 @@ -1295,8 +1297,13 @@
1.14 // native result acrosss the call. No oop is present
1.15
1.16 __ mr(R3_ARG1, R16_thread);
1.17 +#if defined(ABI_ELFv2)
1.18 + __ call_c(CAST_FROM_FN_PTR(address, JavaThread::check_special_condition_for_native_trans),
1.19 + relocInfo::none);
1.20 +#else
1.21 __ call_c(CAST_FROM_FN_PTR(FunctionDescriptor*, JavaThread::check_special_condition_for_native_trans),
1.22 relocInfo::none);
1.23 +#endif
1.24 __ bind(sync_check_done);
1.25
1.26 //=============================================================================
1.27 @@ -1413,7 +1420,7 @@
1.28 // First, pop to caller's frame.
1.29 __ pop_interpreter_frame(R11_scratch1, R12_scratch2, R21_tmp1 /* set to return pc */, R22_tmp2);
1.30
1.31 - __ push_frame_abi112(0, R11_scratch1);
1.32 + __ push_frame_reg_args(0, R11_scratch1);
1.33 // Get the address of the exception handler.
1.34 __ call_VM_leaf(CAST_FROM_FN_PTR(address, SharedRuntime::exception_handler_for_return_address),
1.35 R16_thread,
1.36 @@ -2545,7 +2552,7 @@
1.37 __ mr(R4_ARG2, R3_ARG1); // ARG2 := ARG1
1.38
1.39 // Find the address of the "catch_exception" stub.
1.40 - __ push_frame_abi112(0, R11_scratch1);
1.41 + __ push_frame_reg_args(0, R11_scratch1);
1.42 __ call_VM_leaf(CAST_FROM_FN_PTR(address, SharedRuntime::exception_handler_for_return_address),
1.43 R16_thread,
1.44 R4_ARG2);
