comparison src/share/vm/runtime/frame.hpp @ 11173:6b0fd0964b87

Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/
author Doug Simon <doug.simon@oracle.com>
date Wed, 31 Jul 2013 11:00:54 +0200
parents 836a62f43af9 e619a2766bcc
children cefad50507d8
comparison
equal deleted inserted replaced
10912:4ea54634f03e 11173:6b0fd0964b87
351 oop* interpreter_frame_mirror_addr() const; 351 oop* interpreter_frame_mirror_addr() const;
352 #endif 352 #endif
353 353
354 public: 354 public:
355 // Entry frames 355 // Entry frames
356 JavaCallWrapper* entry_frame_call_wrapper() const; 356 JavaCallWrapper* entry_frame_call_wrapper() const { return *entry_frame_call_wrapper_addr(); }
357 JavaCallWrapper* entry_frame_call_wrapper_if_safe(JavaThread* thread) const;
358 JavaCallWrapper** entry_frame_call_wrapper_addr() const;
357 intptr_t* entry_frame_argument_at(int offset) const; 359 intptr_t* entry_frame_argument_at(int offset) const;
358 360
359 // tells whether there is another chunk of Delta stack above 361 // tells whether there is another chunk of Delta stack above
360 bool entry_frame_is_first() const; 362 bool entry_frame_is_first() const;
361 363