Mercurial > hg > graal-jvmci-8

comparison src/cpu/x86/vm/frame_x86.cpp @ 13451:02f27ecb4f3a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/
author Doug Simon <doug.simon@oracle.com>
date Wed, 18 Dec 2013 00:00:24 +0100
parents cefad50507d8 c586f8a7322f
children b51e29501f30 8f3ece00da4f
comparison
equal deleted inserted replaced
13371:4db09b7304da 13451:02f27ecb4f3a
92 // First check if frame is complete and tester is reliable 92 // First check if frame is complete and tester is reliable
93 // Unfortunately we can only check frame complete for runtime stubs and nmethod 93 // Unfortunately we can only check frame complete for runtime stubs and nmethod
94 // other generic buffer blobs are more problematic so we just assume they are 94 // other generic buffer blobs are more problematic so we just assume they are
95 // ok. adapter blobs never have a frame complete and are never ok. 95 // ok. adapter blobs never have a frame complete and are never ok.
96 96
97 // check for a valid frame_size, otherwise we are unlikely to get a valid sender_pc
98
99 if (!Interpreter::contains(_pc) && _cb->frame_size() <= 0) {
100 //assert(0, "Invalid frame_size");
101 return false;
102 }
103
104 if (!_cb->is_frame_complete_at(_pc)) { 97 if (!_cb->is_frame_complete_at(_pc)) {
105 if (_cb->is_nmethod() || _cb->is_adapter_blob() || _cb->is_runtime_stub()) { 98 if (_cb->is_nmethod() || _cb->is_adapter_blob() || _cb->is_runtime_stub()) {
106 return false; 99 return false;
107 } 100 }
108 } 101 }
141 sender_sp = (intptr_t*) addr_at(sender_sp_offset); 134 sender_sp = (intptr_t*) addr_at(sender_sp_offset);
142 135
143 } else { 136 } else {
144 // must be some sort of compiled/runtime frame 137 // must be some sort of compiled/runtime frame
145 // fp does not have to be safe (although it could be check for c1?) 138 // fp does not have to be safe (although it could be check for c1?)
139
140 // check for a valid frame_size, otherwise we are unlikely to get a valid sender_pc
141 if (_cb->frame_size() <= 0) {
142 return false;
143 }
146 144
147 sender_sp = _unextended_sp + _cb->frame_size(); 145 sender_sp = _unextended_sp + _cb->frame_size();
148 // On Intel the return_address is always the word on the stack 146 // On Intel the return_address is always the word on the stack
149 sender_pc = (address) *(sender_sp-1); 147 sender_pc = (address) *(sender_sp-1);
150 } 148 }