summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--runtime/interpreter/mterp/arm64ng/main.S5
-rw-r--r--runtime/interpreter/mterp/armng/main.S5
-rw-r--r--runtime/interpreter/mterp/x86_64ng/main.S5
3 files changed, 15 insertions, 0 deletions
diff --git a/runtime/interpreter/mterp/arm64ng/main.S b/runtime/interpreter/mterp/arm64ng/main.S
index 1f8247931e..cab9d00ab0 100644
--- a/runtime/interpreter/mterp/arm64ng/main.S
+++ b/runtime/interpreter/mterp/arm64ng/main.S
@@ -1550,6 +1550,9 @@ OAT_ENTRY ExecuteNterpImpl, EndExecuteNterpImpl
.text
.align 2
+// Enclose all code below in a symbol (which gets printed in backtraces).
+NAME_START nterp_helper
+
// Note: mterp also uses the common_* names below for helpers, but that's OK
// as the assembler compiled each interpreter separately.
common_errDivideByZero:
@@ -1734,6 +1737,8 @@ nterp_to_nterp_string_init_range:
SETUP_RANGE_ARGUMENTS_AND_EXECUTE is_static=0, is_string_init=1
.cfi_endproc
+NAME_END nterp_helper
+
// This is the end of PCs contained by the OatQuickMethodHeader created for the interpreter
// entry point.
.type EndExecuteNterpImpl, #function
diff --git a/runtime/interpreter/mterp/armng/main.S b/runtime/interpreter/mterp/armng/main.S
index 75e0af69c5..4b0a70f3d9 100644
--- a/runtime/interpreter/mterp/armng/main.S
+++ b/runtime/interpreter/mterp/armng/main.S
@@ -1576,6 +1576,9 @@ OAT_ENTRY ExecuteNterpImpl, EndExecuteNterpImpl
.text
.align 2
+// Enclose all code below in a symbol (which gets printed in backtraces).
+NAME_START nterp_helper
+
// Note: mterp also uses the common_* names below for helpers, but that's OK
// as the assembler compiled each interpreter separately.
common_errDivideByZero:
@@ -1760,6 +1763,8 @@ nterp_to_nterp_instance_range:
SETUP_RANGE_ARGUMENTS_AND_EXECUTE is_static=0, is_string_init=0
.cfi_endproc
+NAME_END nterp_helper
+
// This is the end of PCs contained by the OatQuickMethodHeader created for the interpreter
// entry point.
.type EndExecuteNterpImpl, #function
diff --git a/runtime/interpreter/mterp/x86_64ng/main.S b/runtime/interpreter/mterp/x86_64ng/main.S
index 6756a45d85..21214bb023 100644
--- a/runtime/interpreter/mterp/x86_64ng/main.S
+++ b/runtime/interpreter/mterp/x86_64ng/main.S
@@ -1695,6 +1695,9 @@ OAT_ENTRY ExecuteNterpImpl, EndExecuteNterpImpl
.text
.align 2
+// Enclose all code below in a symbol (which gets printed in backtraces).
+ENTRY nterp_helper
+
// Note: mterp also uses the common_* names below for helpers, but that's OK
// as the C compiler compiled each interpreter separately.
common_errDivideByZero:
@@ -2175,6 +2178,8 @@ nterp_to_nterp_string_init_range:
SETUP_RANGE_ARGUMENTS_AND_EXECUTE is_static=0, is_string_init=1
.cfi_endproc
+END nterp_helper
+
// This is the end of PCs contained by the OatQuickMethodHeader created for the interpreter
// entry point.
FUNCTION_TYPE(EndExecuteNterpImpl)