comparison src/share/vm/utilities/globalDefinitions.hpp @ 4970:33df1aeaebbf

Merge with http://hg.openjdk.java.net/hsx/hsx24/hotspot/
author Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
date Mon, 27 Feb 2012 13:10:13 +0100
parents 04b9a2566eec 94ec88ca68e2
children 12706c5b39bc
comparison
equal deleted inserted replaced
4703:2cfb7fb2dce7 4970:33df1aeaebbf
173 173
174 const int MILLIUNITS = 1000; // milli units per base unit 174 const int MILLIUNITS = 1000; // milli units per base unit
175 const int MICROUNITS = 1000000; // micro units per base unit 175 const int MICROUNITS = 1000000; // micro units per base unit
176 const int NANOUNITS = 1000000000; // nano units per base unit 176 const int NANOUNITS = 1000000000; // nano units per base unit
177 177
178 const jlong NANOSECS_PER_SEC = CONST64(1000000000);
179 const jint NANOSECS_PER_MILLISEC = 1000000;
180
178 inline const char* proper_unit_for_byte_size(size_t s) { 181 inline const char* proper_unit_for_byte_size(size_t s) {
179 if (s >= 10*M) { 182 if (s >= 10*M) {
180 return "M"; 183 return "M";
181 } else if (s >= 10*K) { 184 } else if (s >= 10*K) {
182 return "K"; 185 return "K";
292 295
293 const jubyte max_jubyte = (jubyte)-1; // 0xFF largest jubyte 296 const jubyte max_jubyte = (jubyte)-1; // 0xFF largest jubyte
294 const jushort max_jushort = (jushort)-1; // 0xFFFF largest jushort 297 const jushort max_jushort = (jushort)-1; // 0xFFFF largest jushort
295 const juint max_juint = (juint)-1; // 0xFFFFFFFF largest juint 298 const juint max_juint = (juint)-1; // 0xFFFFFFFF largest juint
296 const julong max_julong = (julong)-1; // 0xFF....FF largest julong 299 const julong max_julong = (julong)-1; // 0xFF....FF largest julong
300
301 typedef jbyte s1;
302 typedef jshort s2;
303 typedef jint s4;
304 typedef jlong s8;
297 305
298 //---------------------------------------------------------------------------------------------------- 306 //----------------------------------------------------------------------------------------------------
299 // JVM spec restrictions 307 // JVM spec restrictions
300 308
301 const int max_method_code_size = 64*K - 1; // JVM spec, 2nd ed. section 4.8.1 (p.134) 309 const int max_method_code_size = 64*K - 1; // JVM spec, 2nd ed. section 4.8.1 (p.134)