diff options
| author | Jeff Hao <jeffhao@google.com> | 2013-02-01 17:17:57 -0800 |
|---|---|---|
| committer | Steve Kondik <shade@chemlab.org> | 2013-04-11 12:11:55 -0700 |
| commit | c19b09e78bc0fdc36681dc6a0c5d1160b35c3e3e (patch) | |
| tree | de2e8658a8c0a243ffe0ab136dbff468ed26d2db | |
| parent | 381357b91ae0441e304136e25a93ab45b367eb61 (diff) | |
| download | android_dalvik-c19b09e78bc0fdc36681dc6a0c5d1160b35c3e3e.tar.gz android_dalvik-c19b09e78bc0fdc36681dc6a0c5d1160b35c3e3e.tar.bz2 android_dalvik-c19b09e78bc0fdc36681dc6a0c5d1160b35c3e3e.zip | |
Remove dead instruction in common_exceptionThrown.
Addresses bug: https://code.google.com/p/android/issues/detail?id=43920
Change-Id: Ie735222db17b883416543ca5617b4f02fd8a8d76
| -rw-r--r-- | vm/mterp/armv5te/footer.S | 1 | ||||
| -rw-r--r-- | vm/mterp/mips/footer.S | 1 | ||||
| -rw-r--r-- | vm/mterp/out/InterpAsm-armv5te-vfp.S | 1 | ||||
| -rw-r--r-- | vm/mterp/out/InterpAsm-armv5te.S | 1 | ||||
| -rw-r--r-- | vm/mterp/out/InterpAsm-armv7-a-neon.S | 1 | ||||
| -rw-r--r-- | vm/mterp/out/InterpAsm-armv7-a.S | 1 | ||||
| -rw-r--r-- | vm/mterp/out/InterpAsm-mips.S | 1 | ||||
| -rw-r--r-- | vm/mterp/out/InterpAsm-x86.S | 1 | ||||
| -rw-r--r-- | vm/mterp/x86/footer.S | 1 |
9 files changed, 0 insertions, 9 deletions
diff --git a/vm/mterp/armv5te/footer.S b/vm/mterp/armv5te/footer.S index 5d3e994d5..2980fa744 100644 --- a/vm/mterp/armv5te/footer.S +++ b/vm/mterp/armv5te/footer.S @@ -845,7 +845,6 @@ common_exceptionThrown: ldr r1, [rSELF, #offThread_method] @ r1<- self->method mov r0, rSELF @ r0<- self ldr r1, [r1, #offMethod_insns] @ r1<- method->insns - ldrh lr, [rSELF, #offThread_subMode] @ lr<- subMode flags mov r2, r9 @ r2<- exception sub r1, rPC, r1 @ r1<- pc - method->insns mov r1, r1, asr #1 @ r1<- offset in code units diff --git a/vm/mterp/mips/footer.S b/vm/mterp/mips/footer.S index b5b53b7f7..0e5bb2480 100644 --- a/vm/mterp/mips/footer.S +++ b/vm/mterp/mips/footer.S @@ -882,7 +882,6 @@ common_exceptionThrown: lw a1, offThread_method(rSELF) move a0, rSELF lw a1, offMethod_insns(a1) - lhu ra, offThread_subMode(rSELF) move a2, rOBJ subu a1, rPC, a1 sra a1, a1, 1 diff --git a/vm/mterp/out/InterpAsm-armv5te-vfp.S b/vm/mterp/out/InterpAsm-armv5te-vfp.S index c50a81398..a173c7226 100644 --- a/vm/mterp/out/InterpAsm-armv5te-vfp.S +++ b/vm/mterp/out/InterpAsm-armv5te-vfp.S @@ -16489,7 +16489,6 @@ common_exceptionThrown: ldr r1, [rSELF, #offThread_method] @ r1<- self->method mov r0, rSELF @ r0<- self ldr r1, [r1, #offMethod_insns] @ r1<- method->insns - ldrh lr, [rSELF, #offThread_subMode] @ lr<- subMode flags mov r2, r9 @ r2<- exception sub r1, rPC, r1 @ r1<- pc - method->insns mov r1, r1, asr #1 @ r1<- offset in code units diff --git a/vm/mterp/out/InterpAsm-armv5te.S b/vm/mterp/out/InterpAsm-armv5te.S index 528bf783f..7b6c9d18f 100644 --- a/vm/mterp/out/InterpAsm-armv5te.S +++ b/vm/mterp/out/InterpAsm-armv5te.S @@ -16947,7 +16947,6 @@ common_exceptionThrown: ldr r1, [rSELF, #offThread_method] @ r1<- self->method mov r0, rSELF @ r0<- self ldr r1, [r1, #offMethod_insns] @ r1<- method->insns - ldrh lr, [rSELF, #offThread_subMode] @ lr<- subMode flags mov r2, r9 @ r2<- exception sub r1, rPC, r1 @ r1<- pc - method->insns mov r1, r1, asr #1 @ r1<- offset in code units diff --git a/vm/mterp/out/InterpAsm-armv7-a-neon.S b/vm/mterp/out/InterpAsm-armv7-a-neon.S index 1e72b5366..c3419c230 100644 --- a/vm/mterp/out/InterpAsm-armv7-a-neon.S +++ b/vm/mterp/out/InterpAsm-armv7-a-neon.S @@ -16426,7 +16426,6 @@ common_exceptionThrown: ldr r1, [rSELF, #offThread_method] @ r1<- self->method mov r0, rSELF @ r0<- self ldr r1, [r1, #offMethod_insns] @ r1<- method->insns - ldrh lr, [rSELF, #offThread_subMode] @ lr<- subMode flags mov r2, r9 @ r2<- exception sub r1, rPC, r1 @ r1<- pc - method->insns mov r1, r1, asr #1 @ r1<- offset in code units diff --git a/vm/mterp/out/InterpAsm-armv7-a.S b/vm/mterp/out/InterpAsm-armv7-a.S index 54e376b52..254224566 100644 --- a/vm/mterp/out/InterpAsm-armv7-a.S +++ b/vm/mterp/out/InterpAsm-armv7-a.S @@ -16426,7 +16426,6 @@ common_exceptionThrown: ldr r1, [rSELF, #offThread_method] @ r1<- self->method mov r0, rSELF @ r0<- self ldr r1, [r1, #offMethod_insns] @ r1<- method->insns - ldrh lr, [rSELF, #offThread_subMode] @ lr<- subMode flags mov r2, r9 @ r2<- exception sub r1, rPC, r1 @ r1<- pc - method->insns mov r1, r1, asr #1 @ r1<- offset in code units diff --git a/vm/mterp/out/InterpAsm-mips.S b/vm/mterp/out/InterpAsm-mips.S index 98837fdc1..7dc785ad1 100644 --- a/vm/mterp/out/InterpAsm-mips.S +++ b/vm/mterp/out/InterpAsm-mips.S @@ -11888,7 +11888,6 @@ common_exceptionThrown: lw a1, offThread_method(rSELF) move a0, rSELF lw a1, offMethod_insns(a1) - lhu ra, offThread_subMode(rSELF) move a2, rOBJ subu a1, rPC, a1 sra a1, a1, 1 diff --git a/vm/mterp/out/InterpAsm-x86.S b/vm/mterp/out/InterpAsm-x86.S index 5dad658fa..760e6740b 100644 --- a/vm/mterp/out/InterpAsm-x86.S +++ b/vm/mterp/out/InterpAsm-x86.S @@ -16593,7 +16593,6 @@ common_exceptionThrown: movl offThread_method(%ecx), %eax # %eax = self->method movl offMethod_insns(%eax), %eax # %eax = self->method->insn - # ldrh lr, [rSELF, #offThread_subMode] @ lr<- subMode flags # TODO movl rPC, %ecx subl %eax, %ecx # %ecx = pc - self->method->insn sar $1, %ecx # adjust %ecx for code offset diff --git a/vm/mterp/x86/footer.S b/vm/mterp/x86/footer.S index 9b833610e..3b5c79e70 100644 --- a/vm/mterp/x86/footer.S +++ b/vm/mterp/x86/footer.S @@ -916,7 +916,6 @@ common_exceptionThrown: movl offThread_method(%ecx), %eax # %eax = self->method movl offMethod_insns(%eax), %eax # %eax = self->method->insn - # ldrh lr, [rSELF, #offThread_subMode] @ lr<- subMode flags # TODO movl rPC, %ecx subl %eax, %ecx # %ecx = pc - self->method->insn sar $$1, %ecx # adjust %ecx for code offset |