< prev index next >

src/hotspot/cpu/x86/vm_version_ext_x86.cpp

Print this page

        

*** 1,7 **** /* ! * Copyright (c) 2013, 2019, 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) 2013, 2018, 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.
*** 41,54 **** CPU_FAMILY_PENTIUM = 5, CPU_FAMILY_PENTIUMPRO = 6, // Same family several models CPU_FAMILY_PENTIUM_4 = 0xF } FamilyFlag; ! typedef enum { ! RDTSCP_FLAG = 0x08000000, // bit 27 ! INTEL64_FLAG = 0x20000000 // bit 29 ! } _featureExtendedEdxFlag; #define CPUID_STANDARD_FN 0x0 #define CPUID_STANDARD_FN_1 0x1 #define CPUID_STANDARD_FN_4 0x4 #define CPUID_STANDARD_FN_B 0xb --- 41,54 ---- CPU_FAMILY_PENTIUM = 5, CPU_FAMILY_PENTIUMPRO = 6, // Same family several models CPU_FAMILY_PENTIUM_4 = 0xF } FamilyFlag; ! typedef enum { ! RDTSCP_FLAG = 0x08000000, // bit 27 ! INTEL64_FLAG = 0x20000000 // bit 29 ! } _featureExtendedEdxFlag; #define CPUID_STANDARD_FN 0x0 #define CPUID_STANDARD_FN_1 0x1 #define CPUID_STANDARD_FN_4 0x4 #define CPUID_STANDARD_FN_B 0xb
*** 338,351 **** if (is_amd()) { return !is_amd_Barcelona(); } - if (is_hygon()) { - return true; - } - return false; } void VM_Version_Ext::resolve_cpu_information_details(void) { --- 338,347 ----
*** 401,424 **** } const char* VM_Version_Ext::cpu_family_description(void) { int cpu_family_id = extended_cpu_family(); if (is_amd()) { ! if (cpu_family_id < ExtendedFamilyIdLength_AMD) { ! return _family_id_amd[cpu_family_id]; ! } } if (is_intel()) { if (cpu_family_id == CPU_FAMILY_PENTIUMPRO) { return cpu_model_description(); } ! if (cpu_family_id < ExtendedFamilyIdLength_INTEL) { ! return _family_id_intel[cpu_family_id]; ! } ! } ! if (is_hygon()) { ! return "Dhyana"; } return "Unknown x86"; } int VM_Version_Ext::cpu_type_description(char* const buf, size_t buf_len) { --- 397,413 ---- } const char* VM_Version_Ext::cpu_family_description(void) { int cpu_family_id = extended_cpu_family(); if (is_amd()) { ! return _family_id_amd[cpu_family_id]; } if (is_intel()) { if (cpu_family_id == CPU_FAMILY_PENTIUMPRO) { return cpu_model_description(); } ! return _family_id_intel[cpu_family_id]; } return "Unknown x86"; } int VM_Version_Ext::cpu_type_description(char* const buf, size_t buf_len) {
*** 432,444 **** cpu_type = "Intel"; x64 = cpu_is_em64t() ? " Intel64" : ""; } else if (is_amd()) { cpu_type = "AMD"; x64 = cpu_is_em64t() ? " AMD64" : ""; - } else if (is_hygon()) { - cpu_type = "Hygon"; - x64 = cpu_is_em64t() ? " AMD64" : ""; } else { cpu_type = "Unknown x86"; x64 = cpu_is_em64t() ? " x86_64" : ""; } --- 421,430 ----
*** 706,716 **** _max_qualified_cpu_frequency = max_qualified_cpu_freq_from_brand_string(); } return _max_qualified_cpu_frequency; } ! const char* const VM_Version_Ext::_family_id_intel[ExtendedFamilyIdLength_INTEL] = { "8086/8088", "", "286", "386", "486", --- 692,702 ---- _max_qualified_cpu_frequency = max_qualified_cpu_freq_from_brand_string(); } return _max_qualified_cpu_frequency; } ! const char* const VM_Version_Ext::_family_id_intel[] = { "8086/8088", "", "286", "386", "486",
*** 725,735 **** "", "", "Pentium 4" }; ! const char* const VM_Version_Ext::_family_id_amd[ExtendedFamilyIdLength_AMD] = { "", "", "", "", "5x86", --- 711,721 ---- "", "", "Pentium 4" }; ! const char* const VM_Version_Ext::_family_id_amd[] = { "", "", "", "", "5x86",
*** 743,759 **** "", "", "", "Opteron/Athlon64", "Opteron QC/Phenom" // Barcelona et.al. - "", - "", - "", - "", - "", - "", - "Zen" }; // Partially from Intel 64 and IA-32 Architecture Software Developer's Manual, // September 2013, Vol 3C Table 35-1 const char* const VM_Version_Ext::_model_id_pentium_pro[] = { "", --- 729,738 ----
< prev index next >