comparison src/cpu/x86/vm/sharedRuntime_x86_64.cpp @ 686:a9d9d7e06593

Merge
author trims
date Thu, 02 Apr 2009 17:01:00 -0700
parents 69aefafe69c1
children fe95187e8882
comparison
equal deleted inserted replaced
663:032c6af894da 686:a9d9d7e06593
2689 2689
2690 // Load UnrollBlock* into rdi 2690 // Load UnrollBlock* into rdi
2691 __ mov(rdi, rax); 2691 __ mov(rdi, rax);
2692 2692
2693 Label noException; 2693 Label noException;
2694 __ cmpl(r12, Deoptimization::Unpack_exception); // Was exception pending? 2694 __ cmpl(r14, Deoptimization::Unpack_exception); // Was exception pending?
2695 __ jcc(Assembler::notEqual, noException); 2695 __ jcc(Assembler::notEqual, noException);
2696 __ movptr(rax, Address(r15_thread, JavaThread::exception_oop_offset())); 2696 __ movptr(rax, Address(r15_thread, JavaThread::exception_oop_offset()));
2697 // QQQ this is useless it was NULL above 2697 // QQQ this is useless it was NULL above
2698 __ movptr(rdx, Address(r15_thread, JavaThread::exception_pc_offset())); 2698 __ movptr(rdx, Address(r15_thread, JavaThread::exception_pc_offset()));
2699 __ movptr(Address(r15_thread, JavaThread::exception_oop_offset()), (int32_t)NULL_WORD); 2699 __ movptr(Address(r15_thread, JavaThread::exception_oop_offset()), (int32_t)NULL_WORD);