graal-jvmci-8: src/share/vm/utilities/globalDefinitions.hpp comparison

comparison src/share/vm/utilities/globalDefinitions.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 8e47bac5643a
children	606964349cf4

comparison

equal deleted inserted replaced

-:ae13cc658b80
+:e522a00b91aa
 public:
 char* value() { return i; }
 #endif
 };
+// Analogous opaque struct for metadata allocated from
+// metaspaces.
+class MetaWord {
+friend class VMStructs;
+private:
+char* i;
+};
 // HeapWordSize must be 2^LogHeapWordSize.
 const int HeapWordSize        = sizeof(HeapWord);
 #ifdef _LP64
 const int LogHeapWordSize     = 3;
 #else
 }
 // A version specialized for HeapWord*'s.
 inline size_t pointer_delta(const HeapWord* left, const HeapWord* right) {
 return pointer_delta(left, right, sizeof(HeapWord));
 }
+// A version specialized for MetaWord*'s.
+inline size_t pointer_delta(const MetaWord* left, const MetaWord* right) {
+return pointer_delta(left, right, sizeof(MetaWord));
+}
 //
 // ANSI C++ does not allow casting from one pointer type to a function pointer
 // directly without at best a warning. This macro accomplishes it silently
 // In every case that is present at this point the value be cast is a pointer
 extern int MinObjAlignmentInBytesMask;
 extern int LogMinObjAlignment;
 extern int LogMinObjAlignmentInBytes;
+const int LogKlassAlignmentInBytes = 3;
+const int LogKlassAlignment        = LogKlassAlignmentInBytes - LogHeapWordSize;
+const int KlassAlignmentInBytes    = 1 << LogKlassAlignmentInBytes;
+const int KlassAlignment           = KlassAlignmentInBytes / HeapWordSize;
+// Klass encoding metaspace max size
+const uint64_t KlassEncodingMetaspaceMax = (uint64_t(max_juint) + 1) << LogKlassAlignmentInBytes;
 // Machine dependent stuff
 #ifdef TARGET_ARCH_x86
 # include "globalDefinitions_x86.hpp"
 #endif
 void basic_types_init(); // cannot define here; uses assert
 // NOTE: replicated in SA in vm/agent/sun/jvm/hotspot/runtime/BasicType.java
 enum BasicType {
-T_BOOLEAN  =  4,
+T_BOOLEAN     =  4,
-T_CHAR     =  5,
+T_CHAR        =  5,
-T_FLOAT    =  6,
+T_FLOAT       =  6,
-T_DOUBLE   =  7,
+T_DOUBLE      =  7,
-T_BYTE     =  8,
+T_BYTE        =  8,
-T_SHORT    =  9,
+T_SHORT       =  9,
-T_INT      = 10,
+T_INT         = 10,
-T_LONG     = 11,
+T_LONG        = 11,
-T_OBJECT   = 12,
+T_OBJECT      = 12,
-T_ARRAY    = 13,
+T_ARRAY       = 13,
-T_VOID     = 14,
+T_VOID        = 14,
-T_ADDRESS  = 15,
+T_ADDRESS     = 15,
-T_NARROWOOP= 16,
+T_NARROWOOP   = 16,
-T_CONFLICT = 17, // for stack value type with conflicting contents
+T_METADATA    = 17,
-T_ILLEGAL  = 99
+T_NARROWKLASS = 18,
+T_CONFLICT    = 19, // for stack value type with conflicting contents
+T_ILLEGAL     = 99
 };
 inline bool is_java_primitive(BasicType t) {
 return T_BOOLEAN <= t && t <= T_LONG;
 }
 extern size_t lcm(size_t a, size_t b);
 // NOTE: replicated in SA in vm/agent/sun/jvm/hotspot/runtime/BasicType.java
 enum BasicTypeSize {
-T_BOOLEAN_size = 1,
+T_BOOLEAN_size     = 1,
-T_CHAR_size    = 1,
+T_CHAR_size        = 1,
-T_FLOAT_size   = 1,
+T_FLOAT_size       = 1,
-T_DOUBLE_size  = 2,
+T_DOUBLE_size      = 2,
-T_BYTE_size    = 1,
+T_BYTE_size        = 1,
-T_SHORT_size   = 1,
+T_SHORT_size       = 1,
-T_INT_size     = 1,
+T_INT_size         = 1,
-T_LONG_size    = 2,
+T_LONG_size        = 2,
-T_OBJECT_size  = 1,
+T_OBJECT_size      = 1,
-T_ARRAY_size   = 1,
+T_ARRAY_size       = 1,
-T_NARROWOOP_size = 1,
+T_NARROWOOP_size   = 1,
-T_VOID_size    = 0
+T_NARROWKLASS_size = 1,
+T_VOID_size        = 0
 };
 // maps a BasicType to its instance field storage type:
 // all sub-word integral types are widened to T_INT
 extern BasicType type2wfield[T_CONFLICT+1];
 // size in bytes
 enum ArrayElementSize {
-T_BOOLEAN_aelem_bytes = 1,
+T_BOOLEAN_aelem_bytes     = 1,
-T_CHAR_aelem_bytes    = 2,
+T_CHAR_aelem_bytes        = 2,
-T_FLOAT_aelem_bytes   = 4,
+T_FLOAT_aelem_bytes       = 4,
-T_DOUBLE_aelem_bytes  = 8,
+T_DOUBLE_aelem_bytes      = 8,
-T_BYTE_aelem_bytes    = 1,
+T_BYTE_aelem_bytes        = 1,
-T_SHORT_aelem_bytes   = 2,
+T_SHORT_aelem_bytes       = 2,
-T_INT_aelem_bytes     = 4,
+T_INT_aelem_bytes         = 4,
-T_LONG_aelem_bytes    = 8,
+T_LONG_aelem_bytes        = 8,
 #ifdef _LP64
-T_OBJECT_aelem_bytes  = 8,
+T_OBJECT_aelem_bytes      = 8,
-T_ARRAY_aelem_bytes   = 8,
+T_ARRAY_aelem_bytes       = 8,
 #else
-T_OBJECT_aelem_bytes  = 4,
+T_OBJECT_aelem_bytes      = 4,
-T_ARRAY_aelem_bytes   = 4,
+T_ARRAY_aelem_bytes       = 4,
 #endif
-T_NARROWOOP_aelem_bytes = 4,
+T_NARROWOOP_aelem_bytes   = 4,
-T_VOID_aelem_bytes    = 0
+T_NARROWKLASS_aelem_bytes = 4,
+T_VOID_aelem_bytes        = 0
 };
 extern int _type2aelembytes[T_CONFLICT+1]; // maps a BasicType to nof bytes used by its array element
 #ifdef ASSERT
 extern int type2aelembytes(BasicType t, bool allow_address = false); // asserts
 class PeriodicTask;
 class JavaCallWrapper;
 class   oopDesc;
+class   metaDataOopDesc;
 class NativeCall;
 class zone;
 const int      badResourceValue = 0xAB;                     // value used to zap resource area
 const int      freeBlockPad     = 0xBA;                     // value used to pad freed blocks.
 const int      uninitBlockPad   = 0xF1;                     // value used to zap newly malloc'd blocks.
 const intptr_t badJNIHandleVal  = (intptr_t) CONST64(0xFEFEFEFEFEFEFEFE); // value used to zap jni handle area
 const juint    badHeapWordVal   = 0xBAADBABE;               // value used to zap heap after GC
+const juint    badMetaWordVal   = 0xBAADFADE;               // value used to zap metadata heap after GC
 const int      badCodeHeapNewVal= 0xCC;                     // value used to zap Code heap at allocation
 const int      badCodeHeapFreeVal = 0xDD;                   // value used to zap Code heap at deallocation
 // (These must be implemented as #defines because C++ compilers are

Mercurial > hg > graal-jvmci-8

comparison src/share/vm/utilities/globalDefinitions.hpp @ 6948:e522a00b91aa