Mercurial > hg > release > icedtea7-forest-2.1 > hotspot
changeset 2958:883fc064689b
merge
author | aph |
---|---|
date | Thu, 07 Jun 2012 17:53:27 +0100 |
parents | 51380f2370a7 (current diff) 421a8b72633b (diff) |
children | 49d7e3c4783a 5141cdd9bfbf |
files | |
diffstat | 1 files changed, 1 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/cpu/zero/vm/cppInterpreter_arm.S Wed Jun 06 10:09:22 2012 -0400 +++ b/src/cpu/zero/vm/cppInterpreter_arm.S Thu Jun 07 17:53:27 2012 +0100 @@ -2992,6 +2992,7 @@ ALIGN_CODE fast_method_handle_entry: stmfd arm_sp!, {regset, lr} + mov r2, thread bl _ZN14CppInterpreter19method_handle_entryEP13methodOopDesciP6Thread ldmia sp!, {regset, pc}