Make couple of mterp function names start with lower-case.
Most of our hand-written-assembly functions have lower-case name.
Test: test.py -b --host --interpreter
Change-Id: Ie1641dd77fcf772bc4c1f0d1896a7ce721f5d5a8
diff --git a/runtime/interpreter/mterp/arm/main.S b/runtime/interpreter/mterp/arm/main.S
index 4cf65d1..12b3dab 100644
--- a/runtime/interpreter/mterp/arm/main.S
+++ b/runtime/interpreter/mterp/arm/main.S
@@ -438,9 +438,9 @@
b MterpCheckBefore @ (self, shadow_frame, dex_pc_ptr) @ Tail call.
%def opcode_pre():
-% add_helper(dchecks_before_helper, "Mterp_dchecks_before_helper")
+% add_helper(dchecks_before_helper, "mterp_dchecks_before_helper")
#if !defined(NDEBUG)
- bl Mterp_dchecks_before_helper
+ bl mterp_dchecks_before_helper
#endif
%def fallback():
@@ -766,9 +766,9 @@
.text
%def opcode_start():
- ENTRY Mterp_${opcode}
+ ENTRY mterp_${opcode}
%def opcode_end():
- END Mterp_${opcode}
+ END mterp_${opcode}
%def helper_start(name):
ENTRY ${name}
%def helper_end(name):
diff --git a/runtime/interpreter/mterp/arm64/main.S b/runtime/interpreter/mterp/arm64/main.S
index 0cfbbff..aefec61 100644
--- a/runtime/interpreter/mterp/arm64/main.S
+++ b/runtime/interpreter/mterp/arm64/main.S
@@ -451,9 +451,9 @@
b MterpCheckBefore // (self, shadow_frame, dex_pc_ptr) Note: tail call.
%def opcode_pre():
-% add_helper(dchecks_before_helper, "Mterp_dchecks_before_helper")
+% add_helper(dchecks_before_helper, "mterp_dchecks_before_helper")
#if !defined(NDEBUG)
- bl Mterp_dchecks_before_helper
+ bl mterp_dchecks_before_helper
#endif
%def footer():
@@ -788,9 +788,9 @@
.text
%def opcode_start():
- ENTRY Mterp_${opcode}
+ ENTRY mterp_${opcode}
%def opcode_end():
- END Mterp_${opcode}
+ END mterp_${opcode}
%def helper_start(name):
ENTRY ${name}
%def helper_end(name):
diff --git a/runtime/interpreter/mterp/common/gen_setup.py b/runtime/interpreter/mterp/common/gen_setup.py
index cfa5e2e..2684ab2 100644
--- a/runtime/interpreter/mterp/common/gen_setup.py
+++ b/runtime/interpreter/mterp/common/gen_setup.py
@@ -52,7 +52,7 @@
# The output is temporarily redirected to in-memory buffer.
def add_helper(write_helper, name = None):
if name == None:
- name = "Mterp_" + opcode + "_helper"
+ name = "mterp_" + opcode + "_helper"
global out
old_out = out
out = StringIO()
diff --git a/runtime/interpreter/mterp/mips/main.S b/runtime/interpreter/mterp/mips/main.S
index b9e2e7a..88180cf 100644
--- a/runtime/interpreter/mterp/mips/main.S
+++ b/runtime/interpreter/mterp/mips/main.S
@@ -813,9 +813,9 @@
jalr zero, t9 # Tail call to Mterp(self, shadow_frame, dex_pc_ptr)
%def opcode_pre():
-% add_helper(dchecks_before_helper, "Mterp_dchecks_before_helper")
+% add_helper(dchecks_before_helper, "mterp_dchecks_before_helper")
#if !defined(NDEBUG)
- jal SYMBOL(Mterp_dchecks_before_helper)
+ jal SYMBOL(mterp_dchecks_before_helper)
#endif
%def fallback():
diff --git a/runtime/interpreter/mterp/mips64/main.S b/runtime/interpreter/mterp/mips64/main.S
index e26d8a5..ac3a4a3 100644
--- a/runtime/interpreter/mterp/mips64/main.S
+++ b/runtime/interpreter/mterp/mips64/main.S
@@ -434,9 +434,9 @@
jalr zero, t9 # (self, shadow_frame, dex_pc_ptr) Note: tail call.
%def opcode_pre():
-% add_helper(dchecks_before_helper, "Mterp_dchecks_before_helper")
+% add_helper(dchecks_before_helper, "mterp_dchecks_before_helper")
#if !defined(NDEBUG)
- jal SYMBOL(Mterp_dchecks_before_helper)
+ jal SYMBOL(mterp_dchecks_before_helper)
#endif
%def fallback():
diff --git a/runtime/interpreter/mterp/x86/main.S b/runtime/interpreter/mterp/x86/main.S
index 6eaea6f..8df75d2 100644
--- a/runtime/interpreter/mterp/x86/main.S
+++ b/runtime/interpreter/mterp/x86/main.S
@@ -438,9 +438,9 @@
jmp SYMBOL(MterpCheckBefore) # (self, shadow_frame, dex_pc_ptr)
%def opcode_pre():
-% add_helper(dchecks_before_helper, "Mterp_dchecks_before_helper")
+% add_helper(dchecks_before_helper, "mterp_dchecks_before_helper")
#if !defined(NDEBUG)
- call SYMBOL(Mterp_dchecks_before_helper)
+ call SYMBOL(mterp_dchecks_before_helper)
REFRESH_IBASE
#endif
@@ -795,9 +795,9 @@
.text
%def opcode_start():
- ENTRY Mterp_${opcode}
+ ENTRY mterp_${opcode}
%def opcode_end():
- END Mterp_${opcode}
+ END mterp_${opcode}
%def helper_start(name):
ENTRY ${name}
%def helper_end(name):
diff --git a/runtime/interpreter/mterp/x86_64/main.S b/runtime/interpreter/mterp/x86_64/main.S
index 5900220..5f1fd2d 100644
--- a/runtime/interpreter/mterp/x86_64/main.S
+++ b/runtime/interpreter/mterp/x86_64/main.S
@@ -422,9 +422,9 @@
jmp SYMBOL(MterpCheckBefore) # (self, shadow_frame, dex_pc_ptr)
%def opcode_pre():
-% add_helper(dchecks_before_helper, "Mterp_dchecks_before_helper")
+% add_helper(dchecks_before_helper, "mterp_dchecks_before_helper")
#if !defined(NDEBUG)
- call SYMBOL(Mterp_dchecks_before_helper)
+ call SYMBOL(mterp_dchecks_before_helper)
#endif
%def fallback():
@@ -750,9 +750,9 @@
.text
%def opcode_start():
- ENTRY Mterp_${opcode}
+ ENTRY mterp_${opcode}
%def opcode_end():
- END Mterp_${opcode}
+ END mterp_${opcode}
%def helper_start(name):
ENTRY ${name}
%def helper_end(name):