Mercurial > hg > release > icedtea6-1.7
changeset 1725:ca84eeb0fcf1
Edward Nevill
author | "Edward Nevill (ed@camswl.com)" |
---|---|
date | Fri, 09 Oct 2009 13:10:46 +0100 |
parents | 70ec5cda5f7c |
children | c1f0b5da7bc3 |
files | ChangeLog ports/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S |
diffstat | 2 files changed, 8 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Thu Oct 08 13:08:52 2009 +0200 +++ b/ChangeLog Fri Oct 09 13:10:46 2009 +0100 @@ -1,3 +1,8 @@ +2009-10-09 Edward Nevill <ed@camswl.com> + + * Bug fix to irem + * Stop icedtea-debug build falling over in test_gamma + 2009-10-08 Matthias Klose <doko@ubuntu.com> * Makefile.am (stamps/icedtea.stamp, stamps/icedtea-debug.stamp):
--- a/ports/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S Thu Oct 08 13:08:52 2009 +0200 +++ b/ports/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S Fri Oct 09 13:10:46 2009 +0100 @@ -1058,7 +1058,7 @@ asm_generate_method_entry: mov r3, r0 mov r0, #0 - +#ifdef PRODUCT adrl ip, dispatch_init_adcon ldm ip, {r1, r2} add r1, r1, ip @@ -1085,6 +1085,7 @@ adrcc ip, asm_method_table ldrcc r0, [ip, r3, lsl #2] 1: +#endif // PRODUCT bx lr asm_method_table: .word normal_entry @@ -2162,8 +2163,8 @@ bne .r_loop2 movs lr, lr, lsl #1 DISPATCH_NEXT - DISPATCH_NEXT rsbmi tmp1, tmp1, #0 + DISPATCH_NEXT PUSH tmp1 DISPATCH_FINISH