Mercurial > hg > truffle
diff src/cpu/sparc/vm/vm_version_sparc.hpp @ 13423:eae426d683f6
8029190: VM_Version::determine_features() asserts on Fujitsu Sparc64 CPUs
Summary: fix code to allow testing on Fujitsu Sparc64 CPUs
Reviewed-by: kvn
| author | simonis |
|---|---|
| date | Mon, 02 Dec 2013 11:12:32 +0100 |
| parents | 46c544b8fbfc |
| children | de6a9e811145 |
line wrap: on
line diff
--- a/src/cpu/sparc/vm/vm_version_sparc.hpp Fri Nov 22 15:26:37 2013 +0100 +++ b/src/cpu/sparc/vm/vm_version_sparc.hpp Mon Dec 02 11:12:32 2013 +0100 @@ -94,7 +94,13 @@ static bool is_M_family(int features) { return (features & M_family_m) != 0; } static bool is_T_family(int features) { return (features & T_family_m) != 0; } static bool is_niagara() { return is_T_family(_features); } - DEBUG_ONLY( static bool is_niagara(int features) { return (features & sun4v_m) != 0; } ) +#ifdef ASSERT + static bool is_niagara(int features) { + // 'sun4v_m' may be defined on both Sun/Oracle Sparc CPUs as well as + // on Fujitsu Sparc64 CPUs, but only Sun/Oracle Sparcs can be 'niagaras'. + return (features & sun4v_m) != 0 && (features & sparc64_family_m) == 0; + } +#endif // Returns true if it is niagara1 (T1). static bool is_T1_model(int features) { return is_T_family(features) && ((features & T1_model_m) != 0); }