archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 06:45:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

6861660: OopMapBlock count/size confusion

Browse source 
Reviewed-by: tonyp, iveresov
This commit is contained in:
John Coomes 2009-08-11 15:37:23 -07:00
parent 6a97a03610
commit 662adda5e6
9 changed files with 111 additions and 83 deletions
Download patch file Download diff file Expand all files Collapse all files

53
hotspot/src/share/vm/oops/instanceKlass.hpp
View file

@ -71,7 +71,6 @@
// forward declaration for class -- see below for definition
class SuperTypeClosure;
class OopMapBlock;
class JNIid;
class jniIdMapBase;
class BreakpointInfo;
@ -99,6 +98,29 @@ class FieldPrinter: public FieldClosure {
};
#endif // !PRODUCT
// ValueObjs embedded in klass. Describes where oops are located in instances of
// this klass.
class OopMapBlock VALUE_OBJ_CLASS_SPEC {
public:
// Byte offset of the first oop mapped by this block.
jushort offset() const { return _offset; }
void set_offset(jushort offset) { _offset = offset; }
// Number of oops in this block.
jushort count() const { return _count; }
void set_count(jushort count) { _count = count; }
// sizeof(OopMapBlock) in HeapWords.
static const int size_in_words() {
return align_size_up(int(sizeof(OopMapBlock)), HeapWordSize) >>
LogHeapWordSize;
}
private:
jushort _offset;
jushort _count;
};
class instanceKlass: public Klass {
friend class VMStructs;
public:
@ -191,7 +213,7 @@ class instanceKlass: public Klass {
int _nonstatic_field_size;
int _static_field_size; // number words used by static fields (oop and non-oop) in this klass
int _static_oop_field_size;// number of static oop fields in this klass
int _nonstatic_oop_map_size;// number of nonstatic oop-map blocks allocated at end of this klass
int _nonstatic_oop_map_size;// size in words of nonstatic oop map blocks
bool _is_marked_dependent; // used for marking during flushing and deoptimization
bool _rewritten; // methods rewritten.
bool _has_nonstatic_fields; // for sizing with UseCompressedOops
@ -424,8 +446,16 @@ class instanceKlass: public Klass {
void set_source_debug_extension(symbolOop n){ oop_store_without_check((oop*) &_source_debug_extension, (oop) n); }
// nonstatic oop-map blocks
int nonstatic_oop_map_size() const { return _nonstatic_oop_map_size; }
void set_nonstatic_oop_map_size(int size) { _nonstatic_oop_map_size = size; }
static int nonstatic_oop_map_size(int oop_map_count) {
return oop_map_count * OopMapBlock::size_in_words();
}
int nonstatic_oop_map_count() const {
return _nonstatic_oop_map_size / OopMapBlock::size_in_words();
}
int nonstatic_oop_map_size() const { return _nonstatic_oop_map_size; }
void set_nonstatic_oop_map_size(int words) {
_nonstatic_oop_map_size = words;
}
// RedefineClasses() support for previous versions:
void add_previous_version(instanceKlassHandle ikh, BitMap *emcp_methods,
@ -839,21 +869,6 @@ inline u2 instanceKlass::next_method_idnum() {
}
// ValueObjs embedded in klass. Describes where oops are located in instances of this klass.
class OopMapBlock VALUE_OBJ_CLASS_SPEC {
private:
jushort _offset; // Offset of first oop in oop-map block
jushort _length; // Length of oop-map block
public:
// Accessors
jushort offset() const { return _offset; }
void set_offset(jushort offset) { _offset = offset; }
jushort length() const { return _length; }
void set_length(jushort length) { _length = length; }
};
/* JNIid class for jfieldIDs only */
class JNIid: public CHeapObj {
friend class VMStructs;