Mercurial > hg > graal-jvmci-8
comparison src/cpu/x86/vm/frame_x86.cpp @ 14726:92aa6797d639
Backed out merge changeset: b51e29501f30
Backed out merge revision to its first parent (8f483e200405)
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Mon, 24 Mar 2014 21:30:43 +0100 |
parents | b51e29501f30 |
children |
comparison
equal
deleted
inserted
replaced
14719:0bdd0d157040 | 14726:92aa6797d639 |
---|---|
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 | |
691 DESCRIBE_FP_OFFSET(interpreter_frame_sender_sp); | 690 DESCRIBE_FP_OFFSET(interpreter_frame_sender_sp); |
692 DESCRIBE_FP_OFFSET(interpreter_frame_last_sp); | 691 DESCRIBE_FP_OFFSET(interpreter_frame_last_sp); |
693 DESCRIBE_FP_OFFSET(interpreter_frame_method); | 692 DESCRIBE_FP_OFFSET(interpreter_frame_method); |
694 DESCRIBE_FP_OFFSET(interpreter_frame_mdx); | 693 DESCRIBE_FP_OFFSET(interpreter_frame_mdx); |
695 DESCRIBE_FP_OFFSET(interpreter_frame_cache); | 694 DESCRIBE_FP_OFFSET(interpreter_frame_cache); |
696 DESCRIBE_FP_OFFSET(interpreter_frame_locals); | 695 DESCRIBE_FP_OFFSET(interpreter_frame_locals); |
697 DESCRIBE_FP_OFFSET(interpreter_frame_bcx); | 696 DESCRIBE_FP_OFFSET(interpreter_frame_bcx); |
698 DESCRIBE_FP_OFFSET(interpreter_frame_initial_sp); | 697 DESCRIBE_FP_OFFSET(interpreter_frame_initial_sp); |
699 #endif | |
700 } | 698 } |
701 } | 699 } |
702 #endif | 700 #endif |
703 | 701 |
704 intptr_t *frame::initial_deoptimization_info() { | 702 intptr_t *frame::initial_deoptimization_info() { |