diff options
| author | Lalit Maganti <lalitmaganti@gmail.com> | 2012-09-15 03:17:57 -0700 |
|---|---|---|
| committer | Steve Kondik <shade@chemlab.org> | 2013-07-24 12:59:41 -0700 |
| commit | 63c83ccb9a06e5cf35afd2c1966c381658a40649 (patch) | |
| tree | baf6a9ff18e66b58407a83b604236f139dfba320 /vm/mterp | |
| parent | 39f592bea7efbce3cba81ac5923053358f79affb (diff) | |
| download | android_dalvik-63c83ccb9a06e5cf35afd2c1966c381658a40649.tar.gz android_dalvik-63c83ccb9a06e5cf35afd2c1966c381658a40649.tar.bz2 android_dalvik-63c83ccb9a06e5cf35afd2c1966c381658a40649.zip | |
dalvik: update ARMv6 code to bring in line with ARMv5
Change-Id: I9c60645a4d3fff3567b4b88acd4a6be98a774927
Diffstat (limited to 'vm/mterp')
| -rw-r--r-- | vm/mterp/out/InterpAsm-armv6-vfp.S | 8 | ||||
| -rw-r--r-- | vm/mterp/out/InterpAsm-armv6j.S | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/vm/mterp/out/InterpAsm-armv6-vfp.S b/vm/mterp/out/InterpAsm-armv6-vfp.S index 1cd22409a..ef93571df 100644 --- a/vm/mterp/out/InterpAsm-armv6-vfp.S +++ b/vm/mterp/out/InterpAsm-armv6-vfp.S @@ -16298,8 +16298,8 @@ dalvik_mterp: cmp lr, #0 @ any special SubModes active? bne 11f @ go handle them if so - mov lr, pc @ set return addr - ldr pc, [r2, #offMethod_nativeFunc] @ pc<- methodToCall->nativeFunc + ldr ip, [r2, #offMethod_nativeFunc] @ pc<- methodToCall->nativeFunc + blx ip 7: @ native return; r10=newSaveArea @@ -16325,8 +16325,8 @@ dalvik_mterp: ldmfd sp, {r0-r3} @ refresh. NOTE: no sp autoincrement @ Call the native method - mov lr, pc @ set return addr - ldr pc, [r2, #offMethod_nativeFunc] @ pc<- methodToCall->nativeFunc + ldr ip, [r2, #offMethod_nativeFunc] @ pc<- methodToCall->nativeFunc + blx ip @ Restore the pre-call arguments ldmfd sp!, {r0-r3} @ r2<- methodToCall (others unneeded) diff --git a/vm/mterp/out/InterpAsm-armv6j.S b/vm/mterp/out/InterpAsm-armv6j.S index 4a9a52f47..642ebbddc 100644 --- a/vm/mterp/out/InterpAsm-armv6j.S +++ b/vm/mterp/out/InterpAsm-armv6j.S @@ -16756,8 +16756,8 @@ dalvik_mterp: cmp lr, #0 @ any special SubModes active? bne 11f @ go handle them if so - mov lr, pc @ set return addr - ldr pc, [r2, #offMethod_nativeFunc] @ pc<- methodToCall->nativeFunc + ldr ip, [r2, #offMethod_nativeFunc] @ pc<- methodToCall->nativeFunc + blx ip 7: @ native return; r10=newSaveArea @@ -16783,8 +16783,8 @@ dalvik_mterp: ldmfd sp, {r0-r3} @ refresh. NOTE: no sp autoincrement @ Call the native method - mov lr, pc @ set return addr - ldr pc, [r2, #offMethod_nativeFunc] @ pc<- methodToCall->nativeFunc + ldr ip, [r2, #offMethod_nativeFunc] @ pc<- methodToCall->nativeFunc + blx ip @ Restore the pre-call arguments ldmfd sp!, {r0-r3} @ r2<- methodToCall (others unneeded) |