1.1 --- a/src/cpu/mips/vm/vm_version_mips.cpp Wed May 08 17:57:33 2019 +0800
1.2 +++ b/src/cpu/mips/vm/vm_version_mips.cpp Tue May 28 16:35:59 2019 +0800
1.3 @@ -115,7 +115,7 @@
1.4 }
1.5 }
1.6
1.7 - if (is_gs464e()) {
1.8 + if (is_gs464e() || is_gs464v()) {
1.9 if (FLAG_IS_DEFAULT(UseSyncLevel)) {
1.10 FLAG_SET_DEFAULT(UseSyncLevel, 2000);
1.11 }
1.12 @@ -128,16 +128,20 @@
1.13 }
1.14
1.15 char buf[256];
1.16 - jio_snprintf(buf, sizeof(buf), "%s%s%s%s%s%s%s%s%s",
1.17 - (has_l2_cache() ? ", has_l2_cache" : ""),
1.18 - (has_16k_page() ? ", has_16k_page" : ""),
1.19 - (is_loongson() ? ", on_loongson" : ""),
1.20 - (is_gs464() ? ", 3A1000/3B1500" : ""),
1.21 - (is_gs464e() ? ", 3A2000/3A3000/3B2000/3B3000" : ""),
1.22 - (is_gs264() ? ", 2K1000" : ""),
1.23 - (UseLoongsonISA ? ", UseLoongsonISA" : ""),
1.24 + bool is_unknown_loongson_cpu = is_loongson() && !is_gs464() && !is_gs464e() && !is_gs464v() && !is_gs264();
1.25 + jio_snprintf(buf, sizeof(buf), "%s%s%s%s%s%s%s%s%s%s%s, UseSyncLevel:%d",
1.26 + (has_l2_cache() ? ", has_l2_cache" : ""),
1.27 + (has_16k_page() ? ", has_16k_page" : ""),
1.28 + (is_loongson() ? ", MIPS-compatible Loongson CPU" : "MIPS"),
1.29 + (is_gs464() ? ", GS464 (3A1000/3B1500)" : ""),
1.30 + (is_gs464e() ? ", GS464E (3A2000/3A3000/3B2000/3B3000)" : ""),
1.31 + (is_gs464v() ? ", GS464V (3A4000/3B4000)" : ""),
1.32 + (is_gs264() ? ", GS264 (2K1000)" : ""),
1.33 + (is_unknown_loongson_cpu ? ", Unknown Loongson CPU" : ""),
1.34 + (UseLoongsonISA ? ", UseLoongsonISA" : ""),
1.35 (UseCountTrailingZerosInstructionMIPS64 ? ", UseCountTrailingZerosInstructionMIPS64" : ""),
1.36 - (Use3A2000 ? ", Use3A2000" : ""));
1.37 + (Use3A2000 ? ", Use3A2000" : ""),
1.38 + UseSyncLevel);
1.39
1.40 // buf is started with ", " or is empty
1.41 _features_str = strdup(strlen(buf) > 2 ? buf + 2 : buf);
1.42 @@ -178,7 +182,7 @@
1.43 }
1.44
1.45 void VM_Version::print_features() {
1.46 - tty->print_cr("Version:%s", cpu_features());
1.47 + tty->print_cr("Version: %s", cpu_features());
1.48 }
1.49
1.50 int VM_Version::determine_features() {
