jdk-sandbox: comparison hotspot/src/share/vm/utilities/globalDefinitions.hpp

equal deleted inserted replaced

-:f4edb0d9f109
+:21d113ecbf6a
 const int WordAlignmentMask  = (1 << LogBytesPerWord) - 1;
 const int LongAlignmentMask  = (1 << LogBytesPerLong) - 1;
 const int WordsPerLong       = 2;       // Number of stack entries for longs
-const int oopSize            = sizeof(char*);
+const int oopSize            = sizeof(char*); // Full-width oop
+extern int heapOopSize;                       // Oop within a java object
 const int wordSize           = sizeof(char*);
 const int longSize           = sizeof(jlong);
 const int jintSize           = sizeof(jint);
 const int size_tSize         = sizeof(size_t);
+const int BytesPerOop        = BytesPerWord;  // Full-width oop
+extern int LogBytesPerHeapOop;                // Oop within a java object
+extern int LogBitsPerHeapOop;
+extern int BytesPerHeapOop;
+extern int BitsPerHeapOop;
+const int BitsPerJavaInteger = 32;
+const int BitsPerSize_t      = size_tSize * BitsPerByte;
 // Size of a char[] needed to represent a jint as a string in decimal.
 const int jintAsStringSize = 12;
-const int LogBytesPerOop     = LogBytesPerWord;
-const int LogBitsPerOop      = LogBitsPerWord;
-const int BytesPerOop        = 1 << LogBytesPerOop;
-const int BitsPerOop         = 1 << LogBitsPerOop;
-const int BitsPerJavaInteger = 32;
-const int BitsPerSize_t      = size_tSize * BitsPerByte;
 // In fact this should be
 // log2_intptr(sizeof(class JavaThread)) - log2_intptr(64);
 // see os::set_memory_serialize_page()
 #ifdef _LP64
 private:
 char* i;
 };
 // HeapWordSize must be 2^LogHeapWordSize.
-const int HeapWordSize     = sizeof(HeapWord);
+const int HeapWordSize        = sizeof(HeapWord);
 #ifdef _LP64
-const int LogHeapWordSize  = 3;
+const int LogHeapWordSize     = 3;
 #else
-const int LogHeapWordSize  = 2;
+const int LogHeapWordSize     = 2;
 #endif
-const int HeapWordsPerOop  = oopSize      / HeapWordSize;
+const int HeapWordsPerLong    = BytesPerLong / HeapWordSize;
-const int HeapWordsPerLong = BytesPerLong / HeapWordSize;
+const int LogHeapWordsPerLong = LogBytesPerLong - LogHeapWordSize;
 // The larger HeapWordSize for 64bit requires larger heaps
 // for the same application running in 64bit.  See bug 4967770.
 // The minimum alignment to a heap word size is done.  Other
 // parts of the memory system may required additional alignment
 const int MinObjAlignment            = HeapWordsPerLong;
 const int MinObjAlignmentInBytes     = MinObjAlignment * HeapWordSize;
 const int MinObjAlignmentInBytesMask = MinObjAlignmentInBytes - 1;
+const int LogMinObjAlignment         = LogHeapWordsPerLong;
+const int LogMinObjAlignmentInBytes  = LogMinObjAlignment + LogHeapWordSize;
 // Machine dependent stuff
 #include "incls/_globalDefinitions_pd.hpp.incl"
 // The byte alignment to be used by Arena::Amalloc.  See bugid 4169348.
 union jlong_accessor {
 jint  words[2];
 jlong long_value;
 };
-void check_basic_types(); // cannot define here; uses assert
+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_LONG     = 11,
 T_OBJECT   = 12,
 T_ARRAY    = 13,
 T_VOID     = 14,
 T_ADDRESS  = 15,
-T_CONFLICT = 16, // for stack value type with conflicting contents
+T_NARROWOOP= 16,
+T_CONFLICT = 17, // for stack value type with conflicting contents
 T_ILLEGAL  = 99
 };
 inline bool is_java_primitive(BasicType t) {
 return T_BOOLEAN <= t && t <= T_LONG;
 T_SHORT_size   = 1,
 T_INT_size     = 1,
 T_LONG_size    = 2,
 T_OBJECT_size  = 1,
 T_ARRAY_size   = 1,
+T_NARROWOOP_size = 1,
 T_VOID_size    = 0
 };
 // maps a BasicType to its instance field storage type:
 T_ARRAY_aelem_bytes   = 8,
 #else
 T_OBJECT_aelem_bytes  = 4,
 T_ARRAY_aelem_bytes   = 4,
 #endif
+T_NARROWOOP_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

changeset 360	21d113ecbf6a
parent 202	dc13bf0e5d5d
child 392	0b3167e2f2de