Backport 59810ad745b28f50d287fa8db650c3f1924791d9

duke · duke · commit 842116508220 · 2025-03-07T15:23:50.000Z
diff --git a/src/hotspot/os_cpu/aix_ppc/os_aix_ppc.cpp b/src/hotspot/os_cpu/aix_ppc/os_aix_ppc.cpp
@@ -448,7 +448,7 @@ void os::print_context(outputStream *st, const void *context) {
 }
 
 void os::print_register_info(outputStream *st, const void *context, int& continuation) {
-  const int register_count = 32 /* r0-r32 */ + 3 /* pc, lr, sp */;
+  const int register_count = 32 /* r0-r31 */ + 3 /* pc, lr, sp */;
   int n = continuation;
   assert(n >= 0 && n <= register_count, "Invalid continuation value");
   if (context == nullptr || n == register_count) {
diff --git a/src/hotspot/os_cpu/linux_aarch64/os_linux_aarch64.cpp b/src/hotspot/os_cpu/linux_aarch64/os_linux_aarch64.cpp
@@ -355,7 +355,7 @@ void os::print_context(outputStream *st, const void *context) {
 }
 
 void os::print_register_info(outputStream *st, const void *context, int& continuation) {
-  const int register_count = 32 /* r0-r31 */;
+  const int register_count = 31 /* r0-r30 */;
   int n = continuation;
   assert(n >= 0 && n <= register_count, "Invalid continuation value");
   if (context == nullptr || n == register_count) {
diff --git a/src/hotspot/os_cpu/linux_ppc/os_linux_ppc.cpp b/src/hotspot/os_cpu/linux_ppc/os_linux_ppc.cpp
@@ -468,7 +468,7 @@ void os::print_context(outputStream *st, const void *context) {
 }
 
 void os::print_register_info(outputStream *st, const void *context, int& continuation) {
-  const int register_count = 32 /* r0-r32 */ + 3 /* pc, lr, ctr */;
+  const int register_count = 32 /* r0-r31 */ + 3 /* pc, lr, ctr */;
   int n = continuation;
   assert(n >= 0 && n <= register_count, "Invalid continuation value");
   if (context == nullptr || n == register_count) {

Original file line number	Diff line number	Diff line change
`@@ -448,7 +448,7 @@ void os::print_context(outputStream st, const void context) {`
`448`	`448`	`}`
`449`	`449`
`450`	`450`	`void os::print_register_info(outputStream st, const void context, int& continuation) {`
`451`		`- const int register_count = 32 /* r0-r32 / + 3 / pc, lr, sp */;`
	`451`	`+ const int register_count = 32 /* r0-r31 / + 3 / pc, lr, sp */;`
`452`	`452`	`int n = continuation;`
`453`	`453`	`assert(n >= 0 && n <= register_count, "Invalid continuation value");`
`454`	`454`	`if (context == nullptr \|\| n == register_count) {`
Original file line number	Diff line number	Diff line change
`@@ -355,7 +355,7 @@ void os::print_context(outputStream st, const void context) {`
`355`	`355`	`}`
`356`	`356`
`357`	`357`	`void os::print_register_info(outputStream st, const void context, int& continuation) {`
`358`		`- const int register_count = 32 /* r0-r31 */;`
	`358`	`+ const int register_count = 31 /* r0-r30 */;`
`359`	`359`	`int n = continuation;`
`360`	`360`	`assert(n >= 0 && n <= register_count, "Invalid continuation value");`
`361`	`361`	`if (context == nullptr \|\| n == register_count) {`
Original file line number	Diff line number	Diff line change
`@@ -468,7 +468,7 @@ void os::print_context(outputStream st, const void context) {`
`468`	`468`	`}`
`469`	`469`
`470`	`470`	`void os::print_register_info(outputStream st, const void context, int& continuation) {`
`471`		`- const int register_count = 32 /* r0-r32 / + 3 / pc, lr, ctr */;`
	`471`	`+ const int register_count = 32 /* r0-r31 / + 3 / pc, lr, ctr */;`
`472`	`472`	`int n = continuation;`
`473`	`473`	`assert(n >= 0 && n <= register_count, "Invalid continuation value");`
`474`	`474`	`if (context == nullptr \|\| n == register_count) {`