src/cpu/x86/vm/vm_version_x86.cpp

rev 3111 : imported patch osx-threadid

*** 1,7 ****
  /*
!  * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
--- 1,7 ----
  /*
!  * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
*** 63,74 ****
  
    VM_Version_StubGenerator(CodeBuffer *c) : StubCodeGenerator(c) {}
  
    address generate_getPsrInfo() {
      // Flags to test CPU type.
!     const uint32_t EFL_AC           = 0x40000;
!     const uint32_t EFL_ID           = 0x200000;
      // Values for when we don't have a CPUID instruction.
      const int      CPU_FAMILY_SHIFT = 8;
      const uint32_t CPU_FAMILY_386   = (3 << CPU_FAMILY_SHIFT);
      const uint32_t CPU_FAMILY_486   = (4 << CPU_FAMILY_SHIFT);
  
--- 63,74 ----
  
    VM_Version_StubGenerator(CodeBuffer *c) : StubCodeGenerator(c) {}
  
    address generate_getPsrInfo() {
      // Flags to test CPU type.
!     const uint32_t HS_EFL_AC           = 0x40000;
!     const uint32_t HS_EFL_ID           = 0x200000;
      // Values for when we don't have a CPUID instruction.
      const int      CPU_FAMILY_SHIFT = 8;
      const uint32_t CPU_FAMILY_386   = (3 << CPU_FAMILY_SHIFT);
      const uint32_t CPU_FAMILY_486   = (4 << CPU_FAMILY_SHIFT);
  
*** 98,108 ****
      __ push(rax);
      __ mov(rcx, rax);
      //
      // if we are unable to change the AC flag, we have a 386
      //
!     __ xorl(rax, EFL_AC);
      __ push(rax);
      __ popf();
      __ pushf();
      __ pop(rax);
      __ cmpptr(rax, rcx);
--- 98,108 ----
      __ push(rax);
      __ mov(rcx, rax);
      //
      // if we are unable to change the AC flag, we have a 386
      //
!     __ xorl(rax, HS_EFL_AC);
      __ push(rax);
      __ popf();
      __ pushf();
      __ pop(rax);
      __ cmpptr(rax, rcx);
*** 116,126 ****
      // If we are unable to change the ID flag, we have a 486 which does
      // not support the "cpuid" instruction.
      //
      __ bind(detect_486);
      __ mov(rax, rcx);
!     __ xorl(rax, EFL_ID);
      __ push(rax);
      __ popf();
      __ pushf();
      __ pop(rax);
      __ cmpptr(rcx, rax);
--- 116,126 ----
      // If we are unable to change the ID flag, we have a 486 which does
      // not support the "cpuid" instruction.
      //
      __ bind(detect_486);
      __ mov(rax, rcx);
!     __ xorl(rax, HS_EFL_ID);
      __ push(rax);
      __ popf();
      __ pushf();
      __ pop(rax);
      __ cmpptr(rcx, rax);