Merge pull request #9179 from Akira1Saitoh/aarch64JitCalleeSavedRegis…

…terList AArch64: Fix jitCalleeSavedRegisterList
eclipse-openj9 · Apr 8, 2020 · ef484e6 · ef484e6
2 parents fe71875 + f347ec2
commit ef484e6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/stackwalker/JITRegMap.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/stackwalker/JITRegMap.java
@@ -429,7 +429,10 @@ public class JITRegMap {
 					0x11,   /* jit_r17 */
 					0x12,   /* jit_r18 */
 					0x13,   /* jit_r19 */
-					0x14    /* jit_r20 */
+					0x14,   /* jit_r20 */
+					0x1D,   /* jit_r29 */
+					0x1E,   /* jit_r30 */
+					0x1F    /* jit_r31 */
 			};
 
 			jitCalleeSavedRegisterList = new int[] {

diff --git a/runtime/util/jitregs.c b/runtime/util/jitregs.c
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2016, 2019 IBM Corp. and others
+ * Copyright (c) 2016, 2020 IBM Corp. and others
  *
  * This program and the accompanying materials are made available under
  * the terms of the Eclipse Public License 2.0 which accompanies this
@@ -389,6 +389,9 @@ U_8 jitCalleeDestroyedRegisterList[] = {
 	0x12,	/* jit_r18 */
 	0x13,	/* jit_r19 */
 	0x14,	/* jit_r20 */
+	0x1D,   /* jit_r29 */
+	0x1E,   /* jit_r30 */
+	0x1F    /* jit_r31 */
 };
 U_8 jitCalleeSavedRegisterList[] = {
 	0x15,	/* jit_r21 */