comparison src/cpu/x86/vm/frame_x86.cpp @ 14704:b51e29501f30

Merged with jdk9/dev/hotspot changeset 9486a41de3b7
author twisti
date Tue, 18 Mar 2014 20:19:10 -0700
parents 02f27ecb4f3a d3f14809b051
children 92aa6797d639
comparison
equal deleted inserted replaced
14647:8f483e200405 14704:b51e29501f30
685 #define DESCRIBE_FP_OFFSET(name) \ 685 #define DESCRIBE_FP_OFFSET(name) \
686 values.describe(frame_no, fp() + frame::name##_offset, #name) 686 values.describe(frame_no, fp() + frame::name##_offset, #name)
687 687
688 void frame::describe_pd(FrameValues& values, int frame_no) { 688 void frame::describe_pd(FrameValues& values, int frame_no) {
689 if (is_interpreted_frame()) { 689 if (is_interpreted_frame()) {
690 #ifndef CC_INTERP
690 DESCRIBE_FP_OFFSET(interpreter_frame_sender_sp); 691 DESCRIBE_FP_OFFSET(interpreter_frame_sender_sp);
691 DESCRIBE_FP_OFFSET(interpreter_frame_last_sp); 692 DESCRIBE_FP_OFFSET(interpreter_frame_last_sp);
692 DESCRIBE_FP_OFFSET(interpreter_frame_method); 693 DESCRIBE_FP_OFFSET(interpreter_frame_method);
693 DESCRIBE_FP_OFFSET(interpreter_frame_mdx); 694 DESCRIBE_FP_OFFSET(interpreter_frame_mdx);
694 DESCRIBE_FP_OFFSET(interpreter_frame_cache); 695 DESCRIBE_FP_OFFSET(interpreter_frame_cache);
695 DESCRIBE_FP_OFFSET(interpreter_frame_locals); 696 DESCRIBE_FP_OFFSET(interpreter_frame_locals);
696 DESCRIBE_FP_OFFSET(interpreter_frame_bcx); 697 DESCRIBE_FP_OFFSET(interpreter_frame_bcx);
697 DESCRIBE_FP_OFFSET(interpreter_frame_initial_sp); 698 DESCRIBE_FP_OFFSET(interpreter_frame_initial_sp);
699 #endif
698 } 700 }
699 } 701 }
700 #endif 702 #endif
701 703
702 intptr_t *frame::initial_deoptimization_info() { 704 intptr_t *frame::initial_deoptimization_info() {