*** old/src/cpu/x86/vm/vm_version_x86.cpp	Fri Mar 28 18:18:29 2014
--- new/src/cpu/x86/vm/vm_version_x86.cpp	Fri Mar 28 18:18:29 2014

*** 383,403 ****
--- 383,415 ----
      return start;
    };
  };
  
  
+ void VM_Version::getPsrInfo_wrapper() {
+   getPsrInfo_stub(&_cpuid_info);
+ }
+ 
+ #ifndef TARGET_OS_FAMILY_windows
+   #define CALL_TEST_FUNC_WITH_WRAPPER_IF_NEEDED(f) f()
+ #endif
+ 
  void VM_Version::get_processor_features() {
  
    _cpu = 4; // 486 by default
    _model = 0;
    _stepping = 0;
    _cpuFeatures = 0;
    _logical_processors_per_package = 1;
  
    if (!Use486InstrsOnly) {
      // Get raw processor info
      getPsrInfo_stub(&_cpuid_info);
+ 
+     // Some platforms (like Win*) need a wrapper around here
+     // in order to properly handle SEGV for YMM registers test.
+     CALL_TEST_FUNC_WITH_WRAPPER_IF_NEEDED(getPsrInfo_wrapper);
+ 
      assert_is_initialized();
      _cpu = extended_cpu_family();
      _model = extended_cpu_model();
      _stepping = cpu_stepping();