comparison src/cpu/x86/vm/sharedRuntime_x86_64.cpp @ 22460:f27c163d7dc2

moved JVMCI fields from ThreadShadow to Thread
author Doug Simon <doug.simon@oracle.com>
date Mon, 24 Aug 2015 22:35:47 +0200
parents c2c971a9776f
children b14500c9da22
comparison
equal deleted inserted replaced
22459:0dd2b79625b3 22460:f27c163d7dc2
3403 // Save everything in sight. 3403 // Save everything in sight.
3404 RegisterSaver::save_live_registers(masm, 0, &frame_size_in_words); 3404 RegisterSaver::save_live_registers(masm, 0, &frame_size_in_words);
3405 // fetch_unroll_info needs to call last_java_frame() 3405 // fetch_unroll_info needs to call last_java_frame()
3406 __ set_last_Java_frame(noreg, noreg, NULL); 3406 __ set_last_Java_frame(noreg, noreg, NULL);
3407 3407
3408 __ movl(c_rarg1, Address(r15_thread, in_bytes(ThreadShadow::pending_deoptimization_offset()))); 3408 __ movl(c_rarg1, Address(r15_thread, in_bytes(JavaThread::pending_deoptimization_offset())));
3409 __ movl(Address(r15_thread, in_bytes(ThreadShadow::pending_deoptimization_offset())), -1); 3409 __ movl(Address(r15_thread, in_bytes(JavaThread::pending_deoptimization_offset())), -1);
3410 3410
3411 __ movl(r14, (int32_t)Deoptimization::Unpack_reexecute); 3411 __ movl(r14, (int32_t)Deoptimization::Unpack_reexecute);
3412 __ mov(c_rarg0, r15_thread); 3412 __ mov(c_rarg0, r15_thread);
3413 __ call(RuntimeAddress(CAST_FROM_FN_PTR(address, Deoptimization::uncommon_trap))); 3413 __ call(RuntimeAddress(CAST_FROM_FN_PTR(address, Deoptimization::uncommon_trap)));
3414 oop_maps->add_gc_map( __ pc()-start, map->deep_copy()); 3414 oop_maps->add_gc_map( __ pc()-start, map->deep_copy());