Mercurial > hg > truffle
comparison src/share/vm/memory/universe.cpp @ 11019:eaf3742822ec
Merge
author | chegar |
---|---|
date | Mon, 17 Jun 2013 11:17:49 +0100 |
parents | ce9ecec70f99 0def34ab1c98 |
children | 3a0774193f71 |
comparison
equal
deleted
inserted
replaced
11018:0861193d358a | 11019:eaf3742822ec |
---|---|
228 _pd_implies_cache->serialize(f); | 228 _pd_implies_cache->serialize(f); |
229 } | 229 } |
230 | 230 |
231 void Universe::check_alignment(uintx size, uintx alignment, const char* name) { | 231 void Universe::check_alignment(uintx size, uintx alignment, const char* name) { |
232 if (size < alignment || size % alignment != 0) { | 232 if (size < alignment || size % alignment != 0) { |
233 ResourceMark rm; | 233 vm_exit_during_initialization( |
234 stringStream st; | 234 err_msg("Size of %s (" UINTX_FORMAT " bytes) must be aligned to " UINTX_FORMAT " bytes", name, size, alignment)); |
235 st.print("Size of %s (" UINTX_FORMAT " bytes) must be aligned to " UINTX_FORMAT " bytes", name, size, alignment); | |
236 char* error = st.as_string(); | |
237 vm_exit_during_initialization(error); | |
238 } | 235 } |
239 } | 236 } |
240 | 237 |
241 void initialize_basic_type_klass(Klass* k, TRAPS) { | 238 void initialize_basic_type_klass(Klass* k, TRAPS) { |
242 Klass* ok = SystemDictionary::Object_klass(); | 239 Klass* ok = SystemDictionary::Object_klass(); |
917 } | 914 } |
918 } | 915 } |
919 } | 916 } |
920 | 917 |
921 if (!total_rs.is_reserved()) { | 918 if (!total_rs.is_reserved()) { |
922 vm_exit_during_initialization(err_msg("Could not reserve enough space for object heap %d bytes", total_reserved)); | 919 vm_exit_during_initialization(err_msg("Could not reserve enough space for " SIZE_FORMAT "KB object heap", total_reserved/K)); |
923 return total_rs; | 920 return total_rs; |
924 } | 921 } |
925 | 922 |
926 // Split the reserved space into main Java heap and a space for | 923 // Split the reserved space into main Java heap and a space for |
927 // classes so that they can be compressed using the same algorithm | 924 // classes so that they can be compressed using the same algorithm |