Mercurial > jdk8-mips64-public > hotspot / file diff

     1.1 --- a/src/cpu/sparc/vm/vm_version_sparc.hpp	Fri Nov 22 15:26:37 2013 +0100
     1.2 +++ b/src/cpu/sparc/vm/vm_version_sparc.hpp	Mon Dec 02 11:12:32 2013 +0100
     1.3 @@ -94,7 +94,13 @@
     1.4    static bool is_M_family(int features) { return (features & M_family_m) != 0; }
     1.5    static bool is_T_family(int features) { return (features & T_family_m) != 0; }
     1.6    static bool is_niagara() { return is_T_family(_features); }
     1.7 -  DEBUG_ONLY( static bool is_niagara(int features)  { return (features & sun4v_m) != 0; } )
     1.8 +#ifdef ASSERT
     1.9 +  static bool is_niagara(int features)  {
    1.10 +    // 'sun4v_m' may be defined on both Sun/Oracle Sparc CPUs as well as
    1.11 +    // on Fujitsu Sparc64 CPUs, but only Sun/Oracle Sparcs can be 'niagaras'.
    1.12 +    return (features & sun4v_m) != 0 && (features & sparc64_family_m) == 0;
    1.13 +  }
    1.14 +#endif
    1.15  
    1.16    // Returns true if it is niagara1 (T1).
    1.17    static bool is_T1_model(int features) { return is_T_family(features) && ((features & T1_model_m) != 0); }