equal
deleted
inserted
replaced
1131 if (_is_heap_region) { |
1131 if (_is_heap_region) { |
1132 assert(!DynamicDumpSharedSpaces, "must be"); |
1132 assert(!DynamicDumpSharedSpaces, "must be"); |
1133 assert((base - (char*)CompressedKlassPointers::base()) % HeapWordSize == 0, "Sanity"); |
1133 assert((base - (char*)CompressedKlassPointers::base()) % HeapWordSize == 0, "Sanity"); |
1134 if (base != NULL) { |
1134 if (base != NULL) { |
1135 _mapping_offset = (size_t)CompressedOops::encode_not_null((oop)base); |
1135 _mapping_offset = (size_t)CompressedOops::encode_not_null((oop)base); |
1136 assert(_mapping_offset >> 32 == 0, "must be 32-bit only"); |
1136 assert(_mapping_offset == (size_t)(uint32_t)_mapping_offset, "must be 32-bit only"); |
1137 } |
1137 } |
1138 } else { |
1138 } else { |
1139 if (base != NULL) { |
1139 if (base != NULL) { |
1140 assert(base >= (char*)SharedBaseAddress, "must be"); |
1140 assert(base >= (char*)SharedBaseAddress, "must be"); |
1141 _mapping_offset = base - (char*)SharedBaseAddress; |
1141 _mapping_offset = base - (char*)SharedBaseAddress; |
1564 return count; |
1564 return count; |
1565 } |
1565 } |
1566 |
1566 |
1567 address FileMapInfo::decode_start_address(FileMapRegion* spc, bool with_current_oop_encoding_mode) { |
1567 address FileMapInfo::decode_start_address(FileMapRegion* spc, bool with_current_oop_encoding_mode) { |
1568 size_t offset = spc->mapping_offset(); |
1568 size_t offset = spc->mapping_offset(); |
1569 assert((offset >> 32) == 0, "must be 32-bit only"); |
1569 assert(offset == (size_t)(uint32_t)offset, "must be 32-bit only"); |
1570 uint n = (uint)offset; |
1570 uint n = (uint)offset; |
1571 if (with_current_oop_encoding_mode) { |
1571 if (with_current_oop_encoding_mode) { |
1572 return (address)CompressedOops::decode_not_null(n); |
1572 return (address)CompressedOops::decode_not_null(n); |
1573 } else { |
1573 } else { |
1574 return (address)HeapShared::decode_from_archive(n); |
1574 return (address)HeapShared::decode_from_archive(n); |