Mercurial > hg > graal-jvmci-8
comparison src/cpu/x86/vm/c2_globals_x86.hpp @ 4611:d8a09bbba79a
Fix merge
author | Gilles Duboscq <duboscq@ssw.jku.at> |
---|---|
date | Tue, 14 Feb 2012 11:32:21 +0100 |
parents | b70d180ec022 |
children | 33df1aeaebbf |
comparison
equal
deleted
inserted
replaced
4610:717589e14dbd | 4611:d8a09bbba79a |
---|---|
37 define_pd_global(bool, CICompileOSR, true); | 37 define_pd_global(bool, CICompileOSR, true); |
38 define_pd_global(bool, InlineIntrinsics, true); | 38 define_pd_global(bool, InlineIntrinsics, true); |
39 define_pd_global(bool, PreferInterpreterNativeStubs, false); | 39 define_pd_global(bool, PreferInterpreterNativeStubs, false); |
40 define_pd_global(bool, ProfileTraps, true); | 40 define_pd_global(bool, ProfileTraps, true); |
41 define_pd_global(bool, UseOnStackReplacement, true); | 41 define_pd_global(bool, UseOnStackReplacement, true); |
42 define_pd_global(intx, TypeProfileWidth, 2 ); | |
42 #ifdef CC_INTERP | 43 #ifdef CC_INTERP |
43 define_pd_global(bool, ProfileInterpreter, false); | 44 define_pd_global(bool, ProfileInterpreter, false); |
44 #else | 45 #else |
45 define_pd_global(bool, ProfileInterpreter, true); | 46 define_pd_global(bool, ProfileInterpreter, true); |
46 #endif // CC_INTERP | 47 #endif // CC_INTERP |