Skip to content

8324280: RISC-V: Incorrect implementation in VM_Version::parse_satp_mode #218

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
zifeihan wants to merge 1 commit into from
Closed

8324280: RISC-V: Incorrect implementation in VM_Version::parse_satp_mode #218

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions src/hotspot/os_cpu/linux_riscv/vm_version_linux_riscv.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,13 +168,13 @@ void VM_Version::os_aux_features() {
}

VM_Version::VM_MODE VM_Version::parse_satp_mode(const char* vm_mode) {
if (!strcmp(vm_mode, "sv39")) {
if (!strncmp(vm_mode, "sv39", sizeof "sv39" - 1)) {
return VM_SV39;
} else if (!strcmp(vm_mode, "sv48")) {
} else if (!strncmp(vm_mode, "sv48", sizeof "sv48" - 1)) {
return VM_SV48;
} else if (!strcmp(vm_mode, "sv57")) {
} else if (!strncmp(vm_mode, "sv57", sizeof "sv57" - 1)) {
return VM_SV57;
} else if (!strcmp(vm_mode, "sv64")) {
} else if (!strncmp(vm_mode, "sv64", sizeof "sv64" - 1)) {
return VM_SV64;
} else {
return VM_MBARE;
Expand All @@ -196,7 +196,7 @@ char* VM_Version::os_uarch_additional_features() {
if ((p = strchr(buf, ':')) != nullptr) {
if (mode == VM_NOTSET) {
if (strncmp(buf, "mmu", sizeof "mmu" - 1) == 0) {
mode = VM_Version::parse_satp_mode(p);
mode = VM_Version::parse_satp_mode(p + 2);
}
}
if (ret == nullptr) {
Expand Down