Skip to content

Commit

Permalink
8328709: AIX os::get_summary_cpu_info support Power 10
Browse files Browse the repository at this point in the history
Backport-of: b235682a18653ab16f2d9b03b1e55698a91273b7
  • Loading branch information
MBaesken committed Apr 5, 2024
1 parent c05f3bf commit bdf5747
Showing 1 changed file with 13 additions and 2 deletions.
15 changes: 13 additions & 2 deletions src/hotspot/os/aix/os_aix.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ extern "C" int getargs(procsinfo*, int, char*, int);
#define ERROR_MP_VMGETINFO_FAILED 102
#define ERROR_MP_VMGETINFO_CLAIMS_NO_SUPPORT_FOR_64K 103

// excerpts from systemcfg.h that might be missing on older os levels
// excerpts from sys/systemcfg.h that might be missing on older os levels
#ifndef PV_7
#define PV_7 0x200000 /* Power PC 7 */
#endif
Expand All @@ -156,7 +156,12 @@ extern "C" int getargs(procsinfo*, int, char*, int);
#ifndef PV_9_Compat
#define PV_9_Compat 0x408000 /* Power PC 9 */
#endif

#ifndef PV_10
#define PV_10 0x500000 /* Power PC 10 */
#endif
#ifndef PV_10_Compat
#define PV_10_Compat 0x508000 /* Power PC 10 */
#endif

static address resolve_function_descriptor_to_code_pointer(address p);

Expand Down Expand Up @@ -1304,6 +1309,9 @@ void os::print_memory_info(outputStream* st) {
void os::get_summary_cpu_info(char* buf, size_t buflen) {
// read _system_configuration.version
switch (_system_configuration.version) {
case PV_10:
strncpy(buf, "Power PC 10", buflen);
break;
case PV_9:
strncpy(buf, "Power PC 9", buflen);
break;
Expand Down Expand Up @@ -1343,6 +1351,9 @@ void os::get_summary_cpu_info(char* buf, size_t buflen) {
case PV_9_Compat:
strncpy(buf, "PV_9_Compat", buflen);
break;
case PV_10_Compat:
strncpy(buf, "PV_10_Compat", buflen);
break;
default:
strncpy(buf, "unknown", buflen);
}
Expand Down

1 comment on commit bdf5747

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.