From a8b2be42e437fdede83da7cc0f172c35a1c6d09a Mon Sep 17 00:00:00 2001 From: Peter Shipton Date: Tue, 3 Dec 2024 14:05:48 -0500 Subject: [PATCH] Remove unused __power_11 macro and address review comments Signed-off-by: Peter Shipton --- runtime/port/unix/j9sysinfo.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/runtime/port/unix/j9sysinfo.c b/runtime/port/unix/j9sysinfo.c index 764e52c4630..d3e924b2238 100644 --- a/runtime/port/unix/j9sysinfo.c +++ b/runtime/port/unix/j9sysinfo.c @@ -257,17 +257,12 @@ static intptr_t getAIXPPCDescription(struct J9PortLibrary *portLibrary, J9Proces #define __power_10() (_system_configuration.implementation == POWER_10) #endif /* !defined(__power_10) */ -#if !defined(__power_11) -#define POWER_11 0x80000 /* Power 11 class CPU */ -#define __power_11() (_system_configuration.implementation == POWER_11) -#endif /* !defined(__power_11) */ - /* * Please update the macro below to stay in sync with the latest POWER processor known to OpenJ9, * ensuring CPU recognition is more robust than in the past. As the macro currently stands, any * later processors are recognized as at least POWER11. */ -#define POWER11_OR_ABOVE (0xFFFFFFFF << 19) +#define POWER11_OR_ABOVE (0xFFFFFF00 << 11) #define __power_latestKnownAndUp() J9_ARE_ANY_BITS_SET(_system_configuration.implementation, POWER11_OR_ABOVE) #if defined(J9OS_I5_V6R1) /* vmx_version id only available since TL4 */ @@ -591,7 +586,7 @@ mapPPCProcessor(const char *processorName) } else if (0 == strncasecmp(processorName, "power9", 6)) { rc = PROCESSOR_PPC_P9; } else if (0 == strncasecmp(processorName, "power10", 7)) { - rc = PROCESSOR_PPC_P10; + rc = PROCESSOR_PPC_P10; } else if (0 == strncasecmp(processorName, "power11", 7)) { rc = PROCESSOR_PPC_P11; } @@ -647,7 +642,7 @@ getAIXPPCDescription(struct J9PortLibrary *portLibrary, J9ProcessorDesc *desc) desc->processor = PROCESSOR_PPC_P9; } else if (__power_10()) { desc->processor = PROCESSOR_PPC_P10; - } else if (__power_latestKnownAndUp()) { + } else if (__power_latestKnownAndUp()) { desc->processor = PROCESSOR_PPC_P11; } else { desc->processor = PROCESSOR_PPC_UNKNOWN;