diff options
| author | 2017-01-10 18:09:21 +0000 | |
|---|---|---|
| committer | 2017-01-10 18:09:22 +0000 | |
| commit | 26baea602e04c2bc4aed25f0d5257317f2973749 (patch) | |
| tree | 48e1b10a7b3206f45de3f7f771d37360f6015a98 | |
| parent | 4814f5e7561d75a9547e7166527e941b72e7fd32 (diff) | |
| parent | aceff18580b94a586a469110565f2ba166f3635a (diff) | |
Merge "Delete extra arm64/mips64 MterpReturn suspend check"
| -rw-r--r-- | runtime/interpreter/mterp/arm64/footer.S | 6 | ||||
| -rw-r--r-- | runtime/interpreter/mterp/mips64/footer.S | 6 | ||||
| -rw-r--r-- | runtime/interpreter/mterp/out/mterp_arm64.S | 6 | ||||
| -rw-r--r-- | runtime/interpreter/mterp/out/mterp_mips64.S | 6 |
4 files changed, 0 insertions, 24 deletions
diff --git a/runtime/interpreter/mterp/arm64/footer.S b/runtime/interpreter/mterp/arm64/footer.S index 6ffbd3f260..388fc8db74 100644 --- a/runtime/interpreter/mterp/arm64/footer.S +++ b/runtime/interpreter/mterp/arm64/footer.S @@ -267,13 +267,7 @@ MterpExceptionReturn: b MterpDone MterpReturn: ldr x2, [xFP, #OFF_FP_RESULT_REGISTER] - ldr lr, [xSELF, #THREAD_FLAGS_OFFSET] str x0, [x2] - mov x0, xSELF - ands lr, lr, #THREAD_SUSPEND_OR_CHECKPOINT_REQUEST - b.eq check2 - bl MterpSuspendCheck // (self) -check2: mov x0, #1 // signal return to caller. MterpDone: /* diff --git a/runtime/interpreter/mterp/mips64/footer.S b/runtime/interpreter/mterp/mips64/footer.S index 64772c804d..312fa9c009 100644 --- a/runtime/interpreter/mterp/mips64/footer.S +++ b/runtime/interpreter/mterp/mips64/footer.S @@ -222,13 +222,7 @@ MterpExceptionReturn: */ MterpReturn: ld a2, OFF_FP_RESULT_REGISTER(rFP) - lw ra, THREAD_FLAGS_OFFSET(rSELF) sd a0, 0(a2) - move a0, rSELF - and ra, ra, THREAD_SUSPEND_OR_CHECKPOINT_REQUEST - beqzc ra, check2 - jal MterpSuspendCheck # (self) -check2: li v0, 1 # signal return to caller. MterpDone: /* diff --git a/runtime/interpreter/mterp/out/mterp_arm64.S b/runtime/interpreter/mterp/out/mterp_arm64.S index 34d99a8126..681790daa8 100644 --- a/runtime/interpreter/mterp/out/mterp_arm64.S +++ b/runtime/interpreter/mterp/out/mterp_arm64.S @@ -7246,13 +7246,7 @@ MterpExceptionReturn: b MterpDone MterpReturn: ldr x2, [xFP, #OFF_FP_RESULT_REGISTER] - ldr lr, [xSELF, #THREAD_FLAGS_OFFSET] str x0, [x2] - mov x0, xSELF - ands lr, lr, #THREAD_SUSPEND_OR_CHECKPOINT_REQUEST - b.eq check2 - bl MterpSuspendCheck // (self) -check2: mov x0, #1 // signal return to caller. MterpDone: /* diff --git a/runtime/interpreter/mterp/out/mterp_mips64.S b/runtime/interpreter/mterp/out/mterp_mips64.S index 037787f6b4..bf096664df 100644 --- a/runtime/interpreter/mterp/out/mterp_mips64.S +++ b/runtime/interpreter/mterp/out/mterp_mips64.S @@ -12293,13 +12293,7 @@ MterpExceptionReturn: */ MterpReturn: ld a2, OFF_FP_RESULT_REGISTER(rFP) - lw ra, THREAD_FLAGS_OFFSET(rSELF) sd a0, 0(a2) - move a0, rSELF - and ra, ra, THREAD_SUSPEND_OR_CHECKPOINT_REQUEST - beqzc ra, check2 - jal MterpSuspendCheck # (self) -check2: li v0, 1 # signal return to caller. MterpDone: /* |