Mercurial > hg > truffle
diff src/share/vm/runtime/frame.hpp @ 6948:e522a00b91aa
Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/ after NPG - C++ build works
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Mon, 12 Nov 2012 23:14:12 +0100 |
parents | 957c266d8bc5 da91efe96a93 |
children | 291ffc492eb6 |
line wrap: on
line diff
--- a/src/share/vm/runtime/frame.hpp Mon Nov 12 18:11:17 2012 +0100 +++ b/src/share/vm/runtime/frame.hpp Mon Nov 12 23:14:12 2012 +0100 @@ -26,7 +26,7 @@ #define SHARE_VM_RUNTIME_FRAME_HPP #include "asm/assembler.hpp" -#include "oops/methodOop.hpp" +#include "oops/method.hpp" #include "runtime/basicLock.hpp" #include "runtime/monitorChunk.hpp" #include "runtime/registerMap.hpp" @@ -197,7 +197,7 @@ oop* obj_at_addr(int offset) const { return (oop*) addr_at(offset); } - oop* adjusted_obj_at_addr(methodOop method, int index) { return obj_at_addr(adjust_offset(method, index)); } + oop* adjusted_obj_at_addr(Method* method, int index) { return obj_at_addr(adjust_offset(method, index)); } private: jint* int_at_addr(int offset) const { return (jint*) addr_at(offset); } @@ -345,10 +345,10 @@ public: // Method & constant pool cache - methodOop interpreter_frame_method() const; - void interpreter_frame_set_method(methodOop method); - methodOop* interpreter_frame_method_addr() const; - constantPoolCacheOop* interpreter_frame_cache_addr() const; + Method* interpreter_frame_method() const; + void interpreter_frame_set_method(Method* method); + Method** interpreter_frame_method_addr() const; + ConstantPoolCache** interpreter_frame_cache_addr() const; #ifdef PPC oop* interpreter_frame_mirror_addr() const; #endif @@ -424,12 +424,15 @@ void oops_do_internal(OopClosure* f, CodeBlobClosure* cf, RegisterMap* map, bool use_interpreter_oop_map_cache); void oops_entry_do(OopClosure* f, const RegisterMap* map); void oops_code_blob_do(OopClosure* f, CodeBlobClosure* cf, const RegisterMap* map); - int adjust_offset(methodOop method, int index); // helper for above fn + int adjust_offset(Method* method, int index); // helper for above fn public: // Memory management void oops_do(OopClosure* f, CodeBlobClosure* cf, RegisterMap* map) { oops_do_internal(f, cf, map, true); } void nmethods_do(CodeBlobClosure* cf); + // 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();