comparison src/cpu/sparc/vm/sharedRuntime_sparc.cpp @ 14422:2b8e28fdf503

Merge
author kvn
date Tue, 05 Nov 2013 17:38:04 -0800
parents 6a936747b569 e504cd481ec0
children da862781b584
comparison
equal deleted inserted replaced
14421:3068270ba476 14422:2b8e28fdf503
3581 3581
3582 // Move the pending exception from exception_oop to Oexception so 3582 // Move the pending exception from exception_oop to Oexception so
3583 // the pending exception will be picked up the interpreter. 3583 // the pending exception will be picked up the interpreter.
3584 __ ld_ptr(G2_thread, in_bytes(JavaThread::exception_oop_offset()), Oexception); 3584 __ ld_ptr(G2_thread, in_bytes(JavaThread::exception_oop_offset()), Oexception);
3585 __ st_ptr(G0, G2_thread, in_bytes(JavaThread::exception_oop_offset())); 3585 __ st_ptr(G0, G2_thread, in_bytes(JavaThread::exception_oop_offset()));
3586 __ st_ptr(G0, G2_thread, in_bytes(JavaThread::exception_pc_offset()));
3586 __ bind(noException); 3587 __ bind(noException);
3587 3588
3588 // deallocate the deoptimization frame taking care to preserve the return values 3589 // deallocate the deoptimization frame taking care to preserve the return values
3589 __ mov(Oreturn0, Oreturn0->after_save()); 3590 __ mov(Oreturn0, Oreturn0->after_save());
3590 __ mov(Oreturn1, Oreturn1->after_save()); 3591 __ mov(Oreturn1, Oreturn1->after_save());