archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-21 03:24:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge

Browse source
This commit is contained in:
Coleen Phillimore 2014-07-18 11:22:49 -04:00
commit e051932425
57 changed files with 389 additions and 378 deletions
Download patch file Download diff file Expand all files Collapse all files

19
hotspot/src/share/vm/runtime/frame.hpp
View file

@ -218,8 +218,8 @@ class frame VALUE_OBJ_CLASS_SPEC {
private:
intptr_t** interpreter_frame_locals_addr() const;
intptr_t* interpreter_frame_bcx_addr() const;
intptr_t* interpreter_frame_mdx_addr() const;
intptr_t* interpreter_frame_bcp_addr() const;
intptr_t* interpreter_frame_mdp_addr() const;
public:
// Locals
@ -229,23 +229,13 @@ class frame VALUE_OBJ_CLASS_SPEC {
void interpreter_frame_set_locals(intptr_t* locs);
// byte code index/pointer (use these functions for unchecked frame access only!)
intptr_t interpreter_frame_bcx() const { return *interpreter_frame_bcx_addr(); }
void interpreter_frame_set_bcx(intptr_t bcx);
// byte code index
jint interpreter_frame_bci() const;
void interpreter_frame_set_bci(jint bci);
// byte code pointer
address interpreter_frame_bcp() const;
void interpreter_frame_set_bcp(address bcp);
// Unchecked access to the method data index/pointer.
// Only use this if you know what you are doing.
intptr_t interpreter_frame_mdx() const { return *interpreter_frame_mdx_addr(); }
void interpreter_frame_set_mdx(intptr_t mdx);
// method data pointer
address interpreter_frame_mdp() const;
void interpreter_frame_set_mdp(address dp);
@ -414,10 +404,6 @@ class frame VALUE_OBJ_CLASS_SPEC {
// RedefineClasses support for finding live interpreted methods on the stack
void metadata_do(void f(Metadata*));
void gc_prologue();
void gc_epilogue();
void pd_gc_epilog();
# ifdef ENABLE_ZAP_DEAD_LOCALS
private:
class CheckValueClosure: public OopClosure {
@ -454,7 +440,6 @@ class frame VALUE_OBJ_CLASS_SPEC {
// Verification
void verify(const RegisterMap* map);
static bool verify_return_pc(address x);
static bool is_bci(intptr_t bcx);
// Usage:
// assert(frame::verify_return_pc(return_address), "must be a return pc");