/hg/icedtea6: PR1188: ASM Interpreter and Thumb2 JIT javac misco...

[Andrew Hughes]

----- Original Message -----
> changeset 427412f94dc4 in /hg/icedtea6
> details:
> http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=427412f94dc4
> author: Xerxes Ranby <xerxes at zafena.se>
> date: Tue May 28 19:56:33 2013 +0200
> 
> 	PR1188: ASM Interpreter and Thumb2 JIT javac miscompile modulo reminder on
> 	armel.
> 
> 	2013-05-28  Xerxes Ranby  <xerxes at zafena.se>
> 
> 		PR1188: ASM Interpreter and Thumb2 JIT javac miscompile
> 		modulo reminder on armel.
> 		* arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S
> 		(POPF1): The POPF1 macro used wrong destination register
> 		r0 instead of r1 on ARM armel causing issues with the frem bytecode.
> 		The frem bytecode was the only bytecode using the defect macro.
> 		* NEWS: Updated.
> 
> 
> diffstat:
> 
>  ChangeLog                                             |  10 ++++++++++
>  NEWS                                                  |   1 +
>  arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S |   2 +-
>  3 files changed, 12 insertions(+), 1 deletions(-)
> 
> diffs (40 lines):
> 
> diff -r 632c42c569f8 -r 427412f94dc4 ChangeLog
> --- a/ChangeLog	Mon May 27 11:00:32 2013 +0100
> +++ b/ChangeLog	Tue May 28 19:56:33 2013 +0200
> @@ -1,3 +1,13 @@
> +2013-05-28  Xerxes RÃ¥nby  <xerxes at zafena.se>
> +
> +	PR1188: ASM Interpreter and Thumb2 JIT javac miscompile
> +	modulo reminder on armel.
> +	* arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S
> +	(POPF1): The POPF1 macro used wrong destination register
> +	r0 instead of r1 on ARM armel causing issues with the frem bytecode.
> +	The frem bytecode was the only bytecode using the defect macro.
> +	* NEWS: Updated.
> +
>  2013-05-15  Andrew John Hughes  <gnu.andrew at member.fsf.org>
>  
>  	PR1458: Make use of bootstrap tools & -Xbootclasspath
> diff -r 632c42c569f8 -r 427412f94dc4 NEWS
> --- a/NEWS	Mon May 27 11:00:32 2013 +0100
> +++ b/NEWS	Tue May 28 19:56:33 2013 +0200
> @@ -21,6 +21,7 @@
>    - OJ4: Backport the new version of copyMemory from OpenJDK 7 to allow
>    Snappy to build
>    - S7022999: Can't build with FORCE_TIERED=0 (bundled HotSpot only)
>  * Bug fixes
> +  - PR1188: ASM Interpreter and Thumb2 JIT javac miscompile modulo reminder
> on armel.
>    - PR1318: Fix automatic enabling of the Zero build on non-JIT
>    architectures which don't use CACAO or JamVM.
>    - RH902004: very bad performance with E-Porto Add-In für OpenOffice
>    Writer installed (hs23 only)
>  * JamVM
> diff -r 632c42c569f8 -r 427412f94dc4
> arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S
> --- a/arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S	Mon May 27
> 11:00:32 2013 +0100
> +++ b/arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S	Tue May 28
> 19:56:33 2013 +0200
> @@ -345,7 +345,7 @@
>  	flds s1, [stack, #4]
>  	add stack, #4
>  #else
> -	POP r0
> +	POP r1
>  #endif
>  	.endm
>  	
> 

Does this apply to the version in 7 too?
-- 
Andrew :)

Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)

PGP Key: 248BDC07 (https://keys.indymedia.org/)
Fingerprint = EC5A 1F5E C0AD 1D15 8F1F  8F91 3B96 A578 248B DC07