comparison src/share/vm/graal/graalCompilerToVM.cpp @ 7232:310a68c63b69

Merge.
author Christian Haeubl <haeubl@ssw.jku.at>
date Fri, 14 Dec 2012 15:19:38 +0100
parents c0806f4ff3ea 291ffc492eb6
children e960cda050d7 79a7b761755c
comparison
equal deleted inserted replaced
7231:c0806f4ff3ea 7232:310a68c63b69
633 set_int("biasedLockMaskInPlace", (int) markOopDesc::biased_lock_mask_in_place); 633 set_int("biasedLockMaskInPlace", (int) markOopDesc::biased_lock_mask_in_place);
634 set_int("ageMaskInPlace", (int) markOopDesc::age_mask_in_place); 634 set_int("ageMaskInPlace", (int) markOopDesc::age_mask_in_place);
635 set_int("epochMaskInPlace", (int) markOopDesc::epoch_mask_in_place); 635 set_int("epochMaskInPlace", (int) markOopDesc::epoch_mask_in_place);
636 set_int("biasedLockPattern", (int) markOopDesc::biased_lock_pattern); 636 set_int("biasedLockPattern", (int) markOopDesc::biased_lock_pattern);
637 set_int("methodMaxLocalsOffset", in_bytes(Method::size_of_locals_offset())); 637 set_int("methodMaxLocalsOffset", in_bytes(Method::size_of_locals_offset()));
638 set_int("methodMaxStackOffset", in_bytes(Method::max_stack_offset())); 638 set_int("methodConstMethodOffset", in_bytes(Method::const_offset()));
639 set_int("constMethodMaxStackOffset", in_bytes(ConstMethod::max_stack_offset()));
639 set_int("extraStackEntries", Method::extra_stack_entries()); 640 set_int("extraStackEntries", Method::extra_stack_entries());
640 set_int("methodAccessFlagsOffset", in_bytes(Method::access_flags_offset())); 641 set_int("methodAccessFlagsOffset", in_bytes(Method::access_flags_offset()));
641 set_int("klassHasFinalizerFlag", JVM_ACC_HAS_FINALIZER); 642 set_int("klassHasFinalizerFlag", JVM_ACC_HAS_FINALIZER);
642 set_int("threadExceptionOopOffset", in_bytes(JavaThread::exception_oop_offset())); 643 set_int("threadExceptionOopOffset", in_bytes(JavaThread::exception_oop_offset()));
643 set_int("threadExceptionPcOffset", in_bytes(JavaThread::exception_pc_offset())); 644 set_int("threadExceptionPcOffset", in_bytes(JavaThread::exception_pc_offset()));