From d3a92b577f11c6357c76dc850c6cbf352ef4c760 Mon Sep 17 00:00:00 2001 From: buzbee Date: Tue, 15 Feb 2011 10:29:38 -0800 Subject: [PATCH] Remove spurious code from bad merge/pilot error Looks like I spuriously duplicated two lines of assembly code in footer.S around a call to method profiling. Removed. Change-Id: I0b10656e15eba0d16af8784ae9ca09c33b5096c0 --- vm/mterp/armv5te/footer.S | 2 -- vm/mterp/out/InterpAsm-armv5te-vfp.S | 2 -- vm/mterp/out/InterpAsm-armv5te.S | 2 -- vm/mterp/out/InterpAsm-armv7-a-neon.S | 2 -- vm/mterp/out/InterpAsm-armv7-a.S | 2 -- 5 files changed, 10 deletions(-) diff --git a/vm/mterp/armv5te/footer.S b/vm/mterp/armv5te/footer.S index d704c7791..520b663cc 100644 --- a/vm/mterp/armv5te/footer.S +++ b/vm/mterp/armv5te/footer.S @@ -725,8 +725,6 @@ dalvik_mterp: @ r0=JNIMethod, r1=rGLUE ldmfd sp!, {r0-r1} bl dvmFastNativeMethodTraceExit - @ r2=JNIMethod, r6=rGLUE - stmfd sp!, {r2,r6} b 220f 110: mov lr, pc @ set return addr diff --git a/vm/mterp/out/InterpAsm-armv5te-vfp.S b/vm/mterp/out/InterpAsm-armv5te-vfp.S index 8ff413750..90ed224d0 100644 --- a/vm/mterp/out/InterpAsm-armv5te-vfp.S +++ b/vm/mterp/out/InterpAsm-armv5te-vfp.S @@ -13875,8 +13875,6 @@ dalvik_mterp: @ r0=JNIMethod, r1=rGLUE ldmfd sp!, {r0-r1} bl dvmFastNativeMethodTraceExit - @ r2=JNIMethod, r6=rGLUE - stmfd sp!, {r2,r6} b 220f 110: mov lr, pc @ set return addr diff --git a/vm/mterp/out/InterpAsm-armv5te.S b/vm/mterp/out/InterpAsm-armv5te.S index 5869d2622..0b02372f4 100644 --- a/vm/mterp/out/InterpAsm-armv5te.S +++ b/vm/mterp/out/InterpAsm-armv5te.S @@ -14333,8 +14333,6 @@ dalvik_mterp: @ r0=JNIMethod, r1=rGLUE ldmfd sp!, {r0-r1} bl dvmFastNativeMethodTraceExit - @ r2=JNIMethod, r6=rGLUE - stmfd sp!, {r2,r6} b 220f 110: mov lr, pc @ set return addr diff --git a/vm/mterp/out/InterpAsm-armv7-a-neon.S b/vm/mterp/out/InterpAsm-armv7-a-neon.S index c8affdcea..ccd00f93b 100644 --- a/vm/mterp/out/InterpAsm-armv7-a-neon.S +++ b/vm/mterp/out/InterpAsm-armv7-a-neon.S @@ -13813,8 +13813,6 @@ dalvik_mterp: @ r0=JNIMethod, r1=rGLUE ldmfd sp!, {r0-r1} bl dvmFastNativeMethodTraceExit - @ r2=JNIMethod, r6=rGLUE - stmfd sp!, {r2,r6} b 220f 110: mov lr, pc @ set return addr diff --git a/vm/mterp/out/InterpAsm-armv7-a.S b/vm/mterp/out/InterpAsm-armv7-a.S index a6cb8490f..fdbcc5f28 100644 --- a/vm/mterp/out/InterpAsm-armv7-a.S +++ b/vm/mterp/out/InterpAsm-armv7-a.S @@ -13813,8 +13813,6 @@ dalvik_mterp: @ r0=JNIMethod, r1=rGLUE ldmfd sp!, {r0-r1} bl dvmFastNativeMethodTraceExit - @ r2=JNIMethod, r6=rGLUE - stmfd sp!, {r2,r6} b 220f 110: mov lr, pc @ set return addr -- 2.11.0