Mercurial > hg > truffle

comparison src/cpu/x86/vm/sharedRuntime_x86_64.cpp @ 10409:36bcc10e01c0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge fixes
author Doug Simon <doug.simon@oracle.com>
date Wed, 19 Jun 2013 15:37:32 +0200
parents 01958088b87d
children 3489047ffea2
comparison
equal deleted inserted replaced
10408:836a62f43af9 10409:36bcc10e01c0
3355 __ movl(r14, Deoptimization::Unpack_reexecute); // callee-saved 3355 __ movl(r14, Deoptimization::Unpack_reexecute); // callee-saved
3356 __ jmp(cont); 3356 __ jmp(cont);
3357 3357
3358 #ifdef GRAAL 3358 #ifdef GRAAL
3359 int implicit_exception_uncommon_trap_offset = __ pc() - start; 3359 int implicit_exception_uncommon_trap_offset = __ pc() - start;
3360 // pc where the exception happened is in ScratchA 3360 __ pushptr(Address(r15_thread, in_bytes(JavaThread::graal_implicit_exception_pc_offset())));
3361 __ pushptr(Address(r15_thread, in_bytes(JavaThread::ScratchA_offset())));
3362 3361
3363 int uncommon_trap_offset = __ pc() - start; 3362 int uncommon_trap_offset = __ pc() - start;
3364 3363
3365 // Save everything in sight. 3364 // Save everything in sight.
3366 RegisterSaver::save_live_registers(masm, 0, &frame_size_in_words); 3365 RegisterSaver::save_live_registers(masm, 0, &frame_size_in_words);