1.1 --- a/src/cpu/x86/vm/vm_version_x86.cpp Fri Feb 17 15:55:27 2012 -0800
1.2 +++ b/src/cpu/x86/vm/vm_version_x86.cpp Sun Feb 19 13:11:39 2012 +0100
1.3 @@ -1,5 +1,5 @@
1.4 /*
1.5 - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
1.6 + * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
1.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1.8 *
1.9 * This code is free software; you can redistribute it and/or modify it
1.10 @@ -65,8 +65,8 @@
1.11
1.12 address generate_getPsrInfo() {
1.13 // Flags to test CPU type.
1.14 - const uint32_t EFL_AC = 0x40000;
1.15 - const uint32_t EFL_ID = 0x200000;
1.16 + const uint32_t HS_EFL_AC = 0x40000;
1.17 + const uint32_t HS_EFL_ID = 0x200000;
1.18 // Values for when we don't have a CPUID instruction.
1.19 const int CPU_FAMILY_SHIFT = 8;
1.20 const uint32_t CPU_FAMILY_386 = (3 << CPU_FAMILY_SHIFT);
1.21 @@ -100,7 +100,7 @@
1.22 //
1.23 // if we are unable to change the AC flag, we have a 386
1.24 //
1.25 - __ xorl(rax, EFL_AC);
1.26 + __ xorl(rax, HS_EFL_AC);
1.27 __ push(rax);
1.28 __ popf();
1.29 __ pushf();
1.30 @@ -118,7 +118,7 @@
1.31 //
1.32 __ bind(detect_486);
1.33 __ mov(rax, rcx);
1.34 - __ xorl(rax, EFL_ID);
1.35 + __ xorl(rax, HS_EFL_ID);
1.36 __ push(rax);
1.37 __ popf();
1.38 __ pushf();
