diff --git a/src/os_cpu/linux_sparc/vm/vm_version_linux_sparc.cpp b/src/os_cpu/linux_sparc/vm/vm_version_linux_sparc.cpp index 4af6c52365393f0e457825eb1d70e0fc01be4e9a..fe9c6f9d7cb57f8a5e65b0627f6992f941802f90 100644 --- a/src/os_cpu/linux_sparc/vm/vm_version_linux_sparc.cpp +++ b/src/os_cpu/linux_sparc/vm/vm_version_linux_sparc.cpp @@ -26,8 +26,8 @@ #include "runtime/os.hpp" #include "vm_version_sparc.hpp" -static bool detect_niagara() { - char cpu[128]; +static bool cpuinfo_field_contains(const char* field, const char* value) { + char line[1024]; bool rv = false; FILE* fp = fopen("/proc/cpuinfo", "r"); @@ -35,9 +35,10 @@ static bool detect_niagara() { return rv; } - while (!feof(fp)) { - if (fscanf(fp, "cpu\t\t: %100[^\n]", &cpu) == 1) { - if (strstr(cpu, "Niagara") != NULL) { + while (fgets(line, sizeof(line), fp) != NULL) { + assert(strlen(line) < sizeof(line) - 1, "buffer line[1024] is too small."); + if (strncmp(line, field, strlen(field)) == 0) { + if (strstr(line, value) != NULL) { rv = true; } break; @@ -45,10 +46,17 @@ static bool detect_niagara() { } fclose(fp); - return rv; } +static bool detect_niagara() { + return cpuinfo_field_contains("cpu", "Niagara"); +} + +static bool detect_blkinit() { + return cpuinfo_field_contains("cpucaps", "blkinit"); +} + int VM_Version::platform_features(int features) { // Default to generic v9 features = generic_v9_m; @@ -58,5 +66,9 @@ int VM_Version::platform_features(int features) { features = niagara1_m | T_family_m; } + if (detect_blkinit()) { + features |= blk_init_instructions_m; + } + return features; }