diff src/os/solaris/dtrace/generateJvmOffsets.cpp @ 6725:da91efe96a93

6964458: Reimplement class meta-data storage to use native memory Summary: Remove PermGen, allocate meta-data in metaspace linked to class loaders, rewrite GC walking, rewrite and rename metadata to be C++ classes Reviewed-by: jmasa, stefank, never, coleenp, kvn, brutisso, mgerdin, dholmes, jrose, twisti, roland Contributed-by: jmasa <jon.masamitsu@oracle.com>, stefank <stefan.karlsson@oracle.com>, mgerdin <mikael.gerdin@oracle.com>, never <tom.rodriguez@oracle.com>
author coleenp
date Sat, 01 Sep 2012 13:25:18 -0400
parents 2fe087c3e814
children 8e47bac5643a
line wrap: on
line diff
--- a/src/os/solaris/dtrace/generateJvmOffsets.cpp	Fri Aug 31 16:39:35 2012 -0700
+++ b/src/os/solaris/dtrace/generateJvmOffsets.cpp	Sat Sep 01 13:25:18 2012 -0400
@@ -45,9 +45,9 @@
 #include "memory/heap.hpp"
 #include "memory/memRegion.hpp"
 #include "memory/universe.hpp"
-#include "oops/constMethodOop.hpp"
+#include "oops/constMethod.hpp"
 #include "oops/klass.hpp"
-#include "oops/methodOop.hpp"
+#include "oops/method.hpp"
 #include "oops/oop.hpp"
 #include "oops/symbol.hpp"
 #include "runtime/virtualspace.hpp"
@@ -205,7 +205,7 @@
 #endif
 
   GEN_OFFS(Klass, _name);
-  GEN_OFFS(constantPoolOopDesc, _pool_holder);
+  GEN_OFFS(ConstantPool, _pool_holder);
   printf("\n");
 
   GEN_VALUE(OFFSET_HeapBlockHeader_used, offset_of(HeapBlock::Header, _used));
@@ -213,21 +213,21 @@
   printf("\n");
 
   GEN_VALUE(AccessFlags_NATIVE, JVM_ACC_NATIVE);
-  GEN_VALUE(constMethodOopDesc_has_linenumber_table, constMethodOopDesc::_has_linenumber_table);
+  GEN_VALUE(ConstMethod_has_linenumber_table, ConstMethod::_has_linenumber_table);
   GEN_OFFS(AccessFlags, _flags);
   GEN_OFFS(Symbol, _length);
   GEN_OFFS(Symbol, _body);
   printf("\n");
 
-  GEN_OFFS(methodOopDesc, _constMethod);
-  GEN_OFFS(methodOopDesc, _access_flags);
+  GEN_OFFS(Method, _constMethod);
+  GEN_OFFS(Method, _access_flags);
   printf("\n");
 
-  GEN_OFFS(constMethodOopDesc, _constants);
-  GEN_OFFS(constMethodOopDesc, _flags);
-  GEN_OFFS(constMethodOopDesc, _code_size);
-  GEN_OFFS(constMethodOopDesc, _name_index);
-  GEN_OFFS(constMethodOopDesc, _signature_index);
+  GEN_OFFS(ConstMethod, _constants);
+  GEN_OFFS(ConstMethod, _flags);
+  GEN_OFFS(ConstMethod, _code_size);
+  GEN_OFFS(ConstMethod, _name_index);
+  GEN_OFFS(ConstMethod, _signature_index);
   printf("\n");
 
   GEN_OFFS(CodeHeap, _memory);
@@ -250,7 +250,7 @@
   printf("\n");
 
   GEN_OFFS(nmethod, _method);
-  GEN_OFFS(nmethod, _oops_offset);
+  GEN_OFFS(nmethod, _metadata_offset);
   GEN_OFFS(nmethod, _scopes_data_offset);
   GEN_OFFS(nmethod, _scopes_pcs_offset);
   GEN_OFFS(nmethod, _handler_table_offset);
@@ -268,12 +268,12 @@
 
   GEN_VALUE(SIZE_HeapBlockHeader, sizeof(HeapBlock::Header));
   GEN_SIZE(oopDesc);
-  GEN_SIZE(constantPoolOopDesc);
+  GEN_SIZE(ConstantPool);
   printf("\n");
 
   GEN_SIZE(PcDesc);
-  GEN_SIZE(methodOopDesc);
-  GEN_SIZE(constMethodOopDesc);
+  GEN_SIZE(Method);
+  GEN_SIZE(ConstMethod);
   GEN_SIZE(nmethod);
   GEN_SIZE(CodeBlob);
   GEN_SIZE(BufferBlob);