Mercurial > hg > truffle
diff src/os_cpu/solaris_sparc/vm/vm_version_solaris_sparc.cpp @ 14909:4ca6dc0799b6
Backout jdk9 merge
author | Gilles Duboscq <duboscq@ssw.jku.at> |
---|---|
date | Tue, 01 Apr 2014 13:57:07 +0200 |
parents | 73b1030c6253 |
children | 52b4284cb496 |
line wrap: on
line diff
--- a/src/os_cpu/solaris_sparc/vm/vm_version_solaris_sparc.cpp Tue Apr 01 14:09:03 2014 +0200 +++ b/src/os_cpu/solaris_sparc/vm/vm_version_solaris_sparc.cpp Tue Apr 01 13:57:07 2014 +0200 @@ -75,19 +75,13 @@ do_sysinfo(SI_ARCHITECTURE_64, "sparcv9", &features, generic_v9_m); // Extract valid instruction set extensions. - uint_t avs[2]; - uint_t avn = os::Solaris::getisax(avs, 2); - assert(avn <= 2, "should return two or less av's"); - uint_t av = avs[0]; + uint_t av; + uint_t avn = os::Solaris::getisax(&av, 1); + assert(avn == 1, "should only return one av"); #ifndef PRODUCT - if (PrintMiscellaneous && Verbose) { - tty->print("getisax(2) returned: " PTR32_FORMAT, av); - if (avn > 1) { - tty->print(", " PTR32_FORMAT, avs[1]); - } - tty->cr(); - } + if (PrintMiscellaneous && Verbose) + tty->print_cr("getisax(2) returned: " PTR32_FORMAT, av); #endif if (av & AV_SPARC_MUL32) features |= hardware_mul32_m; @@ -97,13 +91,6 @@ if (av & AV_SPARC_POPC) features |= hardware_popc_m; if (av & AV_SPARC_VIS) features |= vis1_instructions_m; if (av & AV_SPARC_VIS2) features |= vis2_instructions_m; - if (avn > 1) { - uint_t av2 = avs[1]; -#ifndef AV2_SPARC_SPARC5 -#define AV2_SPARC_SPARC5 0x00000008 /* The 29 new fp and sub instructions */ -#endif - if (av2 & AV2_SPARC_SPARC5) features |= sparc5_instructions_m; - } // Next values are not defined before Solaris 10 // but Solaris 8 is used for jdk6 update builds. @@ -132,11 +119,6 @@ #endif if (av & AV_SPARC_CBCOND) features |= cbcond_instructions_m; -#ifndef AV_SPARC_AES -#define AV_SPARC_AES 0x00020000 /* aes instrs supported */ -#endif - if (av & AV_SPARC_AES) features |= aes_instructions_m; - } else { // getisax(2) failed, use the old legacy code. #ifndef PRODUCT