Mercurial > hg > truffle

comparison src/share/vm/utilities/globalDefinitions.hpp @ 17810:62c54fcc0a35

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author kvn
date Tue, 25 Mar 2014 17:07:36 -0700
parents 3514ee402842 606acabe7b5c
children 7384f6a12fc1
comparison
equal deleted inserted replaced
17809:a433eb716ce1 17810:62c54fcc0a35
370 370
371 // Klass encoding metaspace max size 371 // Klass encoding metaspace max size
372 const uint64_t KlassEncodingMetaspaceMax = (uint64_t(max_juint) + 1) << LogKlassAlignmentInBytes; 372 const uint64_t KlassEncodingMetaspaceMax = (uint64_t(max_juint) + 1) << LogKlassAlignmentInBytes;
373 373
374 // Machine dependent stuff 374 // Machine dependent stuff
375
376 #if defined(X86) && defined(COMPILER2) && !defined(JAVASE_EMBEDDED)
377 // Include Restricted Transactional Memory lock eliding optimization
378 #define INCLUDE_RTM_OPT 1
379 #define RTM_OPT_ONLY(code) code
380 #else
381 #define INCLUDE_RTM_OPT 0
382 #define RTM_OPT_ONLY(code)
383 #endif
384 // States of Restricted Transactional Memory usage.
385 enum RTMState {
386 NoRTM = 0x2, // Don't use RTM
387 UseRTM = 0x1, // Use RTM
388 ProfileRTM = 0x0 // Use RTM with abort ratio calculation
389 };
375 390
376 #ifdef TARGET_ARCH_x86 391 #ifdef TARGET_ARCH_x86
377 # include "globalDefinitions_x86.hpp" 392 # include "globalDefinitions_x86.hpp"
378 #endif 393 #endif
379 #ifdef TARGET_ARCH_sparc 394 #ifdef TARGET_ARCH_sparc