diff options
| author | 2019-04-03 11:32:38 +0100 | |
|---|---|---|
| committer | 2019-04-03 12:49:37 +0000 | |
| commit | 5dbd02a497f4bbdf33ae37e715159fe33594a02a (patch) | |
| tree | 63aa67209bb528d56d416f7d57f2acf0e5703d70 | |
| parent | 2c5bcb873f086c3db4f633e620de31d53cedede5 (diff) | |
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
| -rw-r--r-- | runtime/interpreter/mterp/arm/main.S | 8 | ||||
| -rw-r--r-- | runtime/interpreter/mterp/arm64/main.S | 8 | ||||
| -rw-r--r-- | runtime/interpreter/mterp/common/gen_setup.py | 2 | ||||
| -rw-r--r-- | runtime/interpreter/mterp/mips/main.S | 4 | ||||
| -rw-r--r-- | runtime/interpreter/mterp/mips64/main.S | 4 | ||||
| -rw-r--r-- | runtime/interpreter/mterp/x86/main.S | 8 | ||||
| -rw-r--r-- | runtime/interpreter/mterp/x86_64/main.S | 8 |
7 files changed, 21 insertions, 21 deletions
diff --git a/runtime/interpreter/mterp/arm/main.S b/runtime/interpreter/mterp/arm/main.S index 4cf65d1930..12b3dab003 100644 --- a/runtime/interpreter/mterp/arm/main.S +++ b/runtime/interpreter/mterp/arm/main.S @@ -438,9 +438,9 @@ ENTRY ExecuteMterpImpl 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 @@ artMterpAsmInstructionStart = .L_op_nop .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 0cfbbff3aa..aefec61879 100644 --- a/runtime/interpreter/mterp/arm64/main.S +++ b/runtime/interpreter/mterp/arm64/main.S @@ -451,9 +451,9 @@ ENTRY ExecuteMterpImpl 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 @@ artMterpAsmInstructionStart = .L_op_nop .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 cfa5e2e2ef..2684ab255f 100644 --- a/runtime/interpreter/mterp/common/gen_setup.py +++ b/runtime/interpreter/mterp/common/gen_setup.py @@ -52,7 +52,7 @@ generated_helpers = {} # 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 b9e2e7abfc..88180cf730 100644 --- a/runtime/interpreter/mterp/mips/main.S +++ b/runtime/interpreter/mterp/mips/main.S @@ -813,9 +813,9 @@ ExecuteMterpImpl: 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 e26d8a5c28..ac3a4a3076 100644 --- a/runtime/interpreter/mterp/mips64/main.S +++ b/runtime/interpreter/mterp/mips64/main.S @@ -434,9 +434,9 @@ ExecuteMterpImpl: 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 6eaea6f260..8df75d2f66 100644 --- a/runtime/interpreter/mterp/x86/main.S +++ b/runtime/interpreter/mterp/x86/main.S @@ -438,9 +438,9 @@ ENTRY ExecuteMterpImpl 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 @@ SYMBOL(artMterpAsmInstructionStart) = .L_op_nop .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 5900220750..5f1fd2dfbe 100644 --- a/runtime/interpreter/mterp/x86_64/main.S +++ b/runtime/interpreter/mterp/x86_64/main.S @@ -422,9 +422,9 @@ ENTRY ExecuteMterpImpl 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 @@ SYMBOL(artMterpAsmInstructionStart) = .L_op_nop .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): |