/hg/icedtea6: 5 new changesets

aph at icedtea.classpath.org aph at icedtea.classpath.org
Wed Nov 2 09:21:05 PDT 2011


changeset 10f799f0520c in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=10f799f0520c
author: aph
date: Fri Oct 28 09:43:24 2011 -0400

	Add patches/arm-debug.patch. 2011-10-28 Andrew Haley
	<aph at redhat.com>

	 * Makefile.am (ICEDTEA_PATCHES): Add patches/arm-
	debug.patch.


changeset 2f08a6fa2940 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=2f08a6fa2940
author: aph
date: Fri Oct 28 09:49:25 2011 -0400

	merge


changeset c2cf91b8ce35 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=c2cf91b8ce35
author: aph
date: Mon Oct 31 12:16:19 2011 -0400

	merge


changeset 002673402c72 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=002673402c72
author: aph
date: Tue Nov 01 13:40:39 2011 +0000

	Thumb2_Accessor Return 0, #deoptimized_frames. 2011-11-01 Andrew
	Haley <aph at redhat.com>

	 * arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp
	(Thumb2_Accessor): Return 0, #deoptimized_frames.


changeset 6f61af32cc26 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=6f61af32cc26
author: aph
date: Wed Nov 02 16:20:25 2011 +0000

	Sign extend byte loads in accessors. 2011-11-02 Andrew Haley
	<aph at redhat.com>

	 * openjdk-ecj/hotspot/src/cpu/zero/vm/thumb2.cpp
	(Thumb2_codegen): Sign extend byte loads in accessors.


diffstat:

 ChangeLog                                             |  33 +++++++++++++++++++
 Makefile.am                                           |   3 +-
 arm_port/hotspot/src/cpu/zero/vm/asm_helper.cpp       |   4 ++
 arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S |  10 +++++-
 arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp           |  10 ++++-
 patches/arm.patch                                     |  10 ++--
 6 files changed, 61 insertions(+), 9 deletions(-)

diffs (193 lines):

diff -r 628e5ee78eca -r 6f61af32cc26 ChangeLog
--- a/ChangeLog	Thu Oct 27 13:54:50 2011 +0100
+++ b/ChangeLog	Wed Nov 02 16:20:25 2011 +0000
@@ -1,3 +1,36 @@
+2011-11-02  Andrew Haley  <aph at redhat.com>
+
+	* openjdk-ecj/hotspot/src/cpu/zero/vm/thumb2.cpp (Thumb2_codegen):
+	Sign extend byte loads in accessors.
+
+2011-11-01  Andrew Haley  <aph at redhat.com>
+
+	* arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp (Thumb2_Accessor):
+	Return 0, #deoptimized_frames.
+
+2011-10-31  Andrew Haley  <aph at redhat.com>
+
+	* arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S (accessor_sh):
+	Return 0, #deoptimized_frames.
+	(accessor{_h,_sb,_dw}): Likewise.
+
+2011-10-28  Andrew Haley  <aph at redhat.com>
+
+	* arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S (PUSHD0)
+	Use PUSH, not POP.
+
+2011-10-28  Andrew Haley  <aph at redhat.com>
+
+	* Makefile.am (ICEDTEA_PATCHES): Add patches/arm-debug.patch.
+
+2011-10-27  Andrew Haley  <aph at redhat.com>
+
+	* arm_port/hotspot/src/cpu/zero/vm/asm_helper.cpp (whole file):
+	Conditionalize on #ifdef __arm__.
+	* arm_port/hotspot/src/cpu/zero/vm/asm_helper.cpp: Likewise.
+	* arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp: Likewise.
+	* patches/arm.patch: Move %.S rule outside ARM conditional.
+
 2011-10-26  Andrew Haley  <aph at redhat.com>
 
 	* patches/arm.patch (CFLAGS): Enable the ARM assembler port.
diff -r 628e5ee78eca -r 6f61af32cc26 Makefile.am
--- a/Makefile.am	Thu Oct 27 13:54:50 2011 +0100
+++ b/Makefile.am	Wed Nov 02 16:20:25 2011 +0000
@@ -409,7 +409,8 @@
 	patches/openjdk/6826104-npe_on_app_and_toolkit_modal_dialog_click.patch \
 	patches/openjdk/5082756-ImageIO_plugins_metadata_boolean_attributes.patch \
 	patches/openjdk/6296893-BMP_Writer_handles_TopDown_prop_incorrectly.patch \
-	patches/openjdk/7103224-glibc_name_collision.patch
+	patches/openjdk/7103224-glibc_name_collision.patch \
+	patches/arm-debug.patch
 
 if WITH_RHINO
 ICEDTEA_PATCHES += \
diff -r 628e5ee78eca -r 6f61af32cc26 arm_port/hotspot/src/cpu/zero/vm/asm_helper.cpp
--- a/arm_port/hotspot/src/cpu/zero/vm/asm_helper.cpp	Thu Oct 27 13:54:50 2011 +0100
+++ b/arm_port/hotspot/src/cpu/zero/vm/asm_helper.cpp	Wed Nov 02 16:20:25 2011 +0000
@@ -16,6 +16,8 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#ifdef __arm__
+
 #define	ARCH_THUMBEE	(1<<16)
 #define ARCH_VFP	(1<<17)
 #define ARCH_CLZ	(1<<18)
@@ -608,3 +610,5 @@
 }
 
 #endif // STATIC_OFFSETS
+
+#endif // __arm__
diff -r 628e5ee78eca -r 6f61af32cc26 arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S
--- a/arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S	Thu Oct 27 13:54:50 2011 +0100
+++ b/arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S	Wed Nov 02 16:20:25 2011 +0000
@@ -1,3 +1,5 @@
+#ifdef __arm__
+
 @ Copyright 2009, 2010 Edward Nevill
 @ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 @
@@ -380,7 +382,7 @@
 	fsts s0, [stack, #4]
 	fsts s1, [stack, #8]
 #else
-	POP r0, r1
+	PUSH r0, r1
 #endif
 	.endm
 	
@@ -1775,14 +1777,17 @@
 accessor_sh:
 	ldrsh	r0, [r3, r1]
 	str	r0, [ip, #0]
+	mov	r0, #0	@ deoptimized_frames = 0
 	bx	lr
 accessor_h:
 	ldrh	r0, [r3, r1]
 	str	r0, [ip, #0]
+	mov	r0, #0	@ deoptimized_frames = 0
 	bx	lr
 accessor_sb:
 	ldrsb	r0, [r3, r1]
 	str	r0, [ip, #0]
+	mov	r0, #0	@ deoptimized_frames = 0
 	bx	lr
 accessor_dw:
 	add	r0, r3, r1
@@ -1790,6 +1795,7 @@
 	sub	ip, ip, #4
 	str	ip, [r2, #THREAD_JAVA_SP]
 	stmia	ip, {r0, r1}
+	mov	r0, #0	@ deoptimized_frames = 0
 	bx	lr
 
 	Opcode	getfield
@@ -6681,3 +6687,5 @@
 	.word	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
 	.word	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
 #endif
+
+#endif // __arm__
diff -r 628e5ee78eca -r 6f61af32cc26 arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp
--- a/arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp	Thu Oct 27 13:54:50 2011 +0100
+++ b/arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp	Wed Nov 02 16:20:25 2011 +0000
@@ -16,6 +16,8 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#ifdef __arm__
+
 #undef THUMB2EE
 #if !defined(DISABLE_THUMB2) && defined(HOTSPOT_ASM) && !defined(SHARK)
 #define THUMB2EE
@@ -4549,6 +4551,8 @@
   else
     ldr_imm(jinfo->codebuf, ARM_R0, ARM_R0, field_offset, 1, 0);
   str_imm(jinfo->codebuf, ARM_R0, ARM_R1, 0, 1, 0);
+  // deoptimized_frames = 0
+  mov_imm(jinfo->codebuf, ARM_R0, 0);
   mov_reg(jinfo->codebuf, ARM_PC, ARM_LR);
 
   return 1;
@@ -5844,7 +5848,7 @@
 	    r = JSTACK_REG(jstack);
 	    PUSH(jstack, r);
 	    if (tos_type == btos)
-	      ldrb_imm(jinfo->codebuf, r, r_obj, field_offset, 1, 0);
+	      ldrsb_imm(jinfo->codebuf, r, r_obj, field_offset, 1, 0);
 	    else if (tos_type == ctos)
 	      ldrh_imm(jinfo->codebuf, r, r_obj, field_offset, 1, 0);
 	    else if (tos_type == stos)
@@ -5966,7 +5970,7 @@
 	      r = JSTACK_REG(jstack);
 	      PUSH(jstack, r);
 	      if (tos_type == btos)
-		ldrb_imm(jinfo->codebuf, r, r_obj, field_offset, 1, 0);
+		ldrsb_imm(jinfo->codebuf, r, r_obj, field_offset, 1, 0);
 	      else if (tos_type == ctos)
 		ldrh_imm(jinfo->codebuf, r, r_obj, field_offset, 1, 0);
 	      else if (tos_type == stos)
@@ -7535,3 +7539,5 @@
 }
 
 #endif // THUMB2EE
+
+#endif // __arm__
diff -r 628e5ee78eca -r 6f61af32cc26 patches/arm.patch
--- a/patches/arm.patch	Thu Oct 27 13:54:50 2011 +0100
+++ b/patches/arm.patch	Wed Nov 02 16:20:25 2011 +0000
@@ -13,11 +13,6 @@
 +
 +CFLAGS += -DHOTSPOT_ASM
 +
-+%.o: %.S
-+	@echo Assembling $<
-+	$(QUIETLY) $(REMOVE_TARGET)
-+	$(COMPILE.CC) -o $@ $< $(COMPILE_DONE)
-+
 +cppInterpreter_arm.o:	offsets_arm.s bytecodes_arm.s
 +thumb2.o:		offsets_arm.s
 +
@@ -40,6 +35,11 @@
 +
 +endif
 +
++%.o: %.S
++	@echo Assembling $<
++	$(QUIETLY) $(REMOVE_TARGET)
++	$(COMPILE.CC) -o $@ $< $(COMPILE_DONE)
++
  # The copied fdlibm routines in sharedRuntimeTrig.o must not be optimized
  OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/NOOPT)
  # The copied fdlibm routines in sharedRuntimeTrans.o must not be optimized



More information about the distro-pkg-dev mailing list