equal
deleted
inserted
replaced
166 void FileMapInfo::FileMapHeader::populate(FileMapInfo* mapinfo, size_t alignment) { |
166 void FileMapInfo::FileMapHeader::populate(FileMapInfo* mapinfo, size_t alignment) { |
167 _magic = 0xf00baba2; |
167 _magic = 0xf00baba2; |
168 _version = _current_version; |
168 _version = _current_version; |
169 _alignment = alignment; |
169 _alignment = alignment; |
170 _obj_alignment = ObjectAlignmentInBytes; |
170 _obj_alignment = ObjectAlignmentInBytes; |
|
171 _compact_strings = CompactStrings; |
171 _narrow_oop_mode = Universe::narrow_oop_mode(); |
172 _narrow_oop_mode = Universe::narrow_oop_mode(); |
172 _narrow_oop_shift = Universe::narrow_oop_shift(); |
173 _narrow_oop_shift = Universe::narrow_oop_shift(); |
173 _max_heap_size = MaxHeapSize; |
174 _max_heap_size = MaxHeapSize; |
174 _narrow_klass_base = Universe::narrow_klass_base(); |
175 _narrow_klass_base = Universe::narrow_klass_base(); |
175 _narrow_klass_shift = Universe::narrow_klass_shift(); |
176 _narrow_klass_shift = Universe::narrow_klass_shift(); |
898 FileMapInfo::fail_continue("The shared archive file's ObjectAlignmentInBytes of %d" |
899 FileMapInfo::fail_continue("The shared archive file's ObjectAlignmentInBytes of %d" |
899 " does not equal the current ObjectAlignmentInBytes of " INTX_FORMAT ".", |
900 " does not equal the current ObjectAlignmentInBytes of " INTX_FORMAT ".", |
900 _obj_alignment, ObjectAlignmentInBytes); |
901 _obj_alignment, ObjectAlignmentInBytes); |
901 return false; |
902 return false; |
902 } |
903 } |
|
904 if (_compact_strings != CompactStrings) { |
|
905 FileMapInfo::fail_continue("The shared archive file's CompactStrings setting (%s)" |
|
906 " does not equal the current CompactStrings setting (%s).", |
|
907 _compact_strings ? "enabled" : "disabled", |
|
908 CompactStrings ? "enabled" : "disabled"); |
|
909 return false; |
|
910 } |
903 |
911 |
904 return true; |
912 return true; |
905 } |
913 } |
906 |
914 |
907 bool FileMapInfo::validate_header() { |
915 bool FileMapInfo::validate_header() { |