/hg/icedtea6: Edward Nevill

[enevill at icedtea.classpath.org]

changeset ca84eeb0fcf1 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=ca84eeb0fcf1
author: "Edward Nevill (ed at camswl.com)"
date: Fri Oct 09 13:10:46 2009 +0100

	Edward Nevill


diffstat:

2 files changed, 8 insertions(+), 2 deletions(-)
ChangeLog                                          |    5 +++++
ports/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S |    5 +++--

diffs (42 lines):

diff -r 70ec5cda5f7c -r ca84eeb0fcf1 ChangeLog
--- 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-08  Matthias Klose  <doko at ubuntu
+2009-10-09  Edward Nevill   <ed at camswl.com>
+
+	* Bug fix to irem
+	* Stop icedtea-debug build falling over in test_gamma
+
 2009-10-08  Matthias Klose  <doko at ubuntu.com>
 
 	* Makefile.am (stamps/icedtea.stamp, stamps/icedtea-debug.stamp):
diff -r 70ec5cda5f7c -r ca84eeb0fcf1 ports/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S
--- 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:
 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 @@ asm_generate_method_entry:
 	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 @@ int_rem:
         bne     .r_loop2
         movs    lr, lr, lsl #1
 	DISPATCH_NEXT
-	DISPATCH_NEXT
 	rsbmi	tmp1, tmp1, #0
+	DISPATCH_NEXT
 	PUSH	tmp1
 	DISPATCH_FINISH