/hg/release/icedtea6-1.7: Removed opc_dmac - causing some test f...

[enevill at icedtea.classpath.org]

changeset 06d8ceaf70ff in /hg/release/icedtea6-1.7
details: http://icedtea.classpath.org/hg/release/icedtea6-1.7?cmd=changeset;node=06d8ceaf70ff
author: Edward Nevill <ed at camswl.com>
date: Wed Jan 13 10:27:10 2010 +0000

	Removed opc_dmac - causing some test failures


diffstat:

3 files changed, 61 insertions(+), 56 deletions(-)
ChangeLog                                          |    5 
ports/hotspot/src/cpu/zero/vm/bytecodes_arm.def    |  110 ++++++++++----------
ports/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S |    2 

diffs (165 lines):

diff -r 3b776f966751 -r 06d8ceaf70ff ChangeLog
--- a/ChangeLog	Mon Jan 11 20:12:43 2010 +0000
+++ b/ChangeLog	Wed Jan 13 10:27:10 2010 +0000
@@ -1,3 +1,8 @@ 2010-01-11 Andrew John Hughes  <ahughes@
+2010-01-13 Edward Nevill <ed at camswl.com>
+
+	* Remove opc_dmac (dmul/dadd)
+	This was causing some test failures with "Unimplemented opcode = 230"
+
 2010-01-11 Andrew John Hughes  <ahughes at redhat.com>
 
 	* patches/icedtea-libraries.patch:
diff -r 3b776f966751 -r 06d8ceaf70ff ports/hotspot/src/cpu/zero/vm/bytecodes_arm.def
--- a/ports/hotspot/src/cpu/zero/vm/bytecodes_arm.def	Mon Jan 11 20:12:43 2010 +0000
+++ b/ports/hotspot/src/cpu/zero/vm/bytecodes_arm.def	Wed Jan 13 10:27:10 2010 +0000
@@ -267,7 +267,7 @@ iload_iload_N	= 0xe4, 3
 
 @return_register_finalizer = 0xe5, 1
 
-dmac			= 0xe6, 2
+ at dmac			= 0xe6, 2
 
 iload_0_iconst_N        = 0xe7, 2
 iload_1_iconst_N        = 0xe8, 2
@@ -2455,10 +2455,10 @@ 2:
 }
 
 (dmul) dmul_vfp {
-	FBC	cmp	r2, #opc_dadd
+@	FBC	cmp	r2, #opc_dadd
 	DISPATCH_START_R2
-	FBC	beq	1f
-2:
+@	FBC	beq	1f
+ at 2:
 	vldr	d7, [stack, #12]
 	vldr	d6, [stack, #4]
 	DISPATCH_NEXT
@@ -2469,30 +2469,30 @@ 2:
 	vstr	d0, [stack, #12]
 	add	stack, stack, #8
 	DISPATCH_FINISH
-1:
-	FBC	mov	r2, #opc_dmac
-	FBC	strb	r2, [jpc, #-1]
-	FBC	b	2b
-}
-
-#ifdef FAST_BYTECODES
-
-(dmac) dmac_vfp {
-	DISPATCH_START	\seq_len
-	vldr	d2, [stack, #20]
-	vldr	d1, [stack, #12]
-	vldr	d0, [stack, #4]
-	DISPATCH_NEXT
-	DISPATCH_NEXT
-	fmacd	d2, d1, d0
-	DISPATCH_NEXT
-	DISPATCH_NEXT
-	vstr	d2, [stack, #20]
-	add	stack, stack, #16
-	DISPATCH_FINISH
-}
-
-#endif // FAST_BYTECODES
+ at 1:
+@	FBC	mov	r2, #opc_dmac
+@	FBC	strb	r2, [jpc, #-1]
+@	FBC	b	2b
+}
+
+@#ifdef FAST_BYTECODES
+@
+@(dmac) dmac_vfp {
+@	DISPATCH_START	\seq_len
+@	vldr	d2, [stack, #20]
+@	vldr	d1, [stack, #12]
+@	vldr	d0, [stack, #4]
+@	DISPATCH_NEXT
+@	DISPATCH_NEXT
+@	fmacd	d2, d1, d0
+@	DISPATCH_NEXT
+@	DISPATCH_NEXT
+@	vstr	d2, [stack, #20]
+@	add	stack, stack, #16
+@	DISPATCH_FINISH
+@}
+@
+@#endif // FAST_BYTECODES
 
 (fdiv) fdiv_vfp {
 	DISPATCH_START_R2
@@ -10013,32 +10013,32 @@ 1:
 	DISPATCH_BYTECODE
 }
 
-#ifdef HW_FP
-
-(dmac)(dastore) {
-	ldr	tmp2, [stack, #28]
-	ldr	tmp1, [stack, #32]
-	vldr	d2, [stack, #20]
-	vldr	d1, [stack, #12]
-	vldr	d0, [stack, #4]
-	DISPATCH_START	\seq_len
-	SW_NPC	cmp	tmp1, #0
-	SW_NPC	beq	null_ptr_exception
-.abortentry120:
-	ldr	ip, [tmp1, #8]
-	cmp	tmp2, ip
-	DISPATCH_NEXT
-	bcs	array_bound_exception_jpc_1_tmp2
-	DISPATCH_NEXT
-	add	tmp2, tmp1, tmp2, lsl #3
-	fmacd	d2, d1, d0
-	vstr	d2, [tmp2, #BASE_OFFSET_LONG]
-	DISPATCH_NEXT
-	DISPATCH_NEXT
-	add	stack, stack, #32
-	DISPATCH_FINISH
-}
-
-#endif //HW_FP
+@#ifdef HW_FP
+@
+@(dmac)(dastore) {
+@	ldr	tmp2, [stack, #28]
+@	ldr	tmp1, [stack, #32]
+@	vldr	d2, [stack, #20]
+@	vldr	d1, [stack, #12]
+@	vldr	d0, [stack, #4]
+@	DISPATCH_START	\seq_len
+@	SW_NPC	cmp	tmp1, #0
+@	SW_NPC	beq	null_ptr_exception
+ at .abortentry120:
+@	ldr	ip, [tmp1, #8]
+@	cmp	tmp2, ip
+@	DISPATCH_NEXT
+@	bcs	array_bound_exception_jpc_1_tmp2
+@	DISPATCH_NEXT
+@	add	tmp2, tmp1, tmp2, lsl #3
+@	fmacd	d2, d1, d0
+@	vstr	d2, [tmp2, #BASE_OFFSET_LONG]
+@	DISPATCH_NEXT
+@	DISPATCH_NEXT
+@	add	stack, stack, #32
+@	DISPATCH_FINISH
+@}
+@
+@#endif //HW_FP
 
 #endif // FAST_BYTECODES
diff -r 3b776f966751 -r 06d8ceaf70ff ports/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S
--- a/ports/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S	Mon Jan 11 20:12:43 2010 +0000
+++ b/ports/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S	Wed Jan 13 10:27:10 2010 +0000
@@ -1304,7 +1304,7 @@ abort_table:
 		FBC	.word	.abortentry117, 0
 			.word	.abortentry118, 0
 			.word	.abortentry119, return_throw_illegal_monitor_state
-		FBC	.word	.abortentry120, 0
+@		FBC	.word	.abortentry120, 0
 	.word	0
 
 #else