changeset 35102:c5f050e1f982

6808665: Use486InstrsOnly aborts 32-bit VM Summary: The code supporting -XX:+/-Use486InstrsOnly was removed. Reviewed-by: dholmes, thartmann, vlivanov Contributed-by: Jamsheed Mohammed <jamsheed.c.m@oracle.com>
author thartmann
date Wed, 09 Dec 2015 11:06:39 +0100
parents ac824485668b
children d19354bcbfa6
files hotspot/src/cpu/x86/vm/globals_x86.hpp hotspot/src/cpu/x86/vm/vm_version_x86.cpp
diffstat 2 files changed, 12 insertions(+), 17 deletions(-) [+]
line wrap: on
line diff
--- a/hotspot/src/cpu/x86/vm/globals_x86.hpp	Wed Dec 09 00:30:32 2015 +0300
+++ b/hotspot/src/cpu/x86/vm/globals_x86.hpp	Wed Dec 09 11:06:39 2015 +0100
@@ -175,9 +175,6 @@
           "Use RTM Xend instead of Xabort when lock busy")                  \
                                                                             \
   /* assembler */                                                           \
-  product(bool, Use486InstrsOnly, false,                                    \
-          "Use 80486 Compliant instruction subset")                         \
-                                                                            \
   product(bool, UseCountLeadingZerosInstruction, false,                     \
           "Use count leading zeros instruction")                            \
                                                                             \
--- a/hotspot/src/cpu/x86/vm/vm_version_x86.cpp	Wed Dec 09 00:30:32 2015 +0300
+++ b/hotspot/src/cpu/x86/vm/vm_version_x86.cpp	Wed Dec 09 11:06:39 2015 +0100
@@ -473,23 +473,21 @@
   // i486 internal cache is both I&D and has a 16-byte line size
   _L1_data_cache_line_size = 16;
 
-  if (!Use486InstrsOnly) {
-    // Get raw processor info
+  // Get raw processor info
 
-    get_cpu_info_stub(&_cpuid_info);
+  get_cpu_info_stub(&_cpuid_info);
 
-    assert_is_initialized();
-    _cpu = extended_cpu_family();
-    _model = extended_cpu_model();
-    _stepping = cpu_stepping();
+  assert_is_initialized();
+  _cpu = extended_cpu_family();
+  _model = extended_cpu_model();
+  _stepping = cpu_stepping();
 
-    if (cpu_family() > 4) { // it supports CPUID
-      _cpuFeatures = feature_flags();
-      // Logical processors are only available on P4s and above,
-      // and only if hyperthreading is available.
-      _logical_processors_per_package = logical_processor_count();
-      _L1_data_cache_line_size = L1_line_size();
-    }
+  if (cpu_family() > 4) { // it supports CPUID
+    _cpuFeatures = feature_flags();
+    // Logical processors are only available on P4s and above,
+    // and only if hyperthreading is available.
+    _logical_processors_per_package = logical_processor_count();
+    _L1_data_cache_line_size = L1_line_size();
   }
 
   _supports_cx8 = supports_cmpxchg8();