From bugzilla-daemon at icedtea.classpath.org Thu Oct 1 01:27:58 2009 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 01 Oct 2009 08:27:58 +0000 Subject: [Bug 385] Regression in NPPlugin from icedtea6-1.6 - Runescape doesn't run Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=385 ------- Comment #6 from mvyskocil at suse.cz 2009-10-01 08:27 ------- (In reply to comment #5) > NP Plugin should not be shipped with anything right now, as it is not complete. > It doesn't have proper array support, and no memory management (and therefore > lots of leaks). Additionally, it hasn't been profiled for efficiency either, so > there might be speed issues. > Well, so feel free to close this bug as WONTFIX. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From thebohemian at gmx.net Thu Oct 1 02:23:35 2009 From: thebohemian at gmx.net (Robert Schuster) Date: Thu, 01 Oct 2009 11:23:35 +0200 Subject: RFC: add --with-cacao-src-dir option Message-ID: <4AC47517.9050103@gmx.net> Hi, attached is a patch that adds an option to specify a source directory (rather than a tarball) to the cacao sources. The reason I want to have this option is that in OpenEmbedded the environment downloads, checks (md5 + sha256 sums) and unpacks the source. With the proposed option we could support that. If this patch is OK I would also like to see it in IcedTea7. ChangeLog: 2009-10-01 Robert Schuster * configure.ac: Added --with-cacao-src-dir option. * acinclude: New macro AC_CHECK_WITH_CACAO_SRC_DIR. * Makefile.am: Copy Cacao sources when USE_ALT_CACAO_SRC_DIR is used. -------------- next part -------------- A non-text attachment was scrubbed... Name: icedtea-with-cacao-src-dir-option.patch Type: text/x-patch Size: 2561 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20091001/cf036a78/attachment.bin -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 260 bytes Desc: OpenPGP digital signature Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20091001/cf036a78/attachment-0001.bin From gnu_andrew at member.fsf.org Thu Oct 1 02:58:51 2009 From: gnu_andrew at member.fsf.org (Andrew John Hughes) Date: Thu, 1 Oct 2009 10:58:51 +0100 Subject: RFC: add --with-cacao-src-dir option In-Reply-To: <4AC47517.9050103@gmx.net> References: <4AC47517.9050103@gmx.net> Message-ID: <17c6771e0910010258u2a80fd5dsdc01cc44b6514aa3@mail.gmail.com> 2009/10/1 Robert Schuster : > Hi, > attached is a patch that adds an option to specify a source directory > (rather than a tarball) to the cacao sources. > > The reason I want to have this option is that in OpenEmbedded the > environment downloads, checks (md5 + sha256 sums) > and unpacks the source. With the proposed option we could support that. > > If this patch is OK I would also like to see it in IcedTea7. > > ChangeLog: > > 2009-10-01 ?Robert Schuster ? > > ? ?* configure.ac: Added --with-cacao-src-dir option. > ? ?* acinclude: New macro AC_CHECK_WITH_CACAO_SRC_DIR. > ? ?* Makefile.am: Copy Cacao sources when USE_ALT_CACAO_SRC_DIR is used. > I'm surprised we don't already have this. It looks sane to me. Assuming you've tested a build with this, it's good to go in. -- Andrew :-) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint: F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From gnu_andrew at member.fsf.org Thu Oct 1 03:00:23 2009 From: gnu_andrew at member.fsf.org (Andrew John Hughes) Date: Thu, 1 Oct 2009 11:00:23 +0100 Subject: RFC: Patch to update help message for --enable-npplugin In-Reply-To: <54677665.1247561254332497696.JavaMail.root@zmail01.collab.prod.int.phx2.redhat.com> References: <1680703577.1246681254331893676.JavaMail.root@zmail01.collab.prod.int.phx2.redhat.com> <54677665.1247561254332497696.JavaMail.root@zmail01.collab.prod.int.phx2.redhat.com> Message-ID: <17c6771e0910010300r561fa449ka559fa28f2a105a3@mail.gmail.com> 2009/9/30 : > This looks like a good idea to me, makes the intent of the configure flag more clear. ?Were you planning on contributing this to both 6 & 7? ?(I think you should.) > > jon > > > ----- "Deepak Bhole" wrote: > >> Some distros seem to be shipping the npplugin despite its >> incompleteness. Attached patch updates the help string to state that >> the >> plugin is experimental. >> >> ChangeLog: >> 2009-09-30 Deepak Bhole ? >> >> ? ?* configure.ac: Change help message for --enable-npplugin to state >> that >> ? ?the plugin is experimental. >> >> Deepak > Looks good to me also, though is probably trivial enough to just commit anyway. Cheers, -- Andrew :-) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint: F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From bugzilla-daemon at icedtea.classpath.org Thu Oct 1 03:38:43 2009 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 01 Oct 2009 10:38:43 +0000 Subject: [Bug 386] New: SEGFAULT when loading applet Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=386 Summary: SEGFAULT when loading applet Product: IcedTea Version: unspecified Platform: PC OS/Version: Linux Status: NEW Severity: normal Priority: P2 Component: IcedTea AssignedTo: unassigned at icedtea.classpath.org ReportedBy: uzytkownik2 at gmail.com When loading applet from http://pkedu.fbt.wur.nl/~hylke/hextd/postscore.php # # A fatal error has been detected by the Java Runtime Environment: # # SIGSEGV (0xb) at pc=0xb80199bd, pid=7528, tid=2418711408 # # JRE version: 6.0-b16 # Java VM: OpenJDK Client VM (14.0-b16 mixed mode linux-x86 ) # Distribution: Custom build (Tue Sep 22 00:40:32 CEST 2009) # Problematic frame: # C [ld-linux.so.2+0x159bd] # # If you would like to submit a bug report, please include # instructions how to reproduce the bug and visit: # http://icedtea.classpath.org/bugzilla # The crash happened outside the Java Virtual Machine in native code. # See problematic frame for where to report the bug. # --------------- T H R E A D --------------- Current thread (0x085d3000): JavaThread "AWT-EventQueue-0" [_thread_in_native, id=7740, stack(0x90259000,0x902aa000)] siginfo:si_signo=SIGSEGV: si_errno=0, si_code=1 (SEGV_MAPERR), si_addr=0x00000200 Registers: EAX=0xb8023c80, EBX=0xb8023fc4, ECX=0x902a9b6c, EDX=0x00000000 ESP=0x902a7dd0, EBP=0x902a7df8, ESI=0x00000000, EDI=0x085d4518 EIP=0xb80199bd, CR2=0x00000200, EFLAGS=0x00210292 Top of Stack: (sp=0x902a7dd0) 0x902a7dd0: 00009c16 b7fa365e b8023fc4 b7fa3238 0x902a7de0: 00000004 902a7e64 b800df08 b7fa6ff4 0x902a7df0: b8023c80 085d4518 902a7e18 b7fa3cf4 0x902a7e00: 00000000 b8023c80 902a7ef8 b80135c5 0x902a7e10: b7fa3cd9 b8023fc4 902a7f08 b80135c5 0x902a7e20: 00000000 00000000 18a916eb 00000016 0x902a7e30: 00000000 00000000 00000005 00000000 0x902a7e40: 085d4520 085d4528 085d4524 902a9b6c Instructions: (pc=0xb80199bd) 0xb80199ad: 5d f4 89 7d fc e8 e4 3a 00 00 81 c3 0d a6 00 00 0xb80199bd: f6 86 00 02 00 00 08 75 37 8b be 90 01 00 00 85 Stack: [0x90259000,0x902aa000], sp=0x902a7dd0, free space=315k Native frames: (J=compiled Java code, j=interpreted, Vv=VM code, C=native code) C [ld-linux.so.2+0x159bd] C [libdl.so.2+0xcf4] C [ld-linux.so.2+0xf5c5] C [libdl.so.2+0x10ec] C [libdl.so.2+0xd2a] dlclose+0x2a C [libjpeg.so+0x1d60] C [libjpeg.so+0x208f] Java_com_sun_imageio_plugins_jpeg_JPEGImageReader_initReaderIDs+0x1f j com.sun.imageio.plugins.jpeg.JPEGImageReader.initReaderIDs(Ljava/lang/Class;Ljava/lang/Class;Ljava/lang/Class;)V+0 j com.sun.imageio.plugins.jpeg.JPEGImageReader.()V+23 v ~StubRoutines::call_stub V [libjvm.so+0x25ce05] V [libjvm.so+0x38ba64] V [libjvm.so+0x25b71c] V [libjvm.so+0x22a7a6] V [libjvm.so+0x22a8a9] V [libjvm.so+0x22e597] V [libjvm.so+0x22ebc1] V [libjvm.so+0x252758] j com.sun.imageio.plugins.jpeg.JPEGImageReaderSpi.createReaderInstance(Ljava/lang/Object;)Ljavax/imageio/ImageReader;+0 j javax.imageio.spi.ImageReaderSpi.createReaderInstance()Ljavax/imageio/ImageReader;+2 j javax.imageio.ImageIO$ImageReaderIterator.next()Ljavax/imageio/ImageReader;+16 j javax.imageio.ImageIO$ImageReaderIterator.next()Ljava/lang/Object;+1 j javax.imageio.ImageIO.read(Ljavax/imageio/stream/ImageInputStream;)Ljava/awt/image/BufferedImage;+31 j javax.imageio.ImageIO.read(Ljava/net/URL;)Ljava/awt/image/BufferedImage;+42 j hextd.util.Context.loadImage(Ljava/lang/String;)Ljava/awt/image/BufferedImage;+39 j hextd.HexTD.paintBoard(Ljava/awt/Graphics2D;)V+194 j hextd.UI.GameBoard.paint(Ljava/awt/Graphics;)V+8 j javax.swing.JComponent.paintChildren(Ljava/awt/Graphics;)V+473 j javax.swing.JComponent.paint(Ljava/awt/Graphics;)V+301 j javax.swing.JComponent.paintChildren(Ljava/awt/Graphics;)V+473 j javax.swing.JComponent.paint(Ljava/awt/Graphics;)V+301 j javax.swing.JComponent.paintChildren(Ljava/awt/Graphics;)V+473 j javax.swing.JComponent.paint(Ljava/awt/Graphics;)V+301 j javax.swing.JComponent.paintChildren(Ljava/awt/Graphics;)V+473 j javax.swing.JComponent.paint(Ljava/awt/Graphics;)V+301 j javax.swing.JLayeredPane.paint(Ljava/awt/Graphics;)V+73 j javax.swing.JComponent.paintChildren(Ljava/awt/Graphics;)V+473 j javax.swing.JComponent.paintToOffscreen(Ljava/awt/Graphics;IIIIII)V+72 j javax.swing.BufferStrategyPaintManager.paint(Ljavax/swing/JComponent;Ljavax/swing/JComponent;Ljava/awt/Graphics;IIII)Z+157 j javax.swing.RepaintManager.paint(Ljavax/swing/JComponent;Ljavax/swing/JComponent;Ljava/awt/Graphics;IIII)V+52 j javax.swing.JComponent.paint(Ljava/awt/Graphics;)V+204 j java.awt.GraphicsCallback$PaintCallback.run(Ljava/awt/Component;Ljava/awt/Graphics;)V+2 j sun.awt.SunGraphicsCallback.runOneComponent(Ljava/awt/Component;Ljava/awt/Rectangle;Ljava/awt/Graphics;Ljava/awt/Shape;I)V+155 j sun.awt.SunGraphicsCallback.runComponents([Ljava/awt/Component;Ljava/awt/Graphics;I)V+197 j java.awt.Container.paint(Ljava/awt/Graphics;)V+55 j javax.swing.RepaintManager.paintDirtyRegions(Ljava/util/Map;)V+245 j javax.swing.RepaintManager.paintDirtyRegions()V+46 j javax.swing.RepaintManager.prePaintDirtyRegions()V+73 j javax.swing.RepaintManager.access$700(Ljavax/swing/RepaintManager;)V+1 j javax.swing.RepaintManager$ProcessingRunnable.run()V+37 j java.awt.event.InvocationEvent.dispatch()V+47 j java.awt.EventQueue.dispatchEvent(Ljava/awt/AWTEvent;)V+26 j java.awt.EventDispatchThread.pumpOneEventForFilters(I)Z+192 j java.awt.EventDispatchThread.pumpEventsForFilter(ILjava/awt/Conditional;Ljava/awt/EventFilter;)V+30 j java.awt.EventDispatchThread.pumpEventsForHierarchy(ILjava/awt/Conditional;Ljava/awt/Component;)V+11 j java.awt.EventDispatchThread.pumpEvents(ILjava/awt/Conditional;)V+4 j java.awt.EventDispatchThread.pumpEvents(Ljava/awt/Conditional;)V+3 j java.awt.EventDispatchThread.run()V+9 v ~StubRoutines::call_stub V [libjvm.so+0x25ce05] V [libjvm.so+0x38ba64] V [libjvm.so+0x25b71c] V [libjvm.so+0x25bd1b] V [libjvm.so+0x25beda] V [libjvm.so+0x2d23c8] V [libjvm.so+0x47629e] V [libjvm.so+0x476426] V [libjvm.so+0x39321a] C [libpthread.so.0+0x58ff] Java frames: (J=compiled Java code, j=interpreted, Vv=VM code) j com.sun.imageio.plugins.jpeg.JPEGImageReader.initReaderIDs(Ljava/lang/Class;Ljava/lang/Class;Ljava/lang/Class;)V+0 j com.sun.imageio.plugins.jpeg.JPEGImageReader.()V+23 v ~StubRoutines::call_stub j com.sun.imageio.plugins.jpeg.JPEGImageReaderSpi.createReaderInstance(Ljava/lang/Object;)Ljavax/imageio/ImageReader;+0 j javax.imageio.spi.ImageReaderSpi.createReaderInstance()Ljavax/imageio/ImageReader;+2 j javax.imageio.ImageIO$ImageReaderIterator.next()Ljavax/imageio/ImageReader;+16 j javax.imageio.ImageIO$ImageReaderIterator.next()Ljava/lang/Object;+1 j javax.imageio.ImageIO.read(Ljavax/imageio/stream/ImageInputStream;)Ljava/awt/image/BufferedImage;+31 j javax.imageio.ImageIO.read(Ljava/net/URL;)Ljava/awt/image/BufferedImage;+42 j hextd.util.Context.loadImage(Ljava/lang/String;)Ljava/awt/image/BufferedImage;+39 j hextd.HexTD.paintBoard(Ljava/awt/Graphics2D;)V+194 j hextd.UI.GameBoard.paint(Ljava/awt/Graphics;)V+8 j javax.swing.JComponent.paintChildren(Ljava/awt/Graphics;)V+473 j javax.swing.JComponent.paint(Ljava/awt/Graphics;)V+301 j javax.swing.JComponent.paintChildren(Ljava/awt/Graphics;)V+473 j javax.swing.JComponent.paint(Ljava/awt/Graphics;)V+301 j javax.swing.JComponent.paintChildren(Ljava/awt/Graphics;)V+473 j javax.swing.JComponent.paint(Ljava/awt/Graphics;)V+301 j javax.swing.JComponent.paintChildren(Ljava/awt/Graphics;)V+473 j javax.swing.JComponent.paint(Ljava/awt/Graphics;)V+301 j javax.swing.JLayeredPane.paint(Ljava/awt/Graphics;)V+73 j javax.swing.JComponent.paintChildren(Ljava/awt/Graphics;)V+473 j javax.swing.JComponent.paintToOffscreen(Ljava/awt/Graphics;IIIIII)V+72 j javax.swing.BufferStrategyPaintManager.paint(Ljavax/swing/JComponent;Ljavax/swing/JComponent;Ljava/awt/Graphics;IIII)Z+157 j javax.swing.RepaintManager.paint(Ljavax/swing/JComponent;Ljavax/swing/JComponent;Ljava/awt/Graphics;IIII)V+52 j javax.swing.JComponent.paint(Ljava/awt/Graphics;)V+204 j java.awt.GraphicsCallback$PaintCallback.run(Ljava/awt/Component;Ljava/awt/Graphics;)V+2 j sun.awt.SunGraphicsCallback.runOneComponent(Ljava/awt/Component;Ljava/awt/Rectangle;Ljava/awt/Graphics;Ljava/awt/Shape;I)V+155 j sun.awt.SunGraphicsCallback.runComponents([Ljava/awt/Component;Ljava/awt/Graphics;I)V+197 j java.awt.Container.paint(Ljava/awt/Graphics;)V+55 j javax.swing.RepaintManager.paintDirtyRegions(Ljava/util/Map;)V+245 j javax.swing.RepaintManager.paintDirtyRegions()V+46 j javax.swing.RepaintManager.prePaintDirtyRegions()V+73 j javax.swing.RepaintManager.access$700(Ljavax/swing/RepaintManager;)V+1 j javax.swing.RepaintManager$ProcessingRunnable.run()V+37 j java.awt.event.InvocationEvent.dispatch()V+47 j java.awt.EventQueue.dispatchEvent(Ljava/awt/AWTEvent;)V+26 j java.awt.EventDispatchThread.pumpOneEventForFilters(I)Z+192 j java.awt.EventDispatchThread.pumpEventsForFilter(ILjava/awt/Conditional;Ljava/awt/EventFilter;)V+30 j java.awt.EventDispatchThread.pumpEventsForHierarchy(ILjava/awt/Conditional;Ljava/awt/Component;)V+11 j java.awt.EventDispatchThread.pumpEvents(ILjava/awt/Conditional;)V+4 j java.awt.EventDispatchThread.pumpEvents(Ljava/awt/Conditional;)V+3 j java.awt.EventDispatchThread.run()V+9 v ~StubRoutines::call_stub --------------- P R O C E S S --------------- Java Threads: ( => current thread ) 0x8ff3d000 JavaThread "gameLogicThread" [_thread_blocked, id=9803, stack(0x90115000,0x90166000)] 0x0844ec00 JavaThread "gameLogicThread" [_thread_blocked, id=9758, stack(0x90073000,0x900c4000)] 0x08398800 JavaThread "Thread-12" [_thread_blocked, id=8472, stack(0x90166000,0x901b7000)] 0x08308400 JavaThread "TimerQueue" daemon [_thread_blocked, id=8312, stack(0x900c4000,0x90115000)] 0x08342400 JavaThread "TimerQueue" daemon [_thread_blocked, id=8311, stack(0x90022000,0x90073000)] 0x085d4c00 JavaThread "Thread-6" [_thread_blocked, id=7758, stack(0x90208000,0x90259000)] =>0x085d3000 JavaThread "AWT-EventQueue-0" [_thread_in_native, id=7740, stack(0x90259000,0x902aa000)] 0x085cb400 JavaThread "AWT-Shutdown" [_thread_blocked, id=7701, stack(0x902aa000,0x902fb000)] 0x082bec00 JavaThread "DestroyJavaVM" [_thread_blocked, id=7530, stack(0xb73e1000,0xb7432000)] 0x084bfc00 JavaThread "Thread-5" [_thread_blocked, id=7547, stack(0x902fb000,0x9034c000)] 0x084be800 JavaThread "Thread-4" [_thread_in_native, id=7546, stack(0x9034c000,0x9039d000)] 0x0847b800 JavaThread "Thread-3" [_thread_blocked, id=7543, stack(0x903ee000,0x9043f000)] 0x0847a000 JavaThread "Thread-2" [_thread_blocked, id=7542, stack(0x9043f000,0x90490000)] 0x08478800 JavaThread "Thread-1" [_thread_blocked, id=7541, stack(0x90490000,0x904e1000)] 0x08470400 JavaThread "AWT-XAWT" daemon [_thread_in_native, id=7540, stack(0x904e1000,0x90532000)] 0x083dd000 JavaThread "Java2D Disposer" daemon [_thread_blocked, id=7539, stack(0x906eb000,0x9073c000)] 0x0832d800 JavaThread "Low Memory Detector" daemon [_thread_blocked, id=7536, stack(0x90b33000,0x90b84000)] 0x0832a800 JavaThread "CompilerThread0" daemon [_thread_blocked, id=7535, stack(0x90b84000,0x90c05000)] 0x08329000 JavaThread "Signal Dispatcher" daemon [_thread_blocked, id=7534, stack(0x90c05000,0x90c56000)] 0x08318400 JavaThread "Finalizer" daemon [_thread_blocked, id=7533, stack(0x90db7000,0x90e08000)] 0x08313800 JavaThread "Reference Handler" daemon [_thread_blocked, id=7532, stack(0x90e08000,0x90e59000)] Other Threads: 0x08310800 VMThread [stack: 0x90e59000,0x90eda000] [id=7531] 0x0832f800 WatcherThread [stack: 0x90ab2000,0x90b33000] [id=7537] VM state:not at safepoint (normal execution) VM Mutex/Monitor currently owned by a thread: None Heap def new generation total 1216K, used 223K [0x912d0000, 0x91420000, 0x93a30000) eden space 1088K, 8% used [0x912d0000, 0x912e7e18, 0x913e0000) from space 128K, 100% used [0x91400000, 0x91420000, 0x91420000) to space 128K, 0% used [0x913e0000, 0x913e0000, 0x91400000) tenured generation total 15012K, used 12121K [0x93a30000, 0x948d9000, 0xb12d0000) the space 15012K, 80% used [0x93a30000, 0x94606670, 0x94606800, 0x948d9000) compacting perm gen total 17664K, used 17586K [0xb12d0000, 0xb2410000, 0xb52d0000) the space 17664K, 99% used [0xb12d0000, 0xb23fcb38, 0xb23fcc00, 0xb2410000) No shared spaces configured. Dynamic libraries: 08048000-08051000 r-xp 00000000 fe:04 23429 /usr/lib/icedtea6/jre/bin/java 08051000-08052000 r--p 00008000 fe:04 23429 /usr/lib/icedtea6/jre/bin/java 08052000-08053000 rw-p 00009000 fe:04 23429 /usr/lib/icedtea6/jre/bin/java 082b9000-086d9000 rw-p 00000000 00:00 0 [heap] 8fc51000-8fc54000 rwxp 00000000 00:00 0 8fc54000-8fca2000 rwxp 00000000 00:00 0 8fca2000-8fca5000 rwxp 00000000 00:00 0 8fca5000-8fcf3000 rwxp 00000000 00:00 0 8feca000-8fefc000 r-xp 00000000 fe:04 28816 /usr/lib/icedtea6/jre/lib/i386/liblcms.so 8fefc000-8fefd000 r--p 00031000 fe:04 28816 /usr/lib/icedtea6/jre/lib/i386/liblcms.so 8fefd000-8fefe000 rw-p 00032000 fe:04 28816 /usr/lib/icedtea6/jre/lib/i386/liblcms.so 8fefe000-8ff00000 rw-p 00000000 00:00 0 8ff00000-8ffea000 rw-p 00000000 00:00 0 8ffea000-90000000 ---p 00000000 00:00 0 90009000-90011000 r-xp 00000000 fe:04 28812 /usr/lib/icedtea6/jre/lib/i386/libjpeg.so 90011000-90012000 r--p 00007000 fe:04 28812 /usr/lib/icedtea6/jre/lib/i386/libjpeg.so 90012000-90013000 rw-p 00008000 fe:04 28812 /usr/lib/icedtea6/jre/lib/i386/libjpeg.so 90013000-9001b000 r-xp 00000000 fe:04 28777 /usr/lib/icedtea6/jre/lib/i386/libnio.so 9001b000-9001c000 r--p 00007000 fe:04 28777 /usr/lib/icedtea6/jre/lib/i386/libnio.so 9001c000-9001d000 rw-p 00008000 fe:04 28777 /usr/lib/icedtea6/jre/lib/i386/libnio.so 9001d000-90022000 r--s 0003f000 fe:00 47772 /home/uzytkownik/.icedteaplugin/cache/http/pkedu.fbt.wur.nl/~hylke/hextd/lib/svgSalamander-tiny.jar 90022000-90025000 ---p 00000000 00:00 0 90025000-90073000 rwxp 00000000 00:00 0 90073000-90076000 ---p 00000000 00:00 0 90076000-900c4000 rwxp 00000000 00:00 0 900c4000-900c7000 ---p 00000000 00:00 0 900c7000-90115000 rwxp 00000000 00:00 0 90115000-90118000 ---p 00000000 00:00 0 90118000-90166000 rwxp 00000000 00:00 0 90166000-90169000 ---p 00000000 00:00 0 90169000-901b7000 rwxp 00000000 00:00 0 901b7000-901ba000 rwxp 00000000 00:00 0 901ba000-90208000 rwxp 00000000 00:00 0 90208000-9020b000 ---p 00000000 00:00 0 9020b000-90259000 rwxp 00000000 00:00 0 90259000-9025c000 ---p 00000000 00:00 0 9025c000-902aa000 rwxp 00000000 00:00 0 902aa000-902ad000 ---p 00000000 00:00 0 902ad000-902fb000 rwxp 00000000 00:00 0 902fb000-902fe000 ---p 00000000 00:00 0 902fe000-9034c000 rwxp 00000000 00:00 0 9034c000-9034f000 ---p 00000000 00:00 0 9034f000-9039d000 rwxp 00000000 00:00 0 9039d000-903a0000 rwxp 00000000 00:00 0 903a0000-903ee000 rwxp 00000000 00:00 0 903ee000-903f1000 ---p 00000000 00:00 0 903f1000-9043f000 rwxp 00000000 00:00 0 9043f000-90442000 ---p 00000000 00:00 0 90442000-90490000 rwxp 00000000 00:00 0 90490000-90493000 ---p 00000000 00:00 0 90493000-904e1000 rwxp 00000000 00:00 0 904e1000-904e4000 ---p 00000000 00:00 0 904e4000-90532000 rwxp 00000000 00:00 0 90532000-90538000 r--s 00000000 fe:03 61373 /var/cache/fontconfig/87f5e051180a7a75f16eb6fe7dbd3749-x86.cache-2 90538000-9053a000 r--s 00000000 fe:03 61379 /var/cache/fontconfig/76fa4b957c916922374347f144bde9da-x86.cache-2 9053a000-9054a000 r--s 00000000 fe:03 61378 /var/cache/fontconfig/8d4af663993b81a124ee82e610bb31f9-x86.cache-2 9054a000-9054d000 r--s 00000000 fe:03 61377 /var/cache/fontconfig/a595ca43be94766bbfe429f07fba82d0-x86.cache-2 9054d000-90554000 r--s 00000000 fe:03 61374 /var/cache/fontconfig/12b26b760a24f8b4feb03ad48a333a72-x86.cache-2 90554000-90567000 r--s 00000000 fe:03 61370 /var/cache/fontconfig/4b5cf4386f1cde02a336ba961b4ac82d-x86.cache-2 90567000-905a8000 r--s 00000000 fe:03 61365 /var/cache/fontconfig/17090aa38d5c6f09fb8c5c354938f1d7-x86.cache-2 905ab000-905bd000 r-xp 00000000 08:02 128506 /lib/libresolv-2.10.1.so 905bd000-905be000 r--p 00012000 08:02 128506 /lib/libresolv-2.10.1.so 905be000-905bf000 rw-p 00013000 08:02 128506 /lib/libresolv-2.10.1.so 905bf000-905c1000 rw-p 00000000 00:00 0 905c1000-905d6000 r-xp 00000000 fe:04 28776 /usr/lib/icedtea6/jre/lib/i386/libnet.so 905d6000-905d7000 r--p 00014000 fe:04 28776 /usr/lib/icedtea6/jre/lib/i386/libnet.so 905d7000-905d8000 rw-p 00015000 fe:04 28776 /usr/lib/icedtea6/jre/lib/i386/libnet.so 905d8000-905de000 r--s 00000000 fe:03 61373 /var/cache/fontconfig/87f5e051180a7a75f16eb6fe7dbd3749-x86.cache-2 905de000-905e0000 r--s 00000000 fe:03 61379 /var/cache/fontconfig/76fa4b957c916922374347f144bde9da-x86.cache-2 905e0000-905f0000 r--s 00000000 fe:03 61378 /var/cache/fontconfig/8d4af663993b81a124ee82e610bb31f9-x86.cache-2 905f0000-905f3000 r--s 00000000 fe:03 61377 /var/cache/fontconfig/a595ca43be94766bbfe429f07fba82d0-x86.cache-2 905f3000-905fa000 r--s 00000000 fe:03 61374 /var/cache/fontconfig/12b26b760a24f8b4feb03ad48a333a72-x86.cache-2 905fa000-9060d000 r--s 00000000 fe:03 61370 /var/cache/fontconfig/4b5cf4386f1cde02a336ba961b4ac82d-x86.cache-2 9060d000-90612000 r--s 00000000 fe:03 61369 /var/cache/fontconfig/d62e99ef547d1d24cdb1bd22ec1a2976-x86.cache-2 90612000-90615000 r--s 00000000 fe:03 61368 /var/cache/fontconfig/f6b893a7224233d96cb72fd88691c0b4-x86.cache-2 90615000-9061a000 r--s 00000000 fe:03 61366 /var/cache/fontconfig/f349e9996a5320f6dd491cedd2b1f964-x86.cache-2 9061a000-9065b000 r--s 00000000 fe:03 61365 /var/cache/fontconfig/17090aa38d5c6f09fb8c5c354938f1d7-x86.cache-2 9065b000-9069c000 r--s 00000000 fe:03 61364 /var/cache/fontconfig/df311e82a1a24c41a75c2c930223552e-x86.cache-2 906a0000-906a5000 r--s 0005f000 fe:00 47771 /home/uzytkownik/.icedteaplugin/cache/http/pkedu.fbt.wur.nl/~hylke/hextd/HexTD.jar 906a5000-906aa000 r--s 00000000 fe:03 61369 /var/cache/fontconfig/d62e99ef547d1d24cdb1bd22ec1a2976-x86.cache-2 906aa000-906eb000 r--s 00000000 fe:03 61364 /var/cache/fontconfig/df311e82a1a24c41a75c2c930223552e-x86.cache-2 906eb000-906ee000 ---p 00000000 00:00 0 906ee000-9073c000 rwxp 00000000 00:00 0 9073c000-907b6000 r-xp 00000000 fe:04 19875 /usr/lib/libfreetype.so.6.3.20 907b6000-907b9000 r--p 0007a000 fe:04 19875 /usr/lib/libfreetype.so.6.3.20 907b9000-907ba000 rw-p 0007d000 fe:04 19875 /usr/lib/libfreetype.so.6.3.20 907ba000-907bf000 r--s 00000000 fe:03 61366 /var/cache/fontconfig/f349e9996a5320f6dd491cedd2b1f964-x86.cache-2 907c3000-907c8000 r-xp 00000000 08:02 128507 /lib/libnss_dns-2.10.1.so 907c8000-907c9000 r--p 00004000 08:02 128507 /lib/libnss_dns-2.10.1.so 907c9000-907ca000 rw-p 00005000 08:02 128507 /lib/libnss_dns-2.10.1.so 907ca000-907ce000 r--s 00079000 fe:04 28832 /usr/lib/icedtea6/jre/lib/jsse.jar 907ce000-907d2000 r-xp 00000000 fe:04 585861 /usr/lib/libXfixes.so.3.1.0 907d2000-907d3000 r--p 00003000 fe:04 585861 /usr/lib/libXfixes.so.3.1.0 907d3000-907d4000 rw-p 00004000 fe:04 585861 /usr/lib/libXfixes.so.3.1.0 907d4000-907dc000 r-xp 00000000 fe:04 4931 /usr/lib/libXcursor.so.1.0.2 907dc000-907dd000 r--p 00008000 fe:04 4931 /usr/lib/libXcursor.so.1.0.2 907dd000-907de000 rw-p 00009000 fe:04 4931 /usr/lib/libXcursor.so.1.0.2 907de000-907e1000 r--s 00000000 fe:00 166118 /home/uzytkownik/.fontconfig/6eec3679eddc743807b6be164df6d281-x86.cache-2 907e1000-90826000 r-xp 00000000 fe:04 28789 /usr/lib/icedtea6/jre/lib/i386/libfontmanager.so 90826000-90828000 r--p 00045000 fe:04 28789 /usr/lib/icedtea6/jre/lib/i386/libfontmanager.so 90828000-90829000 rw-p 00047000 fe:04 28789 /usr/lib/icedtea6/jre/lib/i386/libfontmanager.so 90829000-9082e000 rw-p 00000000 00:00 0 9082e000-90833000 r-xp 00000000 fe:04 22060 /usr/lib/libXdmcp.so.6.0.0 90833000-90834000 r--p 00004000 fe:04 22060 /usr/lib/libXdmcp.so.6.0.0 90834000-90835000 rw-p 00005000 fe:04 22060 /usr/lib/libXdmcp.so.6.0.0 90835000-90837000 r-xp 00000000 fe:04 25052 /usr/lib/libXau.so.6.0.0 90837000-90838000 r--p 00001000 fe:04 25052 /usr/lib/libXau.so.6.0.0 90838000-90839000 rw-p 00002000 fe:04 25052 /usr/lib/libXau.so.6.0.0 90839000-90855000 r-xp 00000000 fe:04 3489 /usr/lib/libxcb.so.1.1.0 90855000-90856000 r--p 0001b000 fe:04 3489 /usr/lib/libxcb.so.1.1.0 90856000-90857000 rw-p 0001c000 fe:04 3489 /usr/lib/libxcb.so.1.1.0 90857000-9085f000 r-xp 00000000 fe:04 21521 /usr/lib/libXi.so.6.0.0 9085f000-90860000 r--p 00007000 fe:04 21521 /usr/lib/libXi.so.6.0.0 90860000-90861000 rw-p 00008000 fe:04 21521 /usr/lib/libXi.so.6.0.0 90861000-90868000 r-xp 00000000 fe:04 585845 /usr/lib/libXrender.so.1.3.0 90868000-90869000 r--p 00006000 fe:04 585845 /usr/lib/libXrender.so.1.3.0 90869000-9086a000 rw-p 00007000 fe:04 585845 /usr/lib/libXrender.so.1.3.0 9086a000-90980000 r-xp 00000000 fe:04 19477 /usr/lib/libX11.so.6.2.0 90980000-90981000 r--p 00115000 fe:04 19477 /usr/lib/libX11.so.6.2.0 90981000-90984000 rw-p 00116000 fe:04 19477 /usr/lib/libX11.so.6.2.0 90984000-90987000 r--s 00000000 fe:03 61368 /var/cache/fontconfig/f6b893a7224233d96cb72fd88691c0b4-x86.cache-2 90987000-909a2000 r-xp 00000000 fe:04 89422 /usr/lib/gcc/i686-pc-linux-gnu/4.4.1/libgcc_s.so.1 909a2000-909a3000 r--p 0001a000 fe:04 89422 /usr/lib/gcc/i686-pc-linux-gnu/4.4.1/libgcc_s.so.1 909a3000-909a4000 rw-p 0001b000 fe:04 89422 /usr/lib/gcc/i686-pc-linux-gnu/4.4.1/libgcc_s.so.1 909a4000-909ab000 r--s 000fe000 fe:04 28847 /usr/lib/icedtea6/jre/lib/resources.jar 909ab000-909f6000 r-xp 00000000 fe:04 28764 /usr/lib/icedtea6/jre/lib/i386/xawt/libmawt.so 909f6000-909f7000 r--p 0004b000 fe:04 28764 /usr/lib/icedtea6/jre/lib/i386/xawt/libmawt.so 909f7000-909f9000 rw-p 0004c000 fe:04 28764 /usr/lib/icedtea6/jre/lib/i386/xawt/libmawt.so 909f9000-909fa000 rw-p 00000000 00:00 0 909fa000-90a86000 r-xp 00000000 fe:04 28818 /usr/lib/icedtea6/jre/lib/i386/libawt.so 90a86000-90a87000 r--p 0008b000 fe:04 28818 /usr/lib/icedtea6/jre/lib/i386/libawt.so 90a87000-90a8e000 rw-p 0008c000 fe:04 28818 /usr/lib/icedtea6/jre/lib/i386/libawt.so 90a8e000-90ab2000 rw-p 00000000 00:00 0 90ab2000-90ab3000 ---p 00000000 00:00 0 90ab3000-90b33000 rwxp 00000000 00:00 0 90b33000-90b36000 ---p 00000000 00:00 0 90b36000-90b84000 rwxp 00000000 00:00 0 90b84000-90b87000 ---p 00000000 00:00 0 90b87000-90c05000 rwxp 00000000 00:00 0 90c05000-90c08000 ---p 00000000 00:00 0 90c08000-90c56000 rwxp 00000000 00:00 0 90c56000-90db7000 r--p 00000000 fe:04 98835 /usr/lib/locale/locale-archive 90db7000-90dba000 ---p 00000000 00:00 0 90dba000-90e08000 rwxp 00000000 00:00 0 90e08000-90e0b000 ---p 00000000 00:00 0 90e0b000-90e59000 rwxp 00000000 00:00 0 90e59000-90e5a000 ---p 00000000 00:00 0 90e5a000-90eda000 rwxp 00000000 00:00 0 90eda000-90f0d000 rw-p 00000000 00:00 0 90f0d000-910a1000 r--s 038da000 fe:04 28854 /usr/lib/icedtea6/jre/lib/rt.jar 910a1000-910aa000 rwxp 00000000 00:00 0 910aa000-910c2000 rwxp 00000000 00:00 0 910c2000-910ca000 rwxp 00000000 00:00 0 910ca000-911af000 rwxp 00000000 00:00 0 911af000-911b0000 rwxp 00000000 00:00 0 911b0000-911c2000 rwxp 00000000 00:00 0 911c2000-911cb000 rwxp 00000000 00:00 0 911cb000-912af000 rwxp 00000000 00:00 0 912af000-912b8000 rwxp 00000000 00:00 0 912b8000-912cf000 rwxp 00000000 00:00 0 912cf000-91420000 rwxp 00000000 00:00 0 91420000-93a30000 rwxp 00000000 00:00 0 93a30000-948d9000 rwxp 00000000 00:00 0 948d9000-b12d0000 rwxp 00000000 00:00 0 b12d0000-b2410000 rwxp 00000000 00:00 0 b2410000-b52d0000 rwxp 00000000 00:00 0 b52d0000-b52d3000 r--s 00000000 fe:00 166118 /home/uzytkownik/.fontconfig/6eec3679eddc743807b6be164df6d281-x86.cache-2 b52d3000-b52db000 rwxp 00000000 00:00 0 b52db000-b5353000 rwxp 00000000 00:00 0 b5353000-b5553000 rwxp 00000000 00:00 0 b5553000-b7353000 rwxp 00000000 00:00 0 b7353000-b735e000 r-xp 00000000 08:02 128511 /lib/libnss_files-2.10.1.so b735e000-b735f000 r--p 0000a000 08:02 128511 /lib/libnss_files-2.10.1.so b735f000-b7360000 rw-p 0000b000 08:02 128511 /lib/libnss_files-2.10.1.so b7360000-b736a000 r-xp 00000000 08:02 128530 /lib/libnss_nis-2.10.1.so b736a000-b736b000 r--p 00009000 08:02 128530 /lib/libnss_nis-2.10.1.so b736b000-b736c000 rw-p 0000a000 08:02 128530 /lib/libnss_nis-2.10.1.so b736c000-b7382000 r-xp 00000000 08:02 128521 /lib/libnsl-2.10.1.so b7382000-b7383000 r--p 00015000 08:02 128521 /lib/libnsl-2.10.1.so b7383000-b7384000 rw-p 00016000 08:02 128521 /lib/libnsl-2.10.1.so b7384000-b7386000 rw-p 00000000 00:00 0 b7386000-b738a000 r-xp 00000000 fe:04 288390 /usr/lib/libXtst.so.6.1.0 b738a000-b738b000 r--p 00004000 fe:04 288390 /usr/lib/libXtst.so.6.1.0 b738b000-b738c000 rw-p 00005000 fe:04 288390 /usr/lib/libXtst.so.6.1.0 b738c000-b739a000 r-xp 00000000 fe:04 21436 /usr/lib/libXext.so.6.4.0 b739a000-b739b000 r--p 0000d000 fe:04 21436 /usr/lib/libXext.so.6.4.0 b739b000-b739c000 rw-p 0000e000 fe:04 21436 /usr/lib/libXext.so.6.4.0 b739c000-b73a3000 r-xp 00000000 fe:04 28791 /usr/lib/icedtea6/jre/lib/i386/libzip.so b73a3000-b73a4000 r--p 00006000 fe:04 28791 /usr/lib/icedtea6/jre/lib/i386/libzip.so b73a4000-b73a5000 rw-p 00007000 fe:04 28791 /usr/lib/icedtea6/jre/lib/i386/libzip.so b73a5000-b73ad000 rw-s 00000000 08:02 96385 /tmp/hsperfdata_uzytkownik/7528 b73ad000-b73d4000 r-xp 00000000 fe:04 28804 /usr/lib/icedtea6/jre/lib/i386/libjava.so b73d4000-b73d5000 r--p 00026000 fe:04 28804 /usr/lib/icedtea6/jre/lib/i386/libjava.so b73d5000-b73d7000 rw-p 00027000 fe:04 28804 /usr/lib/icedtea6/jre/lib/i386/libjava.so b73d7000-b73df000 r-xp 00000000 08:02 128512 /lib/librt-2.10.1.so b73df000-b73e0000 r--p 00007000 08:02 128512 /lib/librt-2.10.1.so b73e0000-b73e1000 rw-p 00008000 08:02 128512 /lib/librt-2.10.1.so b73e1000-b73e4000 ---p 00000000 00:00 0 b73e4000-b7432000 rwxp 00000000 00:00 0 b7432000-b7459000 r-xp 00000000 08:02 128496 /lib/libm-2.10.1.so b7459000-b745a000 r--p 00026000 08:02 128496 /lib/libm-2.10.1.so b745a000-b745b000 rw-p 00027000 08:02 128496 /lib/libm-2.10.1.so b745b000-b79f5000 r-xp 00000000 fe:04 28797 /usr/lib/icedtea6/jre/lib/i386/client/libjvm.so b79f5000-b7a0b000 r--p 0059a000 fe:04 28797 /usr/lib/icedtea6/jre/lib/i386/client/libjvm.so b7a0b000-b7a17000 rw-p 005b0000 fe:04 28797 /usr/lib/icedtea6/jre/lib/i386/client/libjvm.so b7a17000-b7e39000 rw-p 00000000 00:00 0 b7e39000-b7f9c000 r-xp 00000000 08:02 128491 /lib/libc-2.10.1.so b7f9c000-b7f9d000 ---p 00163000 08:02 128491 /lib/libc-2.10.1.so b7f9d000-b7f9f000 r--p 00163000 08:02 128491 /lib/libc-2.10.1.so b7f9f000-b7fa0000 rw-p 00165000 08:02 128491 /lib/libc-2.10.1.so b7fa0000-b7fa3000 rw-p 00000000 00:00 0 b7fa3000-b7fa6000 r-xp 00000000 08:02 128499 /lib/libdl-2.10.1.so b7fa6000-b7fa7000 r--p 00002000 08:02 128499 /lib/libdl-2.10.1.so b7fa7000-b7fa8000 rw-p 00003000 08:02 128499 /lib/libdl-2.10.1.so b7fa8000-b7fac000 r-xp 00000000 fe:04 28763 /usr/lib/icedtea6/jre/lib/i386/jli/libjli.so b7fac000-b7fad000 r--p 00003000 fe:04 28763 /usr/lib/icedtea6/jre/lib/i386/jli/libjli.so b7fad000-b7fae000 rw-p 00004000 fe:04 28763 /usr/lib/icedtea6/jre/lib/i386/jli/libjli.so b7fae000-b7fc5000 r-xp 00000000 08:02 128502 /lib/libpthread-2.10.1.so b7fc5000-b7fc6000 r--p 00016000 08:02 128502 /lib/libpthread-2.10.1.so b7fc6000-b7fc7000 rw-p 00017000 08:02 128502 /lib/libpthread-2.10.1.so b7fc7000-b7fc9000 rw-p 00000000 00:00 0 b7fc9000-b7fd9000 r-xp 00000000 08:02 128305 /lib/libz.so.1.2.3 b7fd9000-b7fda000 r--p 0000f000 08:02 128305 /lib/libz.so.1.2.3 b7fda000-b7fdb000 rw-p 00010000 08:02 128305 /lib/libz.so.1.2.3 b7fdb000-b7fdf000 r--s 0018d000 fe:04 28755 /usr/lib/icedtea6/jre/lib/ext/pulse-java.jar b7fdf000-b7fe6000 r-xp 00000000 08:02 128533 /lib/libnss_compat-2.10.1.so b7fe6000-b7fe7000 r--p 00006000 08:02 128533 /lib/libnss_compat-2.10.1.so b7fe7000-b7fe8000 rw-p 00007000 08:02 128533 /lib/libnss_compat-2.10.1.so b7fe8000-b7ff0000 r-xp 00000000 fe:04 28792 /usr/lib/icedtea6/jre/lib/i386/native_threads/libhpi.so b7ff0000-b7ff1000 r--p 00007000 fe:04 28792 /usr/lib/icedtea6/jre/lib/i386/native_threads/libhpi.so b7ff1000-b7ff2000 rw-p 00008000 fe:04 28792 /usr/lib/icedtea6/jre/lib/i386/native_threads/libhpi.so b7ff2000-b7ff3000 rw-p 00000000 00:00 0 b7ff3000-b7ff4000 r--p 00000000 00:00 0 b7ff4000-b8000000 r-xp 00000000 fe:04 28786 /usr/lib/icedtea6/jre/lib/i386/libverify.so b8000000-b8001000 r--p 0000b000 fe:04 28786 /usr/lib/icedtea6/jre/lib/i386/libverify.so b8001000-b8002000 rw-p 0000c000 fe:04 28786 /usr/lib/icedtea6/jre/lib/i386/libverify.so b8002000-b8003000 rw-p 00000000 00:00 0 b8003000-b8004000 r-xp 00000000 00:00 0 [vdso] b8004000-b8023000 r-xp 00000000 08:02 128535 /lib/ld-2.10.1.so b8023000-b8024000 r--p 0001f000 08:02 128535 /lib/ld-2.10.1.so b8024000-b8025000 rw-p 00020000 08:02 128535 /lib/ld-2.10.1.so bfc69000-bfc7d000 rwxp 00000000 00:00 0 [stack] bfc7d000-bfc7f000 rw-p 00000000 00:00 0 VM Arguments: java_command: sun.applet.PluginMain Launcher Type: SUN_STANDARD Environment Variables: JAVA_HOME=/home/uzytkownik/.gentoo/java-config-2/current-user-vm PATH=/home/uzytkownik/.applications/bin:/home/uzytkownik/.cabal/bin:/home/uzytkownik/.openmoko/bin:/home/uzytkownik/.applications/lib/gems/bin/:/home/uzytkownik/OpenMoko/dist/bin:/usr/local/bin:/usr/bin:/bin:/opt/bin:/usr/i686-pc-linux-gnu/gcc-bin/4.4.1:/usr/games/bin:/usr/lib/gcj-4.2.0_alpha20070131/bin USERNAME=uzytkownik LD_LIBRARY_PATH=/usr/lib/icedtea6/jre/lib/i386/client:/usr/lib/icedtea6/jre/lib/i386:/usr/lib/icedtea6/jre/../lib/i386:/usr/lib/mozilla-firefox SHELL=/bin/zsh DISPLAY=:0.0 Signal Handlers: SIGSEGV: [libjvm.so+0x4aec40], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004 SIGBUS: [libjvm.so+0x4aec40], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004 SIGFPE: [libjvm.so+0x38f0b0], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004 SIGPIPE: [libjvm.so+0x38f0b0], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004 SIGXFSZ: [libjvm.so+0x38f0b0], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004 SIGILL: [libjvm.so+0x38f0b0], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004 SIGUSR1: SIG_DFL, sa_mask[0]=0x00000000, sa_flags=0x00000000 SIGUSR2: [libjvm.so+0x38e4e0], sa_mask[0]=0x00000000, sa_flags=0x10000004 SIGHUP: [libjvm.so+0x391590], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004 SIGINT: [libjvm.so+0x391590], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004 SIGTERM: [libjvm.so+0x391590], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004 SIGQUIT: [libjvm.so+0x391590], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004 --------------- S Y S T E M --------------- OS:Gentoo Base System release 2.0.1 uname:Linux 2.6.31 #6 Sun Sep 13 23:50:12 CEST 2009 i686 libc:glibc 2.10.1 NPTL 2.10.1 rlimit: STACK 8192k, CORE 0k, NPROC 15351, NOFILE 1024, AS infinity load average:3.28 1.95 1.86 CPU:total 1 (1 cores per cpu, 1 threads per core) family 6 model 13 stepping 8, cmov, cx8, fxsr, mmx, sse, sse2 Memory: 4k page, physical 1945172k(53640k free), swap 3116556k(2686072k free) vm_info: OpenJDK Client VM (14.0-b16) for linux-x86 JRE (1.6.0_0-b16), built on Sep 22 2009 02:16:42 by "root" with gcc 4.4.1 time: Thu Oct 1 12:36:38 2009 elapsed time: 34 seconds -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From rschuster at icedtea.classpath.org Thu Oct 1 05:53:00 2009 From: rschuster at icedtea.classpath.org (rschuster at icedtea.classpath.org) Date: Thu, 01 Oct 2009 12:53:00 +0000 Subject: /hg/icedtea6: 2009-10-01 Robert Schuster changeset 66ad418c7b91 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=66ad418c7b91 author: Robert Schuster date: Thu Oct 01 11:24:55 2009 +0200 2009-10-01 Robert Schuster * configure.ac: Added --with-cacao-src-dir option. * acinclude: New macro AC_CHECK_WITH_CACAO_SRC_DIR. * Makefile.am: Copy Cacao sources when USE_ALT_CACAO_SRC_DIR is used. diffstat: 4 files changed, 42 insertions(+) ChangeLog | 6 ++++++ Makefile.am | 18 ++++++++++++++++++ acinclude.m4 | 17 +++++++++++++++++ configure.ac | 1 + diffs (116 lines): diff -r b387a64caa08 -r 66ad418c7b91 ChangeLog --- a/ChangeLog Mon Sep 28 19:02:32 2009 +0100 +++ b/ChangeLog Thu Oct 01 11:24:55 2009 +0200 @@ -1,3 +1,9 @@ 2009-09-03 Andrew John Hughes + + * configure.ac: Added --with-cacao-src-dir option. + * acinclude: New macro AC_CHECK_WITH_CACAO_SRC_DIR. + * Makefile.am: Copy Cacao sources when USE_ALT_CACAO_SRC_DIR is used. + 2009-09-03 Andrew John Hughes PR icedtea/356 diff -r b387a64caa08 -r 66ad418c7b91 Makefile.am --- a/Makefile.am Mon Sep 28 19:02:32 2009 +0100 +++ b/Makefile.am Thu Oct 01 11:24:55 2009 +0200 @@ -348,7 +348,11 @@ if USE_ALT_CACAO_SRC_ZIP if USE_ALT_CACAO_SRC_ZIP CACAO_SRC_ZIP = $(ALT_CACAO_SRC_ZIP) else +if USE_ALT_CACAO_SRC_DIR + CACAO_SRC_ZIP = "not needed" +else CACAO_SRC_ZIP = cacao-$(CACAO_VERSION).tar.gz +endif endif # VisualVM sources. Alternatives cannot be used here. @@ -424,6 +428,8 @@ if !USE_SYSTEM_CACAO if !USE_SYSTEM_CACAO if USE_ALT_CACAO_SRC_ZIP else +if USE_ALT_CACAO_SRC_DIR +else if ! echo "$(CACAO_MD5SUM) $(CACAO_SRC_ZIP)" \ | $(MD5SUM) --check ; \ then \ @@ -433,6 +439,7 @@ else fi ; \ $(WGET) $(CACAO_URL)$(CACAO_SRC_ZIP) -O $(CACAO_SRC_ZIP); \ fi +endif endif endif endif @@ -469,7 +476,10 @@ clean-download: rm -f stamps/download.stamp rm -f $(OPENJDK_SRC_ZIP) if BUILD_CACAO +if USE_ALT_CACAO_SRC_DIR +else rm -f $(CACAO_SRC_ZIP) +endif endif if WITH_VISUALVM rm -f $(VISUALVM_SRC_ZIP) @@ -758,6 +768,13 @@ endif endif if BUILD_CACAO if !USE_SYSTEM_CACAO +if USE_ALT_CACAO_SRC_DIR + if ! test -d cacao ; \ + then \ + mkdir -p cacao/cacao ; \ + cp -r $(ALT_CACAO_SRC_DIR)/* cacao/cacao/ ; \ + fi +else if ! test -d cacao ; \ then \ mkdir cacao ; \ @@ -765,6 +782,7 @@ if !USE_SYSTEM_CACAO dir=$$(basename cacao/cacao-*) ; \ ln -s $$dir cacao/cacao ; \ fi +endif endif endif if WITH_VISUALVM diff -r b387a64caa08 -r 66ad418c7b91 acinclude.m4 --- a/acinclude.m4 Mon Sep 28 19:02:32 2009 +0100 +++ b/acinclude.m4 Thu Oct 01 11:24:55 2009 +0200 @@ -857,6 +857,23 @@ AC_DEFUN([AC_CHECK_WITH_CACAO_SRC_ZIP], AC_SUBST(ALT_CACAO_SRC_ZIP) ]) +AC_DEFUN([AC_CHECK_WITH_CACAO_SRC_DIR], +[ + AC_MSG_CHECKING(for a Cacao source directory) + AC_ARG_WITH([cacao-src-dir], + [AS_HELP_STRING(--with-cacao-src-dir,specify the location of the Cacao sources)], + [ + ALT_CACAO_SRC_DIR=${withval} + AM_CONDITIONAL(USE_ALT_CACAO_SRC_DIR, test x = x) + ], + [ + ALT_CACAO_SRC_DIR="not specified" + AM_CONDITIONAL(USE_ALT_CACAO_SRC_DIR, test x != x) + ]) + AC_MSG_RESULT(${ALT_CACAO_SRC_DIR}) + AC_SUBST(ALT_CACAO_SRC_DIR) +]) + AC_DEFUN([AC_CHECK_WITH_GCJ], [ AC_MSG_CHECKING([whether to compile ecj natively]) diff -r b387a64caa08 -r 66ad418c7b91 configure.ac --- a/configure.ac Mon Sep 28 19:02:32 2009 +0100 +++ b/configure.ac Thu Oct 01 11:24:55 2009 +0200 @@ -243,6 +243,7 @@ AC_CHECK_ENABLE_CACAO AC_CHECK_ENABLE_CACAO AC_CHECK_WITH_CACAO_HOME AC_CHECK_WITH_CACAO_SRC_ZIP +AC_CHECK_WITH_CACAO_SRC_DIR ENABLE_OPTIMIZATIONS ENABLE_ZERO_BUILD SET_CORE_OR_SHARK_BUILD From thebohemian at gmx.net Thu Oct 1 06:31:59 2009 From: thebohemian at gmx.net (Robert Schuster) Date: Thu, 01 Oct 2009 15:31:59 +0200 Subject: RFC: add --with-cacao-src-dir option In-Reply-To: <17c6771e0910010258u2a80fd5dsdc01cc44b6514aa3@mail.gmail.com> References: <4AC47517.9050103@gmx.net> <17c6771e0910010258u2a80fd5dsdc01cc44b6514aa3@mail.gmail.com> Message-ID: <4AC4AF4F.8020606@gmx.net> Hi Andrew, Andrew John Hughes schrieb: >> 2009-10-01 Robert Schuster >> >> * configure.ac: Added --with-cacao-src-dir option. >> * acinclude: New macro AC_CHECK_WITH_CACAO_SRC_DIR. >> * Makefile.am: Copy Cacao sources when USE_ALT_CACAO_SRC_DIR is used. >> > > I'm surprised we don't already have this. It looks sane to me. > Assuming you've tested a build with this, it's good to go in. Thanks, I tested and pushed it. I used 'hg transplant' to merge the patch into IcedTea7. It is now already in the outgoing queue. How can I see a diff from it? Regards Robert -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 260 bytes Desc: OpenPGP digital signature Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20091001/451381ca/attachment.bin From gnu_andrew at member.fsf.org Thu Oct 1 07:22:40 2009 From: gnu_andrew at member.fsf.org (Andrew John Hughes) Date: Thu, 1 Oct 2009 15:22:40 +0100 Subject: RFC: add --with-cacao-src-dir option In-Reply-To: <4AC4AF4F.8020606@gmx.net> References: <4AC47517.9050103@gmx.net> <17c6771e0910010258u2a80fd5dsdc01cc44b6514aa3@mail.gmail.com> <4AC4AF4F.8020606@gmx.net> Message-ID: <17c6771e0910010722h34ac8524k2e9709fcc2e3816d@mail.gmail.com> 2009/10/1 Robert Schuster : > Hi Andrew, > > Andrew John Hughes schrieb: >>> 2009-10-01 ?Robert Schuster ? >>> >>> ? ?* configure.ac: Added --with-cacao-src-dir option. >>> ? ?* acinclude: New macro AC_CHECK_WITH_CACAO_SRC_DIR. >>> ? ?* Makefile.am: Copy Cacao sources when USE_ALT_CACAO_SRC_DIR is used. >>> >> >> I'm surprised we don't already have this. ?It looks sane to me. >> Assuming you've tested a build with this, it's good to go in. > Thanks, I tested and pushed it. > > I used 'hg transplant' to merge the patch into IcedTea7. It is now > already in the outgoing queue. How can I see a diff from it? > > Regards > Robert > > hg export tip or hg export should do it. Thanks for forwardporting it! :) -- Andrew :-) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint: F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From andrew at icedtea.classpath.org Thu Oct 1 10:02:54 2009 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Thu, 01 Oct 2009 17:02:54 +0000 Subject: /hg/icedtea: Makefile reorganisation and naming update. Message-ID: changeset 43acec61d3e9 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=43acec61d3e9 author: Andrew John Hughes date: Thu Oct 01 18:05:17 2009 +0100 Makefile reorganisation and naming update. 2009-10-01 Andrew John Hughes Reorganise Makefile and rename some targets to better refer to the two stages of the build (stage1/bootstrap and stage2/final). * patches/ecj/icedtea-dbcs.patch, * patches/ecj/icedtea-dyn.patch, * patches/ecj/icedtea-euctw.patch, * patches/ecj/icedtea-hotspot-default.patch, * patches/ecj/icedtea-jopt.patch, * patches/ecj/icedtea-pr39408.patch, * patches/ecj/icedtea-pr40188.patch, * patches/ecj/icedtea-pr40616.patch, * patches/ecj/icedtea-sbcs.patch, * patches/ecj/icedtea-spp.patch, * patches/ecj/icedtea.patch: Moved to... * Makefile.am: Reorganise Makefile, change openjdk-ecj to openjdk-boot and patches/ecj to patches/boot. icedtea- against-icedtea is now icedtea-stage2. icedtea-against-ecj is now icedtea-stage1. Remove stage2 dependency on plugs.stamp and hotspot-tools.stamp. Move visualvm to a complete separate target depended on by icedtea-stage2. * patches/boot/icedtea-dbcs.patch, * patches/boot/icedtea-dyn.patch, * patches/boot/icedtea-euctw.patch, * patches/boot/icedtea-hotspot-default.patch, * patches/boot/icedtea-jopt.patch, * patches/boot/icedtea-pr39408.patch, * patches/boot/icedtea-pr40188.patch, * patches/boot/icedtea-pr40616.patch, * patches/boot/icedtea-sbcs.patch, * patches/boot/icedtea-spp.patch, * patches/boot/icedtea.patch: here. diffstat: 24 files changed, 2670 insertions(+), 3895 deletions(-) ChangeLog | 37 Makefile.am | 4256 +++++++++------------------- patches/boot/icedtea-dbcs.patch | 40 patches/boot/icedtea-dyn.patch | 12 patches/boot/icedtea-euctw.patch | 32 patches/boot/icedtea-hotspot-default.patch | 69 patches/boot/icedtea-jopt.patch | 26 patches/boot/icedtea-pr39408.patch | 18 patches/boot/icedtea-pr40188.patch | 15 patches/boot/icedtea-pr40616.patch | 15 patches/boot/icedtea-sbcs.patch | 38 patches/boot/icedtea-spp.patch | 65 patches/boot/icedtea.patch | 806 +++++ patches/ecj/icedtea-dbcs.patch | 40 patches/ecj/icedtea-dyn.patch | 12 patches/ecj/icedtea-euctw.patch | 32 patches/ecj/icedtea-hotspot-default.patch | 69 patches/ecj/icedtea-jopt.patch | 26 patches/ecj/icedtea-pr39408.patch | 18 patches/ecj/icedtea-pr40188.patch | 15 patches/ecj/icedtea-pr40616.patch | 15 patches/ecj/icedtea-sbcs.patch | 38 patches/ecj/icedtea-spp.patch | 65 patches/ecj/icedtea.patch | 806 ----- diffs (truncated from 6880 to 500 lines): diff -r 5195537c2fa0 -r 43acec61d3e9 ChangeLog --- a/ChangeLog Wed Sep 30 13:02:58 2009 +0100 +++ b/ChangeLog Thu Oct 01 18:05:17 2009 +0100 @@ -1,3 +1,40 @@ 2009-09-30 Andrew John Hughes + + Reorganise Makefile and rename some + targets to better refer to the two stages + of the build (stage1/bootstrap and stage2/final). + * patches/ecj/icedtea-dbcs.patch, + * patches/ecj/icedtea-dyn.patch, + * patches/ecj/icedtea-euctw.patch, + * patches/ecj/icedtea-hotspot-default.patch, + * patches/ecj/icedtea-jopt.patch, + * patches/ecj/icedtea-pr39408.patch, + * patches/ecj/icedtea-pr40188.patch, + * patches/ecj/icedtea-pr40616.patch, + * patches/ecj/icedtea-sbcs.patch, + * patches/ecj/icedtea-spp.patch, + * patches/ecj/icedtea.patch: Moved to... + * Makefile.am: + Reorganise Makefile, change openjdk-ecj + to openjdk-boot and patches/ecj to patches/boot. + icedtea-against-icedtea is now icedtea-stage2. + icedtea-against-ecj is now icedtea-stage1. + Remove stage2 dependency on plugs.stamp and + hotspot-tools.stamp. Move visualvm to a + complete separate target depended on by + icedtea-stage2. + * patches/boot/icedtea-dbcs.patch, + * patches/boot/icedtea-dyn.patch, + * patches/boot/icedtea-euctw.patch, + * patches/boot/icedtea-hotspot-default.patch, + * patches/boot/icedtea-jopt.patch, + * patches/boot/icedtea-pr39408.patch, + * patches/boot/icedtea-pr40188.patch, + * patches/boot/icedtea-pr40616.patch, + * patches/boot/icedtea-sbcs.patch, + * patches/boot/icedtea-spp.patch, + * patches/boot/icedtea.patch: here. + 2009-09-30 Andrew John Hughes * generated/javax/swing/plaf/nimbus/ArrowButtonPainter.java, diff -r 5195537c2fa0 -r 43acec61d3e9 Makefile.am --- a/Makefile.am Wed Sep 30 13:02:58 2009 +0100 +++ b/Makefile.am Thu Oct 01 18:05:17 2009 +0100 @@ -1,3 +1,5 @@ OPENJDK_VERSION = b72 +# Dependencies + OPENJDK_VERSION = b72 CORBA_CHANGESET = 5fdcfb25dbb4 @@ -19,8 +21,137 @@ CACAO_VERSION = 0.99.4 CACAO_VERSION = 0.99.4 CACAO_MD5SUM = 63220327925ace13756ae334c55a3baa +NETBEANS_PROFILER_URL = http://icedtea.classpath.org/visualvm/ +NETBEANS_PROFILER_SRC_ZIP = netbeans-profiler-visualvm_release65_mod.tar.gz NETBEANS_PROFILER_MD5SUM = a6756a62291ebea5c0e2431389b31380 + +VISUALVM_URL = https://visualvm.dev.java.net/files/documents/7163/127170/ +VISUALVM_SRC_ZIP = visualvm-111-src.tar.gz VISUALVM_MD5SUM = a289739f4a5bcdb9a2c642cfcc1e83fe + +OPENJDK_HOTSPOT_URL = http://hg.openjdk.java.net/jdk7/hotspot/hotspot + +ICEDTEA_HG_URL = http://hg.openjdk.java.net/icedtea/jdk7 +OPENJDK_HG_URL = http://hg.openjdk.java.net/jdk7/jdk7 +CVMI_HG_URL = http://hg.openjdk.java.net/cvmi/cvmi/ +CLOSURES_HG_URL = http://hg.openjdk.java.net/closures/closures/ +CACIOCAVALLO_HG_URL = http://hg.openjdk.java.net/caciocavallo/jdk7/ +BSD_HG_URL = http://hg.openjdk.java.net/bsd-port/bsd-port +NIO2_HG_URL = http://hg.openjdk.java.net/nio/nio/ + +OPENJDK_URL = $(ICEDTEA_HG_URL) +CORBA_URL = $(ICEDTEA_HG_URL)/corba +JAXP_URL = $(ICEDTEA_HG_URL)/jaxp +JAXWS_URL = $(ICEDTEA_HG_URL)/jaxws +JDK_URL = $(ICEDTEA_HG_URL)/jdk +LANGTOOLS_URL = $(ICEDTEA_HG_URL)/langtools +HOTSPOT_URL = $(ICEDTEA_HG_URL)/hotspot + +CACAO_BASE_URL = http://www.complang.tuwien.ac.at +CACAO_URL = $(CACAO_BASE_URL)/cacaojvm/download/cacao-$(CACAO_VERSION)/ + +JDK_SHARE = openjdk/jdk/src/share/classes +JDK_SOLARIS = openjdk/jdk/src/solaris/classes +LANGTOOLS = openjdk/langtools/src/share/classes +JAXP = openjdk/jaxp/src/share/classes +CORBA = openjdk/corba/src/share/classes +JAXWS = openjdk/jaxws/src/share/classes + +OPENJDK_SOURCEPATH_DIRS = \ + $(JDK_SHARE):$(JDK_SOLARIS):$(LANGTOOLS):$(JAXP):$(CORBA):$(JAXWS) + +SOURCEPATH_DIRS = $(abs_top_builddir)/generated:$(OPENJDK_SOURCEPATH_DIRS) + +NETX_DIR=$(abs_top_srcdir)/netx/net/sourceforge +NETX_RESOURCE_DIR=$(NETX_DIR)/jnlp/resources + +IT_LANGUAGE_SOURCE_VERSION=5 +IT_CLASS_TARGET_VERSION=5 +IT_JAVAC_SETTINGS=-g -encoding utf-8 $(JAVACFLAGS) +IT_JAVACFLAGS=$(IT_JAVAC_SETTINGS) -source $(IT_LANGUAGE_SOURCE_VERSION) -target $(IT_CLASS_TARGET_VERSION) + +OS_DIR = $(BUILD_OS_DIR)-$(BUILD_ARCH_DIR) +BUILD_OUTPUT_DIR = openjdk/build/$(OS_DIR) +BOOT_BUILD_OUTPUT_DIR = openjdk-boot/build/$(OS_DIR) +ICEDTEA_BUILD_DIR = \ + $(abs_top_builddir)/$(BUILD_OUTPUT_DIR) +ICEDTEA_RT = \ + $(abs_top_builddir)/bootstrap/jdk1.7.0/jre/lib/rt-closed.jar +ICEDTEA_BOOT_DIR= \ + $(abs_top_builddir)/bootstrap/jdk1.6.0 +ICEDTEA_ENDORSED_DIR = \ + $(ICEDTEA_BOOT_DIR)/lib/endorsed +ICEDTEA_BUILD_DIR_BOOT = \ + $(abs_top_builddir)/$(BOOT_BUILD_OUTPUT_DIR)/ +ICEDTEA_CLS_DIR_BOOT = \ + $(abs_top_builddir)/$(BOOT_BUILD_OUTPUT_DIR)/classes +SERVER_DIR = hotspot/import/jre/lib/$(INSTALL_ARCH_DIR)/server +BUILD_JRE_ARCH_DIR = $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) +BUILD_DEBUG_JRE_ARCH_DIR = $(BUILD_OUTPUT_DIR)-debug/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) + +# Conditional defintions + +if USE_HG + OPENJDK_SRC_ZIP = + CORBA_SRC_ZIP = + JAXP_SRC_ZIP = + JAXWS_SRC_ZIP = + JDK_SRC_ZIP = + LANGTOOLS_SRC_ZIP = + HOTSPOT_SRC_ZIP = +else +if USE_ALT_OPENJDK_SRC_ZIP + OPENJDK_SRC_ZIP = $(ALT_OPENJDK_SRC_ZIP) +else + OPENJDK_SRC_ZIP = openjdk.tar.gz +endif +if USE_ALT_CORBA_SRC_ZIP + CORBA_SRC_ZIP = $(ALT_CORBA_SRC_ZIP) +else + CORBA_SRC_ZIP = corba.tar.gz +endif +if USE_ALT_JAXP_SRC_ZIP + JAXP_SRC_ZIP = $(ALT_JAXP_SRC_ZIP) +else + JAXP_SRC_ZIP = jaxp.tar.gz +endif +if USE_ALT_JAXWS_SRC_ZIP + JAXWS_SRC_ZIP = $(ALT_JAXWS_SRC_ZIP) +else + JAXWS_SRC_ZIP = jaxws.tar.gz +endif +if USE_ALT_JDK_SRC_ZIP + JDK_SRC_ZIP = $(ALT_JDK_SRC_ZIP) +else + JDK_SRC_ZIP = jdk.tar.gz +endif +if USE_ALT_LANGTOOLS_SRC_ZIP + LANGTOOLS_SRC_ZIP = $(ALT_LANGTOOLS_SRC_ZIP) +else + LANGTOOLS_SRC_ZIP = langtools.tar.gz +endif +if USE_ALT_HOTSPOT_SRC_ZIP + HOTSPOT_SRC_ZIP = $(ALT_HOTSPOT_SRC_ZIP) +else + HOTSPOT_SRC_ZIP = hotspot.tar.gz +endif +endif + +if WITH_ALT_HSBUILD + HS_MD5SUM = "`$(AWK) 'version==$$1 {print $$3}' version=$(HSBUILD) $(abs_top_srcdir)/hotspot.map`" + HS_CHANGESET = "`$(AWK) 'version==$$1 {print $$2}' version=$(HSBUILD) $(abs_top_srcdir)/hotspot.map`" + HS_URL = $(OPENJDK_HOTSPOT_URL) +else + HS_MD5SUM = $(HOTSPOT_MD5SUM) + HS_CHANGESET = $(HOTSPOT_CHANGESET) + HS_URL = $(HOTSPOT_URL) +endif + +if USE_ALT_CACAO_SRC_ZIP + CACAO_SRC_ZIP = $(ALT_CACAO_SRC_ZIP) +else + CACAO_SRC_ZIP = cacao-$(CACAO_VERSION).tar.bz2 +endif if ENABLE_NPPLUGIN ICEDTEAPLUGIN_CLEAN = clean-IcedTeaNPPlugin @@ -61,1337 +192,353 @@ PULSE_JAVA_CLASS_DIR = PULSE_JAVA_CLASS_DIR = endif -JDK_SHARE = openjdk/jdk/src/share/classes -JDK_SOLARIS = openjdk/jdk/src/solaris/classes -LANGTOOLS = openjdk/langtools/src/share/classes -JAXP = openjdk/jaxp/src/share/classes -CORBA = openjdk/corba/src/share/classes -JAXWS = openjdk/jaxws/src/share/classes - -OPENJDK_SOURCEPATH_DIRS = \ - $(JDK_SHARE):$(JDK_SOLARIS):$(LANGTOOLS):$(JAXP):$(CORBA):$(JAXWS) - -SOURCEPATH_DIRS = $(abs_top_builddir)/generated:$(OPENJDK_SOURCEPATH_DIRS) - -IT_LANGUAGE_SOURCE_VERSION=5 -IT_CLASS_TARGET_VERSION=5 -IT_JAVAC_SETTINGS=-g -encoding utf-8 $(JAVACFLAGS) -IT_JAVACFLAGS=$(IT_JAVAC_SETTINGS) -source $(IT_LANGUAGE_SOURCE_VERSION) -target $(IT_CLASS_TARGET_VERSION) - -# Top-Level Targets -# ================= - -all-local: icedtea-against-icedtea - -distclean-local: clean-copy clean-jtreg clean-jtreg-reports clean-pulse-java - rm -rf stamps - rm -f rt-source-files.txt \ - hotspot-tools-source-files.txt \ - extra-source-files.txt \ - netx-source-files.txt - rm -rf bootstrap - rm -rf lib - rm -rf extra-lib - rm -rf openjdk-ecj - rm -rf openjdk - rm -rf hotspot-tools - rm -rf rt/netscape - rm -rf visualvm - rm -rf netbeans - rm -rf netx.build +if BOOTSTRAPPING + MEMORY_LIMIT = +else + MEMORY_LIMIT = -J-Xmx1024m +endif + +if WITH_CACAO + ICEDTEA_BUILD_TARGET=jdk_only + ICEDTEA_DEBUG_BUILD_TARGET=jdk_fastdebug_only +else + ICEDTEA_BUILD_TARGET= + ICEDTEA_DEBUG_BUILD_TARGET=debug_build +endif + +# Patch list + +ICEDTEA_PATCHES = \ + patches/icedtea-version.patch \ + patches/hotspot/$(HSBUILD)/icedtea-version.patch \ + patches/icedtea-copy-plugs.patch \ + patches/hotspot/$(HSBUILD)/icedtea-text-relocations.patch \ + patches/icedtea-ssl.patch \ + $(PLUGIN_PATCH) \ + patches/icedtea-webstart.patch \ + patches/icedtea-webstart-umask.patch \ + patches/icedtea-rmi_amd64.patch \ + patches/icedtea-tools.patch \ + patches/icedtea-demos.patch \ + patches/icedtea-use-system-tzdata.patch \ + patches/icedtea-headers.patch \ + patches/hotspot/$(HSBUILD)/icedtea-headers.patch \ + patches/icedtea-ant.patch \ + patches/icedtea-gcc-suffix.patch \ + patches/hotspot/$(HSBUILD)/icedtea-gcc-suffix.patch \ + patches/icedtea-bytebuffer-compact.patch \ + patches/icedtea-float-double-trailing-zeros.patch \ + patches/hotspot/$(HSBUILD)/icedtea-memory-limits.patch \ + patches/icedtea-sunsrc.patch \ + patches/icedtea-libraries.patch \ + patches/icedtea-core-build.patch \ + patches/icedtea-zero-build.patch \ + patches/icedtea-print-lsb-release.patch \ + patches/icedtea-jpegclasses.patch \ + patches/icedtea-uname.patch \ + patches/icedtea-ia64-fdlibm.patch \ + patches/icedtea-freetypeversion.patch \ + patches/icedtea-fonts.patch \ + patches/hotspot/$(HSBUILD)/icedtea-sparc-ptracefix.patch \ + patches/hotspot/$(HSBUILD)/icedtea-sparc-trapsfix.patch \ + patches/icedtea-override-redirect-metacity.patch \ + patches/icedtea-shark-build.patch \ + patches/hotspot/$(HSBUILD)/icedtea-shark-build.patch \ + patches/icedtea-security-updates.patch \ + patches/icedtea-jdk-docs-target.patch \ + patches/icedtea-mbeanintrospector.patch \ + patches/icedtea-hotspot-gcc-pr36917.patch \ + patches/icedtea-alpha-fixes.patch \ + patches/icedtea-alt-jar.patch \ + patches/icedtea-jdk-use-ssize_t.patch \ + patches/hotspot/$(HSBUILD)/icedtea-use-idx_t.patch \ + patches/hotspot/$(HSBUILD)/icedtea-params-cast-size_t.patch \ + patches/icedtea-clean-crypto.patch \ + patches/hotspot/$(HSBUILD)/icedtea-shark.patch \ + $(GCC_PATCH) \ + patches/cacao/arch.patch \ + patches/icedtea-signed-types.patch \ + patches/icedtea-lc_ctype.patch \ + patches/icedtea-xjc.patch \ + patches/icedtea-renderer-crossing.patch \ + patches/icedtea-tests-jdk.patch \ + patches/icedtea-stroker-finish.patch \ + patches/icedtea-alsa-default-device.patch \ + patches/icedtea-linker-libs-order.patch \ + patches/icedtea-testenv.patch \ + patches/icedtea-samejvm-safe.patch \ + patches/icedtea-pr261.patch \ + patches/icedtea-doc-headers.patch \ + patches/hotspot/$(HSBUILD)/icedtea-bytecodeInterpreter.patch \ + patches/icedtea-test-atomic-operations.patch \ + patches/icedtea-ia64-bugfix.patch \ + patches/hotspot/$(HSBUILD)/icedtea-parisc-opt.patch \ + patches/security/icedtea-6592792.patch \ + patches/security/icedtea-6733959.patch \ + patches/security/icedtea-6755943.patch \ + patches/hotspot/$(HSBUILD)/icedtea-includedb.patch \ + patches/icedtea-demo-swingapplet.patch \ + patches/icedtea-jvmtiEnv.patch \ + patches/icedtea-xml-encodinginfo.patch \ + patches/icedtea-cc-interp-backedge.patch \ + patches/icedtea-netx.patch \ + patches/icedtea-disable-intree-ec.patch + +if WITH_RHINO +ICEDTEA_PATCHES += \ + patches/icedtea-rhino.patch +endif + +if BUILD_CACAO +ICEDTEA_PATCHES += \ + patches/cacao/launcher.patch \ + patches/cacao/no-mmap-first-page.patch \ + patches/cacao/native-resolve.patch \ + patches/cacao/xxoption-warning.patch \ + patches/cacao/no-strict-aliasing.patch \ + patches/cacao/openjdk7.patch \ + patches/cacao/version.patch \ + patches/cacao/versioninfo.patch +endif + +if WITH_CACAO +ICEDTEA_PATCHES += \ + patches/cacao/ignore-tests.patch +endif + +if ENABLE_PULSE_JAVA +ICEDTEA_PATCHES += \ + patches/icedtea-pulse-soundproperties.patch +endif + +if ENABLE_XRENDER +# match against $(abs_top_srcdir) and then remove it again, +# because stamps/patch.stamp target will also add it +XRENDER_PATCHES = patches/xrender/icedtea-???.patch +XRENDER_PATCH_FILES = $(sort $(wildcard $(abs_top_srcdir)/$(XRENDER_PATCHES))) +ICEDTEA_PATCHES += $(sort $(subst $(abs_top_srcdir)/,,$(XRENDER_PATCH_FILES))) +endif + +if !USE_CVMI +ICEDTEA_PATCHES += \ + patches/icedtea-javafiles.patch +endif + +if ENABLE_SYSTEMTAP +ICEDTEA_PATCHES += patches/icedtea-systemtap.patch +endif + if ENABLE_PLUGIN - rm -f IcedTeaPlugin.o IcedTeaPlugin.so -endif +ICEDTEA_PATCHES += patches/icedtea-liveconnect-dist.patch +else if ENABLE_NPPLUGIN - rm -f $(NPPLUGIN_DIR)/*.o $(NPPLUGIN_DIR)/IcedTeaNPPlugin.so -endif -if BUILD_CACAO - rm -rf cacao -endif - rm -f jni-common.o -if ADD_ZERO_BUILD - rm -rf zerovm -endif -if BUILD_NATIVE_ECJ - rm -f native-ecj -endif - if [ $(abs_top_srcdir) != $(abs_top_builddir) ]; then \ - rm -rf $(abs_top_builddir)/generated ; \ - fi - -install: - -.PHONY: \ - env env-ecj snapshot clean-clone clean-patch \ - clean-clone-ecj clean-patch-ecj clean-bootstrap-directory \ - clean-bootstrap-directory-symlink clean-bootstrap-directory-ecj \ - clean-bootstrap-directory-symlink-ecj icedtea icedtea-debug \ - clean-icedtea icedtea-against-icedtea clean-icedtea-ecj clean-plugs \ - clean-tools-jar clean-shared-objects clean-visualvm clean-nbplatform \ - clean-copy clean-hotspot-tools clean-rt $(ICEDTEAPLUGIN_CLEAN) \ - $(ICEDTEANPPLUGIN_CLEAN) hotspot hotspot-helper clean-extra clean-jtreg \ - clean-jtreg-reports - -GENERATED_FILES = generated/com/sun/java/swing/plaf/gtk/resources/gtk_it.java \ - generated/com/sun/java/swing/plaf/gtk/resources/gtk_de.java \ - generated/com/sun/java/swing/plaf/gtk/resources/gtk_zh_CN.java \ - generated/com/sun/java/swing/plaf/gtk/resources/gtk_ko.java \ - generated/com/sun/java/swing/plaf/gtk/resources/gtk_es.java \ - generated/com/sun/java/swing/plaf/gtk/resources/gtk.java \ - generated/com/sun/java/swing/plaf/gtk/resources/gtk_sv.java \ - generated/com/sun/java/swing/plaf/gtk/resources/gtk_fr.java \ - generated/com/sun/java/swing/plaf/gtk/resources/gtk_zh_TW.java \ - generated/com/sun/java/swing/plaf/gtk/resources/gtk_zh_HK.java \ - generated/com/sun/java/swing/plaf/gtk/resources/gtk_ja.java \ - generated/com/sun/java/swing/plaf/motif/resources/motif_es.java \ - generated/com/sun/java/swing/plaf/motif/resources/motif_sv.java \ - generated/com/sun/java/swing/plaf/motif/resources/motif_fr.java \ - generated/com/sun/java/swing/plaf/motif/resources/motif_zh_CN.java \ - generated/com/sun/java/swing/plaf/motif/resources/motif_ja.java \ - generated/com/sun/java/swing/plaf/motif/resources/motif_it.java \ - generated/com/sun/java/swing/plaf/motif/resources/motif_de.java \ - generated/com/sun/java/swing/plaf/motif/resources/motif_zh_TW.java \ - generated/com/sun/java/swing/plaf/motif/resources/motif_ko.java \ - generated/com/sun/java/swing/plaf/motif/resources/motif_zh_HK.java \ - generated/com/sun/java/swing/plaf/motif/resources/motif.java \ - generated/com/sun/java/swing/plaf/windows/resources/windows_it.java \ - generated/com/sun/java/swing/plaf/windows/resources/windows_de.java \ - generated/com/sun/java/swing/plaf/windows/resources/windows_zh_CN.java \ - generated/com/sun/java/swing/plaf/windows/resources/windows.java \ - generated/com/sun/java/swing/plaf/windows/resources/windows_ko.java \ - generated/com/sun/java/swing/plaf/windows/resources/windows_es.java \ - generated/com/sun/java/swing/plaf/windows/resources/windows_sv.java \ - generated/com/sun/java/swing/plaf/windows/resources/windows_fr.java \ - generated/com/sun/java/swing/plaf/windows/resources/windows_zh_TW.java \ - generated/com/sun/java/swing/plaf/windows/resources/windows_zh_HK.java \ - generated/com/sun/java/swing/plaf/windows/resources/windows_ja.java \ - generated/com/sun/corba/se/spi/activation/ORBPortInfoHelper.java \ - generated/com/sun/corba/se/spi/activation/Server.java \ - generated/com/sun/corba/se/spi/activation/ServerIdHelper.java \ - generated/com/sun/corba/se/spi/activation/BadServerDefinition.java \ - generated/com/sun/corba/se/spi/activation/EndpointInfoListHelper.java \ - generated/com/sun/corba/se/spi/activation/ServerIdsHolder.java \ - generated/com/sun/corba/se/spi/activation/ServerNotRegisteredHelper.java \ - generated/com/sun/corba/se/spi/activation/_ServerStub.java \ - generated/com/sun/corba/se/spi/activation/ServerManagerHolder.java \ - generated/com/sun/corba/se/spi/activation/ActivatorOperations.java \ - generated/com/sun/corba/se/spi/activation/LocatorPackage/ServerLocationPerORBHelper.java \ - generated/com/sun/corba/se/spi/activation/LocatorPackage/ServerLocationPerORBHolder.java \ - generated/com/sun/corba/se/spi/activation/LocatorPackage/ServerLocation.java \ - generated/com/sun/corba/se/spi/activation/LocatorPackage/ServerLocationPerORB.java \ - generated/com/sun/corba/se/spi/activation/LocatorPackage/ServerLocationHelper.java \ - generated/com/sun/corba/se/spi/activation/LocatorPackage/ServerLocationHolder.java \ - generated/com/sun/corba/se/spi/activation/ServerAlreadyActiveHelper.java \ - generated/com/sun/corba/se/spi/activation/ServerHelper.java \ - generated/com/sun/corba/se/spi/activation/TCPPortHelper.java \ - generated/com/sun/corba/se/spi/activation/NoSuchEndPoint.java \ - generated/com/sun/corba/se/spi/activation/EndPointInfo.java \ - generated/com/sun/corba/se/spi/activation/_ServerManagerImplBase.java \ - generated/com/sun/corba/se/spi/activation/Repository.java \ - generated/com/sun/corba/se/spi/activation/BadServerDefinitionHolder.java \ - generated/com/sun/corba/se/spi/activation/ORBidListHolder.java \ - generated/com/sun/corba/se/spi/activation/ServerAlreadyInstalledHelper.java \ - generated/com/sun/corba/se/spi/activation/NoSuchEndPointHelper.java \ - generated/com/sun/corba/se/spi/activation/ORBPortInfoHolder.java \ - generated/com/sun/corba/se/spi/activation/ServerHeldDownHelper.java \ - generated/com/sun/corba/se/spi/activation/EndpointInfoListHolder.java \ - generated/com/sun/corba/se/spi/activation/ServerNotRegisteredHolder.java \ - generated/com/sun/corba/se/spi/activation/ORBPortInfoListHelper.java \ - generated/com/sun/corba/se/spi/activation/RepositoryOperations.java \ - generated/com/sun/corba/se/spi/activation/ServerNotActiveHelper.java \ - generated/com/sun/corba/se/spi/activation/_LocatorStub.java \ - generated/com/sun/corba/se/spi/activation/ServerAlreadyActiveHolder.java \ - generated/com/sun/corba/se/spi/activation/ServerHolder.java \ - generated/com/sun/corba/se/spi/activation/_ServerImplBase.java \ - generated/com/sun/corba/se/spi/activation/_InitialNameServiceStub.java \ - generated/com/sun/corba/se/spi/activation/ActivatorHelper.java \ - generated/com/sun/corba/se/spi/activation/ServerAlreadyRegisteredHelper.java \ - generated/com/sun/corba/se/spi/activation/EndPointInfoHelper.java \ - generated/com/sun/corba/se/spi/activation/ServerNotActive.java \ - generated/com/sun/corba/se/spi/activation/InitialNameServicePackage/NameAlreadyBoundHelper.java \ - generated/com/sun/corba/se/spi/activation/InitialNameServicePackage/NameAlreadyBoundHolder.java \ - generated/com/sun/corba/se/spi/activation/InitialNameServicePackage/NameAlreadyBound.java \ - generated/com/sun/corba/se/spi/activation/ServerAlreadyInstalledHolder.java \ - generated/com/sun/corba/se/spi/activation/NoSuchEndPointHolder.java \ - generated/com/sun/corba/se/spi/activation/_InitialNameServiceImplBase.java \ - generated/com/sun/corba/se/spi/activation/LocatorOperations.java \ - generated/com/sun/corba/se/spi/activation/_ActivatorStub.java \ - generated/com/sun/corba/se/spi/activation/ServerHeldDownHolder.java \ - generated/com/sun/corba/se/spi/activation/ServerAlreadyActive.java \ - generated/com/sun/corba/se/spi/activation/IIOP_CLEAR_TEXT.java \ - generated/com/sun/corba/se/spi/activation/ORBPortInfoListHolder.java \ - generated/com/sun/corba/se/spi/activation/ServerManagerOperations.java \ - generated/com/sun/corba/se/spi/activation/ServerNotActiveHolder.java \ - generated/com/sun/corba/se/spi/activation/ServerAlreadyRegistered.java \ - generated/com/sun/corba/se/spi/activation/ServerAlreadyUninstalledHelper.java \ - generated/com/sun/corba/se/spi/activation/_ServerManagerStub.java \ - generated/com/sun/corba/se/spi/activation/RepositoryPackage/StringSeqHelper.java \ - generated/com/sun/corba/se/spi/activation/RepositoryPackage/StringSeqHolder.java \ - generated/com/sun/corba/se/spi/activation/RepositoryPackage/ServerDef.java \ From ed at camswl.com Fri Oct 2 11:03:45 2009 From: ed at camswl.com (Edward Nevill) Date: Fri, 2 Oct 2009 19:03:45 +0100 Subject: Request to commit: ARM interpreter changes Message-ID: <200910021803.n92I3jDE022989@parsley.camswl.com> Hi folks, I have another set of changes I would like to push for the ARM interpreter. Here is a brief headline list of what has changed. - Support for generation of native libraries for JCK on ARM - Addition / updating of copyright notices - Support for building icedtea-debug (this is not complete) - Small change to the dispatch code (bumps ECM from 1350 to 1450 with a similar improvement to other benchmarks). - Fix to stack overflow checking so that it checks for stack overflow before zeroing the locals, not after. On Zero the machine stack lives below the Java stack. A method with a suitably large number of locals can end up writing zeros onto the machine stack. See attached diffs below. Changelog to follow. Regards, Ed. --- CUT HERE -------------------------------------------------------- diff -ruNE original/icedtea6/contrib/jck/compile-native-code.sh new/icedtea6/contrib/jck/compile-native-code.sh --- original/icedtea6/contrib/jck/compile-native-code.sh 2009-10-02 09:26:27.000000000 +0100 +++ new/icedtea6/contrib/jck/compile-native-code.sh 2009-10-02 15:19:25.000000000 +0100 @@ -19,6 +19,9 @@ arch=$(uname -m) case "$arch" in + arm*) + MFLAG= + ;; i?86|ppc) MFLAG=-m32 ;; diff -ruNE original/icedtea6/ports/hotspot/src/cpu/zero/vm/asm_helper.cpp new/icedtea6/ports/hotspot/src/cpu/zero/vm/asm_helper.cpp --- original/icedtea6/ports/hotspot/src/cpu/zero/vm/asm_helper.cpp 2009-10-02 09:26:30.000000000 +0100 +++ new/icedtea6/ports/hotspot/src/cpu/zero/vm/asm_helper.cpp 2009-10-02 10:43:57.000000000 +0100 @@ -10,6 +10,10 @@ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. */ #include "incls/_precompiled.incl" @@ -74,8 +78,8 @@ print_def("THREAD_STATE", offset_of(JavaThread, _thread_state)); print_def("THREAD_DO_NOT_UNLOCK", offset_of(JavaThread, _do_not_unlock_if_synchronized)); - print_def("THREAD_JAVA_STACK_BASE", offset_of(JavaThread, _zero_stack) + ZeroStack::base_offset()); - print_def("THREAD_JAVA_SP", offset_of(JavaThread, _zero_stack) + ZeroStack::sp_offset()); + print_def("THREAD_JAVA_STACK_BASE", offset_of(JavaThread, _zero_stack) + in_bytes(ZeroStack::base_offset())); + print_def("THREAD_JAVA_SP", offset_of(JavaThread, _zero_stack) + in_bytes(ZeroStack::sp_offset())); print_def("THREAD_TOP_ZERO_FRAME", offset_of(JavaThread, _top_zero_frame)); print_def("THREAD_SPECIALRUNTIMEEXITCONDITION", offset_of(JavaThread, _special_runtime_exit_condition)); nl(); diff -ruNE original/icedtea6/ports/hotspot/src/cpu/zero/vm/bytecodes_arm.def new/icedtea6/ports/hotspot/src/cpu/zero/vm/bytecodes_arm.def --- original/icedtea6/ports/hotspot/src/cpu/zero/vm/bytecodes_arm.def 2009-10-02 09:26:30.000000000 +0100 +++ new/icedtea6/ports/hotspot/src/cpu/zero/vm/bytecodes_arm.def 2009-10-02 10:39:15.000000000 +0100 @@ -1,3 +1,20 @@ +@ Copyright 2009 Edward Nevill +@ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +@ +@ This code is free software; you can redistribute it and/or modify it +@ under the terms of the GNU General Public License version 2 only, as +@ published by the Free Software Foundation. +@ +@ This code is distributed in the hope that it will be useful, but WITHOUT +@ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +@ version 2 for more details (a copy is included in the LICENSE file that +@ accompanied this code). +@ +@ You should have received a copy of the GNU General Public License version +@ 2 along with this work; if not, write to the Free Software Foundation, +@ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + #ifndef DISABLE_HW_FP #define HW_FP #endif @@ -281,7 +298,7 @@ } (aconst_null,fconst_0) u4const_0 { - DISPATCH_START \seq_len + DISPATCH_START_R2 mov lr, #0 DISPATCH_NEXT PUSH lr @@ -290,13 +307,13 @@ (iconst_m1,iconst_0,iconst_1,iconst_2,iconst_3,iconst_4,iconst_5) iconst_N { sub lr, r0, #opc_iconst_0 - DISPATCH_START \seq_len + DISPATCH_START_R2 PUSH lr DISPATCH_FINISH } (lconst_0,dconst_0) u8const_0 { - DISPATCH_START \seq_len + DISPATCH_START_R2 mov tmp1, #0 DISPATCH_NEXT PUSH tmp1 @@ -308,7 +325,7 @@ } (lconst_1) lconst_1 { - DISPATCH_START \seq_len + DISPATCH_START_R2 mov tmp2, #1 DISPATCH_NEXT mov tmp1, #0 @@ -320,7 +337,7 @@ } (fconst_1) fconst_1 { - DISPATCH_START \seq_len + DISPATCH_START_R2 mov tmp1, #0x3f800000 DISPATCH_NEXT PUSH tmp1 @@ -328,7 +345,7 @@ } (fconst_2) fconst_2 { - DISPATCH_START \seq_len + DISPATCH_START_R2 mov r2, #0x40000000 DISPATCH_NEXT PUSH r2 @@ -336,7 +353,7 @@ } (dconst_1) dconst_1 { - DISPATCH_START \seq_len + DISPATCH_START_R2 mov tmp1, #0x3f000000 DISPATCH_NEXT orr tmp1, tmp1, #0x00f00000 @@ -363,12 +380,12 @@ @ r2 = [jpc, #1] @ r1 = [jpc, #2] (sipush) sipush { + ldrb r1, [jpc, #2] DISPATCH_START \seq_len - mov tmp1, r1 DISPATCH_NEXT mov r2, r2, lsl #24 + orr tmp1, r1, r2, asr #16 DISPATCH_NEXT - orr tmp1, tmp1, r2, asr #16 DISPATCH_NEXT DISPATCH_NEXT PUSH tmp1 @@ -403,7 +420,7 @@ (aload_0,aload_1,aload_2,aload_3) { rsb tmp1, r0, #opc_aload_0 - DISPATCH_START \seq_len + DISPATCH_START_R2 DISPATCH_NEXT ldr tmp1, [locals, tmp1, lsl #2] DISPATCH_NEXT @@ -415,7 +432,7 @@ (iload_0,iload_1,iload_2,iload_3) { rsb tmp1, r0, #opc_iload_0 - DISPATCH_START \seq_len + DISPATCH_START_R2 DISPATCH_NEXT ldr tmp1, [locals, tmp1, lsl #2] DISPATCH_NEXT @@ -427,7 +444,7 @@ (fload_0,fload_1,fload_2,fload_3) { rsb tmp1, r0, #opc_fload_0 - DISPATCH_START \seq_len + DISPATCH_START_R2 DISPATCH_NEXT ldr tmp1, [locals, tmp1, lsl #2] DISPATCH_NEXT @@ -438,7 +455,7 @@ } (lload_0,dload_0) u8load_0 { - DISPATCH_START \seq_len + DISPATCH_START_R2 ldmda locals, {tmp2-tmp1} DISPATCH_NEXT PUSH tmp1 @@ -450,7 +467,7 @@ } (lload_1,dload_1) u8load_1 { - DISPATCH_START \seq_len + DISPATCH_START_R2 ldmdb locals, {tmp2-tmp1} DISPATCH_NEXT PUSH tmp1 @@ -462,7 +479,7 @@ } (lload_2,dload_2) u8load_2 { - DISPATCH_START \seq_len + DISPATCH_START_R2 ldr tmp2, [locals, #-12] DISPATCH_NEXT ldr tmp1, [locals, #-8] @@ -474,7 +491,7 @@ } (lload_3,dload_3) u8load_3 { - DISPATCH_START \seq_len + DISPATCH_START_R2 ldr tmp2, [locals, #-16] DISPATCH_NEXT ldr tmp1, [locals, #-12] @@ -486,8 +503,10 @@ } (iaload,faload,aaload) u4aload { - POP r2, r3 @ r2 = index, r3 = arrayref - DISPATCH_START \seq_len + GET_STACK 1, r3 + DISPATCH_START_R2_R0 + POP r2 + DISPATCH_START_R2_JPC SW_NPC cmp r3, #0 SW_NPC beq null_ptr_exception_jpc_1 .abortentry5: @@ -500,13 +519,15 @@ DISPATCH_NEXT ldr tmp1, [r3, #12] DISPATCH_NEXT - PUSH tmp1 + PUT_STACK 0, tmp1 DISPATCH_FINISH } (laload,daload) u8aload { - POP r2, r3 - DISPATCH_START \seq_len + GET_STACK 1, r3 + DISPATCH_START_R2_R0 + GET_STACK 0, r2 + DISPATCH_START_R2_JPC SW_NPC cmp r3, #0 SW_NPC beq null_ptr_exception_jpc_1 .abortentry6: @@ -520,13 +541,16 @@ DISPATCH_NEXT ldr tmp1, [r3, #20] DISPATCH_NEXT - PUSH tmp2, tmp1 + PUT_STACK 1, tmp1 + PUT_STACK 0, tmp2 DISPATCH_FINISH } (baload) baload { - POP r2, r3 @ r2 = index, r3 = arrayref - DISPATCH_START \seq_len + GET_STACK 1, r3 + DISPATCH_START_R2_R0 + POP r2 + DISPATCH_START_R2_JPC SW_NPC cmp r3, #0 SW_NPC beq null_ptr_exception_jpc_1 .abortentry7: @@ -539,13 +563,15 @@ DISPATCH_NEXT ldrsb tmp1, [r3, #12] DISPATCH_NEXT - PUSH tmp1 + PUT_STACK 0, tmp1 DISPATCH_FINISH } (caload) caload { - POP r2, r3 @ r2 = index, r3 = arrayref - DISPATCH_START \seq_len + GET_STACK 1, r3 + DISPATCH_START_R2_R0 + POP r2 + DISPATCH_START_R2_JPC SW_NPC cmp r3, #0 SW_NPC beq null_ptr_exception_jpc_1 .abortentry8: @@ -558,13 +584,15 @@ DISPATCH_NEXT ldrh tmp1, [r3, #12] DISPATCH_NEXT - PUSH tmp1 + PUT_STACK 0, tmp1 DISPATCH_FINISH } (saload) saload { - POP r2, r3 @ r2 = index, r3 = arrayref - DISPATCH_START \seq_len + GET_STACK 1, r3 + DISPATCH_START_R2_R0 + POP r2 + DISPATCH_START_R2_JPC SW_NPC cmp r3, #0 SW_NPC beq null_ptr_exception_jpc_1 .abortentry9: @@ -577,7 +605,7 @@ DISPATCH_NEXT ldrsh tmp1, [r3, #12] DISPATCH_NEXT - PUSH tmp1 + PUT_STACK 0, tmp1 DISPATCH_FINISH } @@ -608,7 +636,7 @@ } (astore_0,istore_0,fstore_0) u4store_0 { - DISPATCH_START \seq_len + DISPATCH_START_R2 DISPATCH_NEXT POP tmp1 DISPATCH_NEXT @@ -619,7 +647,7 @@ } (astore_1,istore_1,fstore_1) u4store_1 { - DISPATCH_START \seq_len + DISPATCH_START_R2 DISPATCH_NEXT POP tmp1 DISPATCH_NEXT @@ -630,7 +658,7 @@ } (astore_2,istore_2,fstore_2) u4store_2 { - DISPATCH_START \seq_len + DISPATCH_START_R2 DISPATCH_NEXT POP tmp1 DISPATCH_NEXT @@ -641,7 +669,7 @@ } (astore_3,istore_3,fstore_3) u4store_3 { - DISPATCH_START \seq_len + DISPATCH_START_R2 DISPATCH_NEXT POP tmp1 DISPATCH_NEXT @@ -652,7 +680,7 @@ } (lstore_0,dstore_0) u8store_0 { - DISPATCH_START \seq_len + DISPATCH_START_R2 DISPATCH_NEXT POP tmp2, tmp1 DISPATCH_NEXT @@ -663,7 +691,7 @@ } (lstore_1,dstore_1) u8store_1 { - DISPATCH_START \seq_len + DISPATCH_START_R2 DISPATCH_NEXT POP tmp2, tmp1 DISPATCH_NEXT @@ -674,7 +702,7 @@ } (lstore_2,dstore_2) u8store_2 { - DISPATCH_START \seq_len + DISPATCH_START_R2 POP tmp2, tmp1 DISPATCH_NEXT str tmp2, [locals, #-12] @@ -686,7 +714,7 @@ } (lstore_3,dstore_3) u8store_3 { - DISPATCH_START \seq_len + DISPATCH_START_R2 POP tmp2, tmp1 DISPATCH_NEXT str tmp2, [locals, #-16] @@ -699,7 +727,7 @@ (iastore,fastore) u4astore { POP r3, tmp2, tmp1 @ r3 = value, tmp2 = index, tmp1 = arrayref - DISPATCH_START \seq_len + DISPATCH_START_R2 SW_NPC cmp tmp1, #0 SW_NPC beq null_ptr_exception_jpc_1 .abortentry10: @@ -715,8 +743,8 @@ } (lastore,dastore) u8astore { - POP r2, r3, tmp2, tmp1 @ r2,r3 = value, tmp2 = index, tmp1 = arrayref - DISPATCH_START \seq_len + POP r1, r3, tmp2, tmp1 @ r1,r3 = value, tmp2 = index, tmp1 = arrayref + DISPATCH_START_R2 SW_NPC cmp tmp1, #0 SW_NPC beq null_ptr_exception_jpc_1 .abortentry11: @@ -726,7 +754,7 @@ bcs array_bound_exception_jpc_1_tmp2 DISPATCH_NEXT add tmp2, tmp1, tmp2, lsl #3 - str r2, [tmp2, #16] + str r1, [tmp2, #16] DISPATCH_NEXT DISPATCH_NEXT str r3, [tmp2, #20] @@ -735,7 +763,7 @@ (bastore) bastore { POP r3, tmp2, tmp1 @ r3 = value, tmp2 = index, tmp1 = arrayref - DISPATCH_START \seq_len + DISPATCH_START_R2 SW_NPC cmp tmp1, #0 SW_NPC beq null_ptr_exception_jpc_1 .abortentry12: @@ -752,7 +780,7 @@ (castore,sastore) u2astore { POP r3, tmp2, tmp1 @ r3 = value, tmp2 = index, tmp1 = arrayref - DISPATCH_START \seq_len + DISPATCH_START_R2 SW_NPC cmp tmp1, #0 SW_NPC beq null_ptr_exception_jpc_1 .abortentry13: @@ -768,19 +796,19 @@ } (pop) jpop { - DISPATCH_START \seq_len + DISPATCH_START_R2 add stack, stack, #4 DISPATCH_FINISH } (pop2) jpop2 { - DISPATCH_START \seq_len + DISPATCH_START_R2 add stack, stack, #8 DISPATCH_FINISH } (dup) dup { - DISPATCH_START \seq_len + DISPATCH_START_R2 ldr lr, [stack, #4] DISPATCH_NEXT PUSH lr @@ -788,7 +816,7 @@ } (dup_x1) dup_x1 { - DISPATCH_START \seq_len + DISPATCH_START_R2 POP r2, r3 DISPATCH_NEXT PUSH r2 @@ -798,7 +826,7 @@ } (dup_x2) dup_x2 { - DISPATCH_START \seq_len + DISPATCH_START_R2 POP r2, r3, lr DISPATCH_NEXT PUSH r2 @@ -808,7 +836,7 @@ } (dup2) dup2 { - DISPATCH_START \seq_len + DISPATCH_START_R2 ldmib stack, {r2, r3} DISPATCH_NEXT PUSH r2, r3 @@ -816,7 +844,7 @@ } (dup2_x1) dup2_x1 { - DISPATCH_START \seq_len + DISPATCH_START_R2 POP r2, r3, lr DISPATCH_NEXT PUSH r2, r3 @@ -826,7 +854,7 @@ } (dup2_x2) dup2_x2 { - DISPATCH_START \seq_len + DISPATCH_START_R2 POP r2, r3, tmp1, lr DISPATCH_NEXT PUSH r2, r3 @@ -835,7 +863,7 @@ } (swap) swap { - DISPATCH_START \seq_len + DISPATCH_START_R2 POP r2, r3 DISPATCH_NEXT PUSH r2 @@ -846,7 +874,7 @@ (iadd) iadd { - DISPATCH_START \seq_len + DISPATCH_START_R2 POP tmp2, tmp1 DISPATCH_NEXT add tmp2, tmp2, tmp1 @@ -858,7 +886,7 @@ } (ladd) ladd { - DISPATCH_START \seq_len + DISPATCH_START_R2 POP r2, r3, tmp1, lr DISPATCH_NEXT adds r2, r2, tmp1 @@ -869,7 +897,7 @@ } (isub) isub { - DISPATCH_START \seq_len + DISPATCH_START_R2 POP tmp2, tmp1 DISPATCH_NEXT sub tmp2, tmp1, tmp2 @@ -881,7 +909,7 @@ } (lsub) lsub { - DISPATCH_START \seq_len + DISPATCH_START_R2 POP r2, r3, tmp1, lr DISPATCH_NEXT subs r2, tmp1, r2 @@ -892,7 +920,7 @@ } (imul) imul { - DISPATCH_START \seq_len + DISPATCH_START_R2 POP r2, tmp1 DISPATCH_NEXT mul tmp2, r2, tmp1 @@ -904,11 +932,11 @@ } (lmul) lmul { - POP r2, tmp1, ip, lr - umull r3, r0, ip, r2 + POP r1, tmp1, ip, lr + umull r3, r0, ip, r1 mla tmp1, ip, tmp1, r0 - DISPATCH_START \seq_len - mla tmp1, lr, r2, tmp1 + DISPATCH_START_R2 + mla tmp1, lr, r1, tmp1 DISPATCH_NEXT PUSH r3, tmp1 DISPATCH_FINISH @@ -957,7 +985,7 @@ } (ineg) ineg { - DISPATCH_START \seq_len + DISPATCH_START_R2 POP tmp1 DISPATCH_NEXT rsb tmp1, tmp1, #0 @@ -969,7 +997,7 @@ } (lneg) lneg { - DISPATCH_START \seq_len + DISPATCH_START_R2 POP r2, r3 DISPATCH_NEXT rsbs r2, r2, #0 @@ -980,7 +1008,7 @@ } (fneg) fneg { - DISPATCH_START \seq_len + DISPATCH_START_R2 POP r2 DISPATCH_NEXT eor r2, r2, #0x80000000 @@ -990,7 +1018,7 @@ } (dneg) dneg { - DISPATCH_START \seq_len + DISPATCH_START_R2 GET_STACK 1, r2 DISPATCH_NEXT eor r2, r2, #0x80000000 @@ -1000,7 +1028,7 @@ } (ishl) ishl { - DISPATCH_START \seq_len + DISPATCH_START_R2 POP r2, r3 DISPATCH_NEXT and r2, r2, #31 @@ -1011,7 +1039,7 @@ } (lshl) lshl { - DISPATCH_START \seq_len + DISPATCH_START_R2 POP r2, r3, lr DISPATCH_NEXT tst r2, #32 @@ -1027,7 +1055,7 @@ } (ishr) ishr { - DISPATCH_START \seq_len + DISPATCH_START_R2 POP r2, r3 DISPATCH_NEXT and r2, r2, #31 @@ -1038,7 +1066,7 @@ } (lshr) lshr { - DISPATCH_START \seq_len + DISPATCH_START_R2 POP r2, r3, tmp1 DISPATCH_NEXT tst r2, #32 @@ -1054,7 +1082,7 @@ } (iushr) iushr { - DISPATCH_START \seq_len + DISPATCH_START_R2 POP r2, r3 DISPATCH_NEXT and r2, r2, #31 @@ -1065,7 +1093,7 @@ } (lushr) lushr { - DISPATCH_START \seq_len + DISPATCH_START_R2 POP r2, r3, tmp1 DISPATCH_NEXT tst r2, #32 @@ -1081,7 +1109,7 @@ } (iand) iand { - DISPATCH_START \seq_len + DISPATCH_START_R2 POP tmp2, tmp1 DISPATCH_NEXT and tmp2, tmp1, tmp2 @@ -1093,7 +1121,7 @@ } (land) land { - DISPATCH_START \seq_len + DISPATCH_START_R2 POP r2, r3, tmp1, lr DISPATCH_NEXT and r2, tmp1, r2 @@ -1104,7 +1132,7 @@ } (ior) ior { - DISPATCH_START \seq_len + DISPATCH_START_R2 POP tmp2, tmp1 DISPATCH_NEXT orr tmp2, tmp1, tmp2 @@ -1116,7 +1144,7 @@ } (lor) lor { - DISPATCH_START \seq_len + DISPATCH_START_R2 POP r2, r3, tmp1, lr DISPATCH_NEXT orr r2, tmp1, r2 @@ -1127,7 +1155,7 @@ } (ixor) ixor { - DISPATCH_START \seq_len + DISPATCH_START_R2 POP tmp2, tmp1 DISPATCH_NEXT eor tmp2, tmp1, tmp2 @@ -1139,7 +1167,7 @@ } (lxor) lxor { - DISPATCH_START \seq_len + DISPATCH_START_R2 POP r2, r3, tmp1, lr DISPATCH_NEXT eor r2, tmp1, r2 @@ -1165,7 +1193,7 @@ } (i2l) i2l { - DISPATCH_START \seq_len + DISPATCH_START_R2 POP r2 DISPATCH_NEXT mov r3, r2, asr #31 @@ -1189,7 +1217,7 @@ } (l2i) l2i { - DISPATCH_START \seq_len + DISPATCH_START_R2 POP r3 DISPATCH_NEXT PUT_STACK 0, r3 @@ -1253,7 +1281,7 @@ } (i2b) i2b { - DISPATCH_START \seq_len + DISPATCH_START_R2 POP r3 DISPATCH_NEXT mov r3, r3, asl #24 @@ -1264,7 +1292,7 @@ } (i2c) i2c { - DISPATCH_START \seq_len + DISPATCH_START_R2 POP r3 DISPATCH_NEXT mov r3, r3, asl #16 @@ -1275,7 +1303,7 @@ } (i2s) i2s { - DISPATCH_START \seq_len + DISPATCH_START_R2 POP r3 DISPATCH_NEXT mov r3, r3, asl #16 @@ -1286,16 +1314,16 @@ } (lcmp) lcmp { - POP r2, r3, tmp1, lr - DISPATCH_START \seq_len - subs r2, tmp1, r2 - movne r2, #1 + POP r1, r3, tmp1, lr + DISPATCH_START_R2 + subs r1, tmp1, r1 + movne r1, #1 sbcs lr, lr, r3 DISPATCH_NEXT - movne r2, #1 - rsblt r2, r2, #0 + movne r1, #1 + rsblt r1, r1, #0 DISPATCH_NEXT - PUSH r2 + PUSH r1 DISPATCH_FINISH } @@ -1304,6 +1332,7 @@ @ r2 = [jpc, #1] @ r1 = [jpc, #2] (ifeq,ifnull) ifeq_unsafe { + ldrb r1, [jpc, #2] POP r3 mov r2, r2, lsl #24 cmp r3, #0 @@ -1316,6 +1345,7 @@ } (ifne,ifnonnull) ifne_unsafe { + ldrb r1, [jpc, #2] POP r3 mov r2, r2, lsl #24 cmp r3, #0 @@ -1328,6 +1358,7 @@ } (iflt) iflt_unsafe { + ldrb r1, [jpc, #2] POP r3 mov r2, r2, lsl #24 cmp r3, #0 @@ -1340,6 +1371,7 @@ } (ifge) ifge_unsafe { + ldrb r1, [jpc, #2] POP r3 mov r2, r2, lsl #24 cmp r3, #0 @@ -1352,6 +1384,7 @@ } (ifgt) ifgt_unsafe { + ldrb r1, [jpc, #2] POP r3 mov r2, r2, lsl #24 cmp r3, #0 @@ -1364,6 +1397,7 @@ } (ifle) ifle_unsafe { + ldrb r1, [jpc, #2] POP r3 mov r2, r2, lsl #24 cmp r3, #0 @@ -1376,6 +1410,7 @@ } (if_icmpeq,if_acmpeq) if_icmpeq_unsafe { + ldrb r1, [jpc, #2] POP r3, tmp1 mov r2, r2, lsl #24 cmp tmp1, r3 @@ -1388,6 +1423,7 @@ } (if_icmpne,if_acmpne) if_icmpne_unsafe { + ldrb r1, [jpc, #2] POP r3, tmp1 mov r2, r2, lsl #24 cmp tmp1, r3 @@ -1400,6 +1436,7 @@ } (if_icmplt) if_icmplt_unsafe { + ldrb r1, [jpc, #2] POP r3, tmp1 mov r2, r2, lsl #24 cmp tmp1, r3 @@ -1412,6 +1449,7 @@ } (if_icmpge) if_icmpge_unsafe { + ldrb r1, [jpc, #2] POP r3, tmp1 mov r2, r2, lsl #24 cmp tmp1, r3 @@ -1424,6 +1462,7 @@ } (if_icmpgt) if_icmpgt_unsafe { + ldrb r1, [jpc, #2] POP r3, tmp1 mov r2, r2, lsl #24 cmp tmp1, r3 @@ -1436,6 +1475,7 @@ } (if_icmple) if_icmple_unsafe { + ldrb r1, [jpc, #2] POP r3, tmp1 mov r2, r2, lsl #24 cmp tmp1, r3 @@ -1448,6 +1488,7 @@ } (goto) goto_unsafe { + ldrb r1, [jpc, #2] mov r2, r2, lsl #24 orr ip, r1, r2, asr #16 DISPATCH_START_REG ip @@ -1556,9 +1597,10 @@ #ifdef FAST_BYTECODES (igetfield) igetfield { + ldrb r1, [jpc, #2] DISPATCH_START 3 - add tmp2, constpool, r1, lsl #12 POP tmp1 + add tmp2, constpool, r1, lsl #12 add tmp2, tmp2, r2, lsl #4 DISPATCH_NEXT SW_NPC cmp tmp1, #0 @@ -1574,9 +1616,10 @@ } (bgetfield) bgetfield { + ldrb r1, [jpc, #2] DISPATCH_START 3 - add tmp2, constpool, r1, lsl #12 POP tmp1 + add tmp2, constpool, r1, lsl #12 add tmp2, tmp2, r2, lsl #4 DISPATCH_NEXT SW_NPC cmp tmp1, #0 @@ -1592,9 +1635,10 @@ } (cgetfield) cgetfield { + ldrb r1, [jpc, #2] DISPATCH_START 3 - add tmp2, constpool, r1, lsl #12 POP tmp1 + add tmp2, constpool, r1, lsl #12 add tmp2, tmp2, r2, lsl #4 DISPATCH_NEXT SW_NPC cmp tmp1, #0 @@ -1610,9 +1654,10 @@ } (sgetfield) sgetfield { + ldrb r1, [jpc, #2] DISPATCH_START 3 - add tmp2, constpool, r1, lsl #12 POP tmp1 + add tmp2, constpool, r1, lsl #12 add tmp2, tmp2, r2, lsl #4 DISPATCH_NEXT SW_NPC cmp tmp1, #0 @@ -1628,9 +1673,10 @@ } (lgetfield) lgetfield { + ldrb r1, [jpc, #2] DISPATCH_START 3 - add tmp2, constpool, r1, lsl #12 POP tmp1 + add tmp2, constpool, r1, lsl #12 add tmp2, tmp2, r2, lsl #4 DISPATCH_NEXT SW_NPC cmp tmp1, #0 @@ -1647,9 +1693,10 @@ } (iputfield) iputfield { + ldrb r1, [jpc, #2] DISPATCH_START 3 - add tmp2, constpool, r1, lsl #12 POP r3, tmp1 @ r3 = value, tmp1 = object + add tmp2, constpool, r1, lsl #12 add tmp2, tmp2, r2, lsl #4 DISPATCH_NEXT SW_NPC cmp tmp1, #0 @@ -1664,9 +1711,10 @@ } (cputfield) cputfield { + ldrb r1, [jpc, #2] DISPATCH_START 3 - add tmp2, constpool, r1, lsl #12 POP r3, tmp1 @ r3 = value, tmp1 = object + add tmp2, constpool, r1, lsl #12 add tmp2, tmp2, r2, lsl #4 DISPATCH_NEXT SW_NPC cmp tmp1, #0 @@ -1681,9 +1729,10 @@ } (bputfield) bputfield { + ldrb r1, [jpc, #2] DISPATCH_START 3 - add tmp2, constpool, r1, lsl #12 POP r3, tmp1 @ r3 = value, tmp1 = object + add tmp2, constpool, r1, lsl #12 add tmp2, tmp2, r2, lsl #4 DISPATCH_NEXT SW_NPC cmp tmp1, #0 @@ -1698,9 +1747,10 @@ } (aputfield) aputfield { + ldrb r1, [jpc, #2] GET_STACK 1, r0 @ r0 = object - add r3, constpool, r1, lsl #12 POP oop_value_tmp @ r1 = value + add r3, constpool, r1, lsl #12 add r3, r3, r2, lsl #4 ldr r3, [r3, #CP_OFFSET+8] SW_NPC cmp r0, #0 @@ -1723,9 +1773,10 @@ } (lputfield) lputfield { + ldrb r1, [jpc, #2] DISPATCH_START 3 - add tmp2, constpool, r1, lsl #12 POP r3, tmp1, lr @ r3, tmp1 = value, lr = object + add tmp2, constpool, r1, lsl #12 add tmp2, tmp2, r2, lsl #4 DISPATCH_NEXT SW_NPC cmp lr, #0 @@ -1745,6 +1796,7 @@ @ r2 = [jpc, #1] @ r1 = [jpc, #2] (getstatic) getstatic { + ldrb r1, [jpc, #2] add tmp2, constpool, r1, lsl #12 add tmp2, tmp2, r2, lsl #4 ldr r3, [tmp2, #CP_OFFSET] @@ -1766,6 +1818,7 @@ @ r2 = [jpc, #1] @ r1 = [jpc, #2] (putstatic) putstatic { + ldrb r1, [jpc, #2] add tmp2, constpool, r1, lsl #12 add tmp2, tmp2, r2, lsl #4 ldr r3, [tmp2, #CP_OFFSET] @@ -2342,7 +2395,7 @@ #ifdef HW_FP (fadd) fadd_vfp { - DISPATCH_START 1 + DISPATCH_START_R2 vldr s15, [stack, #8] vldr s14, [stack, #4] DISPATCH_NEXT @@ -2356,7 +2409,7 @@ } (dadd) dadd_vfp { - DISPATCH_START 1 + DISPATCH_START_R2 vldr d7, [stack, #12] vldr d6, [stack, #4] DISPATCH_NEXT @@ -2370,7 +2423,7 @@ } (fsub) fsub_vfp { - DISPATCH_START 1 + DISPATCH_START_R2 vldr s15, [stack, #8] vldr s14, [stack, #4] DISPATCH_NEXT @@ -2384,7 +2437,7 @@ } (fmul) fmul_vfp { - DISPATCH_START 1 + DISPATCH_START_R2 vldr s15, [stack, #8] vldr s14, [stack, #4] DISPATCH_NEXT @@ -2399,7 +2452,7 @@ (dmul) dmul_vfp { FBC cmp r2, #opc_dadd - DISPATCH_START 1 + DISPATCH_START_R2 FBC beq 1f 2: vldr d7, [stack, #12] @@ -2438,7 +2491,7 @@ #endif // FAST_BYTECODES (fdiv) fdiv_vfp { - DISPATCH_START 1 + DISPATCH_START_R2 vldr s15, [stack, #8] vldr s14, [stack, #4] DISPATCH_NEXT @@ -2452,7 +2505,7 @@ } (ddiv) ddiv_vfp { - DISPATCH_START 1 + DISPATCH_START_R2 vldr d7, [stack, #12] vldr d6, [stack, #4] DISPATCH_NEXT @@ -2466,7 +2519,7 @@ } (fcmpl) fcmpl_vfp { - DISPATCH_START 1 + DISPATCH_START_R2 flds s14, [stack, #8] flds s15, [stack, #4] DISPATCH_NEXT @@ -2490,7 +2543,7 @@ } (fcmpg) fcmpg_vfp { - DISPATCH_START 1 + DISPATCH_START_R2 flds s14, [stack, #8] flds s15, [stack, #4] DISPATCH_NEXT @@ -2514,7 +2567,7 @@ } (dcmpl) dcmpl_vfp { - DISPATCH_START 1 + DISPATCH_START_R2 fldd d6, [stack, #12] fldd d7, [stack, #4] DISPATCH_NEXT @@ -2538,7 +2591,7 @@ } (dcmpg) dcmpg_vfp { - DISPATCH_START 1 + DISPATCH_START_R2 fldd d6, [stack, #12] fldd d7, [stack, #4] DISPATCH_NEXT diff -ruNE original/icedtea6/ports/hotspot/src/cpu/zero/vm/bytecodes_zero.cpp new/icedtea6/ports/hotspot/src/cpu/zero/vm/bytecodes_zero.cpp --- original/icedtea6/ports/hotspot/src/cpu/zero/vm/bytecodes_zero.cpp 2009-10-02 09:26:30.000000000 +0100 +++ new/icedtea6/ports/hotspot/src/cpu/zero/vm/bytecodes_zero.cpp 2009-10-02 10:31:25.000000000 +0100 @@ -1,6 +1,7 @@ /* * Copyright 2003 Sun Microsystems, Inc. All Rights Reserved. * Copyright 2007 Red Hat, Inc. + * Copyright 2009 Edward Nevill * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -28,6 +29,12 @@ void Bytecodes::pd_initialize() { #ifdef HOTSPOT_ASM + // Because iaccess_N can trap, we must say aload_N can trap, otherwise + // we get an assertion failure + def(_aload_1, "aload_1", "b", NULL, T_OBJECT , 1, true); + def(_aload_2, "aload_2", "b", NULL, T_OBJECT , 1, true); + def(_aload_3, "aload_3", "b", NULL, T_OBJECT , 1, true); + def(_iaccess_0, "_iaccess_0", "b_jj", NULL, T_INT, 1, true, _aload_0); def(_iaccess_1, "_iaccess_1", "b_jj", NULL, T_INT, 1, true, _aload_1); def(_iaccess_2, "_iaccess_2", "b_jj", NULL, T_INT, 1, true, _aload_2); diff -ruNE original/icedtea6/ports/hotspot/src/cpu/zero/vm/bytecodes_zero.hpp new/icedtea6/ports/hotspot/src/cpu/zero/vm/bytecodes_zero.hpp --- original/icedtea6/ports/hotspot/src/cpu/zero/vm/bytecodes_zero.hpp 2009-10-02 09:26:30.000000000 +0100 +++ new/icedtea6/ports/hotspot/src/cpu/zero/vm/bytecodes_zero.hpp 2009-10-02 10:33:19.000000000 +0100 @@ -1,6 +1,7 @@ /* * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. * Copyright 2009 Red Hat, Inc. + * Copyright 2009 Edward Nevill * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff -ruNE original/icedtea6/ports/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S new/icedtea6/ports/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S --- original/icedtea6/ports/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S 2009-10-02 09:26:30.000000000 +0100 +++ new/icedtea6/ports/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S 2009-10-02 10:39:01.000000000 +0100 @@ -1,3 +1,20 @@ +@ Copyright 2009 Edward Nevill +@ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +@ +@ This code is free software; you can redistribute it and/or modify it +@ under the terms of the GNU General Public License version 2 only, as +@ published by the Free Software Foundation. +@ +@ This code is distributed in the hope that it will be useful, but WITHOUT +@ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +@ version 2 for more details (a copy is included in the LICENSE file that +@ accompanied this code). +@ +@ You should have received a copy of the GNU General Public License version +@ 2 along with this work; if not, write to the Free Software Foundation, +@ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + #ifdef HOTSPOT_ASM #define ARMv4 @@ -33,7 +50,6 @@ #define tmp_xxx r7 #define tmp_yyy r5 -#define tmp_zzz r8 #define tmp_vvv r9 #define tmp1 r11 @@ -542,6 +558,22 @@ ldrb r0, [jpc, \reg]! .endm + .macro DISPATCH_START_R2_R0 + .set dispatch_state, 1 + mov r0, r2 + .endm + + .macro DISPATCH_START_R2_JPC + .set dispatch_state, 1 + add jpc, jpc, #1 + .endm + + .macro DISPATCH_START_R2 + .set dispatch_state, 1 + add jpc, jpc, #1 + mov r0, r2 + .endm + #ifdef DISPATCH_LOOP .macro DISPATCH_NEXT .endm @@ -560,7 +592,7 @@ .endm #else .macro DISPATCH_1 - ldrb r1, [jpc, #2] +@ ldrb r1, [jpc, #2] .endm .macro DISPATCH_2 @@ -613,34 +645,31 @@ moveq pc, ip ldrb r1, [jpc, lr] bic ip, ip, #7 - ldr ip, [ip, r1, lsl #2] - mov pc, ip + ldr pc, [ip, r1, lsl #2] .set dispatch_state, 0 .endm .macro DISPATCH_BYTECODE - ldrb r1, [jpc, #2] +@ ldrb r1, [jpc, #2] ldr ip, [dispatch, r0, lsl #2] ldrb r2, [jpc, #1] ands lr, ip, #7 moveq pc, ip ldrb r1, [jpc, lr] bic ip, ip, #7 - ldr ip, [ip, r1, lsl #2] - mov pc, ip + ldr pc, [ip, r1, lsl #2] .endm .macro DISPATCH step=0 ldrb r0, [jpc, #\step]! - ldrb r1, [jpc, #2] +@ ldrb r1, [jpc, #2] ldr ip, [dispatch, r0, lsl #2] ldrb r2, [jpc, #1] ands lr, ip, #7 moveq pc, ip ldrb r1, [jpc, lr] bic ip, ip, #7 - ldr ip, [ip, r1, lsl #2] - mov pc, ip + ldr pc, [ip, r1, lsl #2] .endm #endif // DISPATCH_LOOP @@ -2818,6 +2847,7 @@ bx lr Opcode getfield + ldrb r1, [jpc, #2] add tmp2, constpool, r1, lsl #12 add tmp2, tmp2, r2, lsl #4 ldr r3, [tmp2, #CP_OFFSET] @@ -2882,6 +2912,7 @@ #endif Opcode putfield + ldrb r1, [jpc, #2] add tmp2, constpool, r1, lsl #12 add tmp2, tmp2, r2, lsl #4 ldr r3, [tmp2, #CP_OFFSET] @@ -3069,6 +3100,7 @@ # r2 = [jpc, #1] # r1 = [jpc, #2] Opcode new + ldrb r1, [jpc, #2] #define k_entry tmp2 #define new_result r7 #define top_addr r7 @@ -3253,6 +3285,7 @@ # r2 = [jpc, #1] # r1 = [jpc, #2] Opcode checkcast + ldrb r1, [jpc, #2] ldr r3, [istate, #ISTATE_METHOD] ldr r0, [stack, #4] ldr r3, [r3, #METHOD_CONSTANTS] @ R3 = METHOD->constants() @@ -3355,6 +3388,7 @@ # r2 = [jpc, #1] # r1 = [jpc, #2] Opcode instanceof + ldrb r1, [jpc, #2] ldr r3, [istate, #ISTATE_METHOD] ldr r0, [stack, #4] ldr r3, [r3, #METHOD_CONSTANTS] @@ -3903,16 +3937,34 @@ stmfd arm_sp!, {regset, lr} mov sl, r0 mov tmp1, r2 + + ldr r0, [tmp1, #THREAD_STACK_SIZE] + ldr r3, [tmp1, #THREAD_STACK_BASE] + rsb r3, r0, r3 + rsb r3, r3, arm_sp + cmp r3, #32768 + blt stack_overflow_no_frame + ldrh r2, [sl, #METHOD_MAXLOCALS] ldrh r3, [sl, #METHOD_SIZEOFPARAMETERS] - rsb tmp_zzz, r3, r2 - cmp tmp_zzz, #0 + rsb r8, r3, r2 + + ldr r1, [tmp1, #THREAD_JAVA_SP] + ldrh r0, [sl, #METHOD_MAXSTACK] + ldr r3, [tmp1, #THREAD_JAVA_STACK_BASE] + + sub r5, r1, r8, lsl #2 + sub r5, r5, #FRAME_SIZE+4 + sub r5, r5, r0, lsl #2 + cmp r3, r5 + bcs stack_overflow_no_frame + + cmp r8, #0 ble .normal_entry_synchronized_no_locals mov r2, #0 - ldr r1, [tmp1, #THREAD_JAVA_SP] .zero_locals_synchronized: - subs tmp_zzz, tmp_zzz, #1 + subs r8, r8, #1 str r2, [r1, #-4]! bgt .zero_locals_synchronized str r1, [tmp1, #THREAD_JAVA_SP] @@ -3927,23 +3979,13 @@ sub r0, r0, #72 mov istate, r0 str r3, [tmp_vvv, #0] - ldr r0, [tmp1, #THREAD_STACK_SIZE] - ldr r3, [tmp1, #THREAD_STACK_BASE] - ldr r2, [tmp1, #THREAD_JAVA_SP] - ldr r1, [tmp1, #THREAD_JAVA_STACK_BASE] adrl ip, dispatch_init_adcon - rsb r3, r0, r3 - rsb r2, r1, r2 ldm ip, {r0, r1} - rsb r3, r3, arm_sp - cmp r2, #4096 - cmpge r3, #32768 add r0, r0, ip str tmp_vvv, [tmp1, #THREAD_TOP_ZERO_FRAME] CACHE_JPC str tmp_vvv, [tmp1, #THREAD_LAST_JAVA_SP] add dispatch, r1, r0 - blt .throw_stack_overflow ldr r0, [istate, #ISTATE_METHOD] CACHE_STACK ldr r3, [r0, #METHOD_ACCESSFLAGS] @@ -4009,6 +4051,7 @@ # r2 = [jpc, #1] # r1 = [jpc, #2] Opcode invokeinterface + ldrb r1, [jpc, #2] DECACHE_STACK add r0, constpool, r1, lsl #12 add r0, r0, r2, asl #4 @@ -4069,9 +4112,11 @@ mov tmp_invoke_len, #5 +#ifdef FASTPATH_ENTRY adr r0, normal_entry cmp r3, r0 beq fast_normal_entry_with_len +#endif mov r0, tmp2 mov r1, ip @@ -4114,6 +4159,7 @@ # r2 = [jpc, #1] # r1 = [jpc, #2] Opcode invokevfinal + ldrb r1, [jpc, #2] DECACHE_STACK add r0, constpool, r1, lsl #12 DECACHE_JPC @@ -4158,6 +4204,7 @@ # r2 = [jpc, #1] # r1 = [jpc, #2] Opcode invokevirtual + ldrb r1, [jpc, #2] add r0, constpool, r1, lsl #12 add r0, r0, r2, asl #4 ldr r2, [r0, #CP_OFFSET] @@ -4194,6 +4241,7 @@ # r2 = [jpc, #1] # r1 = [jpc, #2] Opcode invokeresolved + ldrb r1, [jpc, #2] DECACHE_STACK add r0, constpool, r1, lsl #12 DECACHE_JPC @@ -4267,6 +4315,7 @@ DISPATCH_FINISH Opcode invokestatic + ldrb r1, [jpc, #2] add r0, constpool, r1, lsl #12 add r0, r0, r2, asl #4 ldr r2, [r0, #CP_OFFSET] @@ -4277,6 +4326,7 @@ FBC b rewrite_bytecode FBC Opcode invokestaticresolved + FBC ldrb r1, [jpc, #2] DECACHE_STACK FBC add r0, constpool, r1, lsl #12 DECACHE_JPC @@ -4332,12 +4382,10 @@ cmp r3, #32768 bge fast_normal_entry_with_len - mov r0, tmp1 - bl _ZN18InterpreterRuntime24throw_StackOverflowErrorEP10JavaThread - - ldmfd arm_sp!, {regset, pc} + b stack_overflow_before_frame Opcode invokespecial + ldrb r1, [jpc, #2] add r0, constpool, r1, lsl #12 add r0, r0, r2, asl #4 ldr r2, [r0, #CP_OFFSET] @@ -4348,6 +4396,7 @@ FBC b rewrite_bytecode FBC Opcode invokespecialresolved + FBC ldrb r1, [jpc, #2] DECACHE_STACK FBC add r0, constpool, r1, lsl #12 DECACHE_JPC @@ -4456,6 +4505,14 @@ ldrh r2, [tmp2, #METHOD_MAXSTACK] bic ip, ip, #0x35000000 sub r7, r0, r3 + + ldr r3, [tmp1, #THREAD_JAVA_STACK_BASE] + sub r5, stack, r7, lsl #2 + sub r5, r5, #FRAME_SIZE+4 + sub r5, r5, r2, lsl #2 + cmp r3, r5 + bcs stack_overflow_before_frame + subs r5, r7, #2 tst r7, #1 bic ip, ip, #0x14000 @@ -4482,7 +4539,6 @@ sub locals, stack, #4 str r1, [istate, #ISTATE_OOP_TEMP] add locals, locals, r0, lsl #2 - ldr r3, [tmp1, #THREAD_JAVA_STACK_BASE] sub stack, istate, #4 ldr jpc, [tmp2, #METHOD_CONSTMETHOD] ldr constpool, [tmp2, #METHOD_CONSTANTS] @@ -4490,15 +4546,12 @@ DISPATCH_START 48 ldr constpool, [constpool, #CONSTANTPOOL_CACHE] str ip, [tmp1, #THREAD_TOP_ZERO_FRAME] - rsb r2, r3, r2 str ip, [tmp1, #THREAD_LAST_JAVA_SP] DISPATCH_NEXT str tmp1, [istate, #ISTATE_THREAD] str locals, [istate, #ISTATE_LOCALS] str constpool, [istate, #ISTATE_CONSTANTS] DISPATCH_NEXT - cmp r2, #4096 - blt 1f DISPATCH_NEXT DISPATCH_NEXT str r10, [istate, #ISTATE_METHOD] @@ -4506,13 +4559,6 @@ @ str lr, [istate, #ISTATE_PREV_LINK] @ str lr, [istate, #ISTATE_CALLEE] DISPATCH_FINISH -1: - str r10, [istate, #ISTATE_METHOD] - DECACHE_JPC - ldr stack, [istate, #ISTATE_STACK_BASE] - sub stack, stack, #4 - DECACHE_STACK - b .throw_stack_overflow handle_return: @ CHECK_CONSTPOOL @@ -4687,28 +4733,17 @@ b handle_exception_with_bcp @ ---------------------------------------------------------------------------------------- -.throw_stack_overflow: - ldr r0, [istate, #ISTATE_THREAD] +stack_overflow_no_frame: + mov tmp_invoke_len, #0 +stack_overflow_before_frame: + mov r0, tmp1 + ldr ip, [r0, #THREAD_TOP_ZERO_FRAME] + str ip, [r0, #THREAD_LAST_JAVA_SP] + mov tmp1, tmp_invoke_len bl _ZN18InterpreterRuntime24throw_StackOverflowErrorEP10JavaThread - ldr r3, [istate, #ISTATE_THREAD] - ldr ip, [istate, #ISTATE_THREAD] - ldr r2, [r3, #THREAD_TOP_ZERO_FRAME] - mov r3, #0 - add r1, r2, #4 - str r3, [ip, #THREAD_LAST_JAVA_SP] - str r1, [ip, #THREAD_JAVA_SP] - ldr r3, [r2, #0] - str r3, [ip, #THREAD_TOP_ZERO_FRAME] - ldr r2, [istate, #ISTATE_METHOD] - ldrh r3, [r2, #40] - mov r3, r3, asl #2 - add r1, r1, r3 - str r1, [ip, #THREAD_JAVA_SP] - ldr ip, [istate, #ISTATE_ADVANCE_PC] - ldr istate, [istate, #ISTATE_NEXT_FRAME] - cmp ip, #0 - ldmeqfd arm_sp!, {regset, pc} - b fast_handle_return + cmp tmp1, #0 + bne handle_exception_with_bcp + ldmfd arm_sp!, {regset, pc} handle_exception_do_not_unlock: mov r3, #1 From aph at redhat.com Fri Oct 2 07:52:12 2009 From: aph at redhat.com (Andrew Haley) Date: Fri, 02 Oct 2009 15:52:12 +0100 Subject: Request to commit: ARM interpreter changes In-Reply-To: <200910021803.n92I3jDE022989@parsley.camswl.com> References: <200910021803.n92I3jDE022989@parsley.camswl.com> Message-ID: <4AC6139C.6000609@redhat.com> Edward Nevill wrote: > Hi folks, > > I have another set of changes I would like to push for the ARM interpreter. > Here is a brief headline list of what has changed. > > - Support for generation of native libraries for JCK on ARM > - Addition / updating of copyright notices > - Support for building icedtea-debug (this is not complete) > - Small change to the dispatch code (bumps ECM from 1350 to 1450 with a > similar improvement to other benchmarks). > - Fix to stack overflow checking so that it checks for stack overflow > before zeroing the locals, not after. On Zero the machine stack lives > below the Java stack. A method with a suitably large number of locals can > end up writing zeros onto the machine stack. > > See attached diffs below. Changelog to follow. Looks great, thanks. Andrew. From gbenson at redhat.com Fri Oct 2 07:59:06 2009 From: gbenson at redhat.com (Gary Benson) Date: Fri, 2 Oct 2009 15:59:06 +0100 Subject: Request to commit: ARM interpreter changes In-Reply-To: <200910021803.n92I3jDE022989@parsley.camswl.com> References: <200910021803.n92I3jDE022989@parsley.camswl.com> Message-ID: <20091002145905.GE3260@redhat.com> Edward Nevill wrote: > Hi folks, > > I have another set of changes I would like to push for the ARM > interpreter. Here is a brief headline list of what has changed. > > - Support for generation of native libraries for JCK on ARM > - Addition / updating of copyright notices > - Support for building icedtea-debug (this is not complete) > - Small change to the dispatch code (bumps ECM from 1350 to 1450 with a > similar improvement to other benchmarks). > - Fix to stack overflow checking so that it checks for stack overflow > before zeroing the locals, not after. On Zero the machine stack lives > below the Java stack. A method with a suitably large number of locals can > end up writing zeros onto the machine stack. > > See attached diffs below. Changelog to follow. Looks good. Cheers, Gary -- http://gbenson.net/ From andrew at icedtea.classpath.org Fri Oct 2 08:25:48 2009 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Fri, 02 Oct 2009 15:25:48 +0000 Subject: /hg/icedtea: 2 new changesets Message-ID: changeset 176ef4125901 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=176ef4125901 author: Andrew John Hughes date: Thu Oct 01 18:11:31 2009 +0100 Update NEWS with Makefile changes. 2009-10-01 Andrew John Hughes * NEWS: Updated with Makefile changes. changeset 43ad0275037d in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=43ad0275037d author: Andrew John Hughes date: Fri Oct 02 16:29:27 2009 +0100 Rename alias accidentally changed to native-boot. 2009-10-01 Andrew John Hughes * Makefile.am: Fix alias renamed to 'native-boot' by mistake. The native-ecj target is the only one actually related to ecj. The others were bootstrap targets. diffstat: 3 files changed, 19 insertions(+), 1 deletion(-) ChangeLog | 13 +++++++++++++ Makefile.am | 2 +- NEWS | 5 +++++ diffs (47 lines): diff -r 43acec61d3e9 -r 43ad0275037d ChangeLog --- a/ChangeLog Thu Oct 01 18:05:17 2009 +0100 +++ b/ChangeLog Fri Oct 02 16:29:27 2009 +0100 @@ -1,3 +1,16 @@ 2009-10-01 Andrew John Hughes + + * Makefile.am: + Fix alias renamed to 'native-boot' by + mistake. The native-ecj target is the only + one actually related to ecj. The others + were bootstrap targets. + +2009-10-01 Andrew John Hughes + + * NEWS: + Updated with Makefile changes. + 2009-10-01 Andrew John Hughes Reorganise Makefile and rename some diff -r 43acec61d3e9 -r 43ad0275037d Makefile.am --- a/Makefile.am Thu Oct 01 18:05:17 2009 +0100 +++ b/Makefile.am Fri Oct 02 16:29:27 2009 +0100 @@ -2347,7 +2347,7 @@ icedtea-debug: stamps/icedtea-debug.stam icedtea-boot: stamps/icedtea-boot.stamp -native-boot: stamps/native-boot.stamp +native-ecj: stamps/native-ecj.stamp patch-boot: stamps/patch-boot.stamp diff -r 43acec61d3e9 -r 43ad0275037d NEWS --- a/NEWS Thu Oct 01 18:05:17 2009 +0100 +++ b/NEWS Fri Oct 02 16:29:27 2009 +0100 @@ -4,6 +4,11 @@ New in release 1.12 (2009-XX-XX) - JIBX is no longer required to build Nimbus. - The NSS crypto. provider may be turned on with --enable-nss if the NSS libraries and headers are available via pkg-config. +- Makefile reorganisation: + * icedtea-ecj is now icedtea-boot and patches/ecj is now + patches/boot. + * The icedtea-against-icedtea target is now icedtea-stage2. + The icedtea-against-ecj target is now icedtea-stage1. New in release 1.11 (2009-08-06) From andrew at icedtea.classpath.org Fri Oct 2 11:29:10 2009 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Fri, 02 Oct 2009 18:29:10 +0000 Subject: /hg/icedtea: Add missing creation of versioning.stamp, re-remove... Message-ID: changeset 59d99dcc0df1 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=59d99dcc0df1 author: Andrew John Hughes date: Fri Oct 02 19:32:23 2009 +0100 Add missing creation of versioning.stamp, re-remove copy-source- files. 2009-10-02 Andrew John Hughes * Makefile.am: Create versioning.stamp so target is not continually rerun. Redo removal of copy-source-files target which was readded during the reorganisation. Shift BOOTSTRAPPING conditional to top with other conditionals. diffstat: 2 files changed, 40 insertions(+), 33 deletions(-) ChangeLog | 12 ++++++++++- Makefile.am | 61 ++++++++++++++++++++++++++++------------------------------- diffs (179 lines): diff -r 43ad0275037d -r 59d99dcc0df1 ChangeLog --- a/ChangeLog Fri Oct 02 16:29:27 2009 +0100 +++ b/ChangeLog Fri Oct 02 19:32:23 2009 +0100 @@ -1,4 +1,14 @@ 2009-10-01 Andrew John Hughes +2009-10-02 Andrew John Hughes + + * Makefile.am: + Create versioning.stamp so target is + not continually rerun. Redo removal + of copy-source-files target which was + readded during the reorganisation. + Shift BOOTSTRAPPING conditional to top + with other conditionals. + +2009-10-02 Andrew John Hughes * Makefile.am: Fix alias renamed to 'native-boot' by diff -r 43ad0275037d -r 59d99dcc0df1 Makefile.am --- a/Makefile.am Fri Oct 02 16:29:27 2009 +0100 +++ b/Makefile.am Fri Oct 02 19:32:23 2009 +0100 @@ -192,6 +192,9 @@ PULSE_JAVA_CLASS_DIR = PULSE_JAVA_CLASS_DIR = endif +# This should not depend on bootstrapping +# but on whether MEMORY_LIMIT is accepted +# as an argument to javac if BOOTSTRAPPING MEMORY_LIMIT = else @@ -204,6 +207,16 @@ else else ICEDTEA_BUILD_TARGET= ICEDTEA_DEBUG_BUILD_TARGET=debug_build +endif + +if BOOTSTRAPPING + BOOTSTRAP_DIRECTORY_STAMP = stamps/bootstrap-directory-stage2.stamp + ICEDTEA_HOME = $(abs_top_builddir)/bootstrap/icedtea + INITIAL_BOOTSTRAP_LINK_STAMP = stamps/bootstrap-directory-symlink-stage1.stamp +else + BOOTSTRAP_DIRECTORY_STAMP = + ICEDTEA_HOME = $(SYSTEM_JDK_DIR) + INITIAL_BOOTSTRAP_LINK_STAMP = stamps/bootstrap-directory-symlink-stage2.stamp endif # Patch list @@ -651,6 +664,8 @@ EXTRA_DIST = $(GENERATED_FILES) $(top_sr all-local: icedtea-stage2 +check-local: jtregcheck + distclean-local: clean-copy clean-jtreg clean-jtreg-reports clean-pulse-java rm -rf stamps rm -f rt-source-files.txt \ @@ -1051,6 +1066,7 @@ if !USE_SYSTEM_CACAO fi endif endif + mkdir -p stamps touch stamps/extract-cacao.stamp clean-extract-cacao: @@ -1088,6 +1104,7 @@ stamps/generated.stamp: stamps/extract-c find $(abs_top_builddir)/generated -type f -exec chmod 640 '{}' ';' \ -o -type d -exec chmod 750 '{}' ';'; \ fi + mkdir -p stamps touch stamps/generated.stamp stamps/patch-fsg.stamp: stamps/generated.stamp @@ -1260,10 +1277,13 @@ stamps/versioning.stamp: stamps/patch.st fi ; \ sed -i "s#BUILD_VARIANT_RELEASE)#BUILD_VARIANT_RELEASE)$${proj_suffix}$${ver_suffix}#" \ openjdk/jdk/make/common/shared/Defs.gmk; + mkdir -p stamps + touch stamps/versioning.stamp stamps/overlay.stamp: stamps/versioning.stamp cp -r $(abs_top_srcdir)/overlays/openjdk/* openjdk/ - chmod -R ug+w openjdk + chmod -R ug+w openjdk + mkdir -p stamps touch stamps/overlay.stamp # OpenJDK boot Source Preparation Targets @@ -1408,16 +1428,6 @@ clean-bootstrap-directory-stage2: rm -f stamps/bootstrap-directory-stage2.stamp rm -rf bootstrap/icedtea -if BOOTSTRAPPING - BOOTSTRAP_DIRECTORY_STAMP = stamps/bootstrap-directory-stage2.stamp - ICEDTEA_HOME = $(abs_top_builddir)/bootstrap/icedtea - INITIAL_BOOTSTRAP_LINK_STAMP = stamps/bootstrap-directory-symlink-stage1.stamp -else - BOOTSTRAP_DIRECTORY_STAMP = - ICEDTEA_HOME = $(SYSTEM_JDK_DIR) - INITIAL_BOOTSTRAP_LINK_STAMP = stamps/bootstrap-directory-symlink-stage2.stamp -endif - # stage 1 symlink. stamps/bootstrap-directory-symlink-stage1.stamp: stamps/bootstrap-directory-stage1.stamp rm -f bootstrap/jdk1.6.0 @@ -1757,7 +1767,7 @@ stamps/netx.stamp: netx-source-files.txt -sourcepath $(abs_top_srcdir)/netx:$(SOURCEPATH_DIRS): \ -bootclasspath \'\' \ @netx-source-files.txt ; - mkdir -p $(abs_top_builddir)/stamps + mkdir -p stamps touch stamps/netx.stamp stamps/netx-dist.stamp: stamps/netx.stamp @@ -2023,6 +2033,7 @@ ADD_ZERO_EXTRA_BUILD_ENV = \ DISTRIBUTION_PATCHES='$(foreach p,$(DISTRIBUTION_PATCHES),$(if $(findstring cacao,$(p)),,$(p)))' stamps/add-zero.stamp: stamps/icedtea.stamp + mkdir -p stamps if ADD_ZERO_BUILD mkdir -p zerovm @@ -2043,6 +2054,7 @@ endif touch $@ stamps/add-zero-debug.stamp: stamps/icedtea-debug.stamp + mkdir -p stamps if ADD_ZERO_BUILD mkdir -p zerovm @@ -2157,8 +2169,6 @@ jtregcheck: jtreg check-hotspot check-la $(jtreg_processes); \ fi -check-local: jtregcheck - # Support classes for non-OpenJDK bootstraps stamps/plugs.stamp: bootstrap/jdk1.7.0/jre/lib/rt-closed.jar @@ -2190,23 +2200,6 @@ ICEDTEA_BOOTSTRAP_DIRS = \ $(JDK_SHARE)/javax/net/ssl \ $(JDK_SHARE)/javax/script \ $(JAXWS)/javax/xml/bind - -stamps/copy-source-files.stamp: stamps/overlay.stamp - for copy_dir in $(ICEDTEA_COPY_DIRS) ; \ - do \ - mkdir -p rt/$$copy_dir ; \ - cp -pPRf openjdk/jdk/src/share/classes/$$copy_dir/*.java \ - rt/$$copy_dir ; \ - done - mkdir -p stamps - touch stamps/copy-source-files.stamp - -clean-copy: - rm -f stamps/copy-source-files.stamp - for copy_dir in $(ICEDTEA_COPY_DIRS) ; \ - do \ - rm -rf rt/$$copy_dir ; \ - done # tools.jar class files. stamps/hotspot-tools-copy-source-files.stamp: stamps/overlay.stamp @@ -2277,9 +2270,13 @@ bootstrap/jdk1.7.0/lib/tools.jar: stamps fi # rt-closed.jar class files. -rt-source-files.txt: stamps/extract.stamp stamps/copy-source-files.stamp +rt-source-files.txt: stamps/extract.stamp find $(abs_top_builddir)/rt -name '*.java' \ | sort -u > $@ + for dir in $(ICEDTEA_BOOTSTRAP_DIRS) ; \ + do \ + find $(abs_top_builddir)/$$dir -name '*.java' >> $@; \ + done stamps/rt-class-files.stamp: rt-source-files.txt stamps/hotspot-tools.stamp mkdir -p lib/rt From andrew at icedtea.classpath.org Fri Oct 2 13:31:03 2009 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Fri, 02 Oct 2009 20:31:03 +0000 Subject: /hg/icedtea: Rename icedtea-against-boot alias to icedtea-stage1. Message-ID: changeset 34fd2f476040 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=34fd2f476040 author: Andrew John Hughes date: Fri Oct 02 21:34:18 2009 +0100 Rename icedtea-against-boot alias to icedtea-stage1. 2009-10-02 Andrew John Hughes * Makefile.am: icedtea-against-boot target should be icedtea-stage1. diffstat: 2 files changed, 7 insertions(+), 1 deletion(-) ChangeLog | 6 ++++++ Makefile.am | 2 +- diffs (25 lines): diff -r 59d99dcc0df1 -r 34fd2f476040 ChangeLog --- a/ChangeLog Fri Oct 02 19:32:23 2009 +0100 +++ b/ChangeLog Fri Oct 02 21:34:18 2009 +0100 @@ -1,3 +1,9 @@ 2009-10-02 Andrew John Hughes + + * Makefile.am: + icedtea-against-boot target should be + icedtea-stage1. + 2009-10-02 Andrew John Hughes * Makefile.am: diff -r 59d99dcc0df1 -r 34fd2f476040 Makefile.am --- a/Makefile.am Fri Oct 02 19:32:23 2009 +0100 +++ b/Makefile.am Fri Oct 02 21:34:18 2009 +0100 @@ -2338,7 +2338,7 @@ generated: stamps/generated.stamp icedtea: stamps/icedtea.stamp -icedtea-against-boot: stamps/icedtea-against-boot.stamp +icedtea-stage1: stamps/icedtea-stage1.stamp icedtea-debug: stamps/icedtea-debug.stamp From gnu_andrew at member.fsf.org Fri Oct 2 15:20:36 2009 From: gnu_andrew at member.fsf.org (Andrew John Hughes) Date: Fri, 2 Oct 2009 23:20:36 +0100 Subject: b17 In-Reply-To: <4AC63861.1090400@sun.com> References: <17c6771e0909290504u46e7536cjc5b477cd693c2fce@mail.gmail.com> <4AC2CFDB.6030206@sun.com> <17c6771e0909300250m10cc023evae0de3471fdcf7df@mail.gmail.com> <4AC39331.3070806@sun.com> <4AC3FC44.7020400@sun.com> <17c6771e0910020506o6c8450b4m8160ac4a8c0cf807@mail.gmail.com> <17c6771e0910020610p14bb8ad0gb532205830108083@mail.gmail.com> <4AC63861.1090400@sun.com> Message-ID: <17c6771e0910021520t7af0582m10830585e1101669@mail.gmail.com> 2009/10/2 Joseph D. Darcy : > Andrew John Hughes wrote: >> >> 2009/10/2 Andrew John Hughes : >> >>> >>> 2009/10/1 Joe Darcy : >>> >>>> >>>> Joseph D. Darcy wrote: >>>> >>>>> >>>>> Andrew John Hughes wrote: >>>>> >>>>>> >>>>>> 2009/9/30 Joe Darcy : >>>>>> >>>>>> >>>>>>> >>>>>>> Andrew John Hughes wrote: >>>>>>> >>>>>>> >>>>>>>> >>>>>>>> Now that HotSpot 14 is merged, are we going to have a b17 release? >>>>>>>> >>>>>>>> >>>>>>>> >>>>>>> >>>>>>> Real soon now :-) >>>>>>> >>>>>>> >>>>>>> >>>>>>>> >>>>>>>> I thought this is what we were waiting on, but it seems more >>>>>>>> changesets are being added >>>>>>>> (http://hg.openjdk.java.net/jdk6/jdk6/langtools/rev/f754eab3d93a) >>>>>>>> without any public discussion on the mailing list. >>>>>>>> >>>>>>>> >>>>>>>> >>>>>>>> >>>>>>> >>>>>>> There is another javac fix to go back in b17 and a recently added >>>>>>> test >>>>>>> needs >>>>>>> to be moved. >>>>>>> >>>>>>> >>>>>>> >>>>>> >>>>>> Ok, are these backports from OpenJDK7? I haven't seen anything on the >>>>>> list other than the commits. >>>>>> >>>>>> >>>>>> >>>>>>> >>>>>>> I'd also like to see a port of your DeoptimizeALot fix since I think >>>>>>> it >>>>>>> affects one of the tests currently in the OpenJDK 6 HotSpot repo. >>>>>>> >>>>>>> >>>>>>> >>>>>> >>>>>> http://cr.openjdk.java.net/~andrew/6886353/webrev.01/ >>>>>> >>>>>> Same bug, same bug ID, different patch. ?The two tests affected in >>>>>> hs17 aren't present in hs14, but a test that's not in hs17 is. >>>>>> >>>>>> >>>>> >>>>> Please push this change. >>>>> >>>>> >>>>>>> >>>>>>> The preliminary tests I've run on b17 look good. >>>>>>> >>>>>>> >>>>>>> >>>>>> >>>>>> What tests? ?JTreg or something else? >>>>>> >>>>>> >>>>> >>>>> jtreg. >>>>> >>>>> >>>>>> >>>>>> I think IcedTea6 has support for building against hg. ?We should do >>>>>> that before the release. >>>>>> >>>>>> >>>>> >>>>> Sounds prudent. >>>>> >>>>> >>>> >>>> Hello. >>>> >>>> Other than Andrew's fix for the HotSpot test, all the planned fixes for >>>> b17 >>>> are back in the OpenJDK 6 repository now so it would be a good time to >>>> start >>>> building and testing IcedTea6 against the upstream repo. >>>> >>>> -Joe >>>> >>>> >>>> >>> >>> I committed this yesterday morning: >>> >>> http://hg.openjdk.java.net/jdk6/jdk6/hotspot/rev/012339cadcba >>> >>> I'm currently working on getting IcedTea6 building with my hg >>> checkout, and will push this to my personal branch: >>> http://icedtea.classpath.org/hg/people/andrew/icedtea6 >>> when I'm done. ?There are a lot of patches that are now redundant :) >>> >>> Are all the recent security patches in JDK6 hg? >>> > > Yes, OpenJDK 6 is up to date on security fixes. > >>> Thanks, >>> -- >>> Andrew :-) >>> >>> Free Java Software Engineer >>> Red Hat, Inc. (http://www.redhat.com) >>> >>> Support Free Java! >>> Contribute to GNU Classpath and the OpenJDK >>> http://www.gnu.org/software/classpath >>> http://openjdk.java.net >>> >>> PGP Key: 94EFD9D8 (http://subkeys.pgp.net) >>> Fingerprint: F8EF F1EA 401E 2E60 15FA ?7927 142C 2591 94EF D9D8 >>> >>> >> >> It seems hs14 doesn't have the IgnoreUnrecognizedVMOptions flag >> itself. ?This webrev: >> >> http://cr.openjdk.java.net/~andrew/6788376/ >> >> backported from OpenJDK7: >> http://hg.openjdk.java.net/jdk7/hotspot-rt/hotspot/rev/323728917cf4 >> adds it. ?It also includes the change to the test I added with the >> last changeset. >> >> It seems this was added to IcedTea6 but not backported to OpenJDK6. >> >> Ok to push? >> > > Yes, approved to push. > > Thanks, > > -Joe > > Thanks, pushed: http://hg.openjdk.java.net/jdk6/jdk6/hotspot/rev/f6c52a081457 A version of IcedTea6 which builds against current hg (which will become b17) is now available in http://icedtea.classpath.org/people/andrew/icedtea6 The langtools JTreg tests all pass, as do the HotSpot tests in OpenJDK6. There is a testcase related to http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6707044 which was never added upstream when the bug was fixed, and which seems to have been disabled in IcedTea when we switched to hs14. Re-enabling it shows that this fails with b17. ----------messages:(3/133)---------- command: main -XbatchLuceneCrash reason: User specified action: run main/othervm -Xbatch LuceneCrash elapsed time (seconds): 0.203 ----------System.out:(18/635)---------- # # A fatal error has been detected by the Java Runtime Environment: # # SIGSEGV (0xb) at pc=0x00002ba66acd4b50, pid=23877, tid=47996055058704 # # JRE version: 6.0-b16 # Java VM: OpenJDK 64-Bit Server VM (14.0-b16 mixed mode linux-amd64 ) # Distribution: Custom build (Fri Oct 2 21:43:43 BST 2009) # Problematic frame: # V [libjvm.so+0x58fb50] It claims to produce a log under JTwork/scratch but I don't see one. I haven't run the whole JDK test suite. I may leave it running overnight. Thanks, -- Andrew :-) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint: F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From bugzilla-daemon at icedtea.classpath.org Sat Oct 3 10:35:48 2009 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Sat, 03 Oct 2009 17:35:48 +0000 Subject: [Bug 387] New: circular dependencies for install of Gentoo ARM5 Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=387 Summary: circular dependencies for install of Gentoo ARM5 Product: IcedTea Version: unspecified Platform: Other OS/Version: Linux Status: NEW Severity: normal Priority: P2 Component: IcedTea AssignedTo: unassigned at icedtea.classpath.org ReportedBy: jlpoole at pon.net I want to install the open source Google Wave Federation Prototype Server ("Prototype Server") on a SheevaPlug (ARMv5 platform) running Gentoo ( linux-2.6.30-rc1). http://code.google.com/p/wave-protocol/wiki/Installation http://www.marvell.com/products/embedded_processors/developer/kirkwood/sheevaplug.jsp Here's the problem I run into: I need a Java Development Kit (JDK) version 1.6. Gentoo does not support Java on the ARM platform at this time, at least using there emerge system. Yet, in the SheevaPlug forum, some people mention that they have installed a JDK on the SheevaPlug, presumably using the Ubuntun system that ships with the Plug. Therefore, I'm concluding that the operating system, e.g. Gentoo vs. Ubuntu, is determinative of whether a JDK can run and the problem is not with the processor architecture, e.g. ARM5. The Gentoo emerge system appears to be designed around some sort of slot system, developed by the Java team. Basically, they currently do not support a Java slot on the ARM architecture. My attempts to emerge java based items is quickly blocked by the lack of a configuration file for the ARM5 platform in the java-configuration package. But that shouldn't mean that a JDK cannot be installed. So I thought I would try installing icedtea. Here's the Catch-22 I run into: cd icedtea6-1.6 ./autogen.sh ./configure checking for ant... no configure: error: ant program not found in PATH It looks like the icedtea configuration scripts requires ANT. However, ANT requires JAVA and thus there appears to be a circular dependency. I must be missing something. How may I install icedtea without having ANT or other java-dependencies? -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From bugzilla-daemon at icedtea.classpath.org Sat Oct 3 11:09:27 2009 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Sat, 03 Oct 2009 18:09:27 +0000 Subject: [Bug 387] circular dependencies for install of Gentoo ARM5 Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=387 ------- Comment #1 from doko at ubuntu.com 2009-10-03 18:09 ------- use gcj to build openjdk build dependencies and bootstrap openjdk using gcj. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From bugzilla-daemon at icedtea.classpath.org Sun Oct 4 07:07:28 2009 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Sun, 04 Oct 2009 14:07:28 +0000 Subject: [Bug 388] New: Compile of gcc hangs at fortran/intrinsic.o Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=388 Summary: Compile of gcc hangs at fortran/intrinsic.o Product: IcedTea Version: unspecified Platform: Other OS/Version: Linux Status: NEW Severity: normal Priority: P2 Component: IcedTea AssignedTo: unassigned at icedtea.classpath.org ReportedBy: jlpoole at pon.net Following the suggestion in Bug 387 "use gcj to build openjdk build dependencies and bootstrap openjdk using gcj." for Platform: SheevaPlug (ARMv5TE) OS: Gentoo linux-2.6.30-rc1 in download/gnu/ (aka /mnt/seagate1/download/gnu) svn checkout svn://gcc.gnu.org/svn/gcc/trunk localhost gnu # svn info trunk Path: trunk URL: svn://gcc.gnu.org/svn/gcc/trunk Repository Root: svn://gcc.gnu.org/svn/gcc Repository UUID: 138bc75d-0d04-0410-961f-82ee72b054a4 Revision: 152432 Node Kind: directory Schedule: normal Last Changed Author: uros Last Changed Rev: 152432 Last Changed Date: 2009-10-03 01:15:55 -0700 (Sat, 03 Oct 2009) localhost gnu # mkdir build cd build ./trunk/configure make ... make[3]: Entering directory `/mnt/seagate1/download/gnu/build/gcc' /var/work/download/gnu/build/./prev-gcc/xgcc -B/var/work/download/gnu/build/./prev-gcc/ -B/usr/local/armv5tel-unknown-linux-gnueabi/bin/ -B/usr/local/armv5tel-unknown-linux-gnueabi/bin/ -B/usr/local/armv5tel-unknown-linux-gnueabi/lib/ -isystem /usr/local/armv5tel-unknown-linux-gnueabi/include -isystem /usr/local/armv5tel-unknown-linux-gnueabi/sys-include -c -g -O2 -gtoggle -DIN_GCC -W -Wall -Wwrite-strings -Wcast-qual -Wstrict-prototypes -Wmissing-prototypes -Wmissing-format-attribute -pedantic -Wno-long-long -Wno-variadic-macros -Wno-overlength-strings -Werror -Wold-style-definition -Wc++-compat -fno-common -DHAVE_CONFIG_H -I. -Ifortran -I../../trunk/gcc -I../../trunk/gcc/fortran -I../../trunk/gcc/../include -I../../trunk/gcc/../libcpp/include -I../../trunk/gcc/../libdecnumber -I../../trunk/gcc/../libdecnumber/dpd -I../libdecnumber ../../trunk/gcc/fortran/intrinsic.c -o fortran/intrinsic.o [Hangs] I have another console open with top running and here are some sample states: top - 06:55:34 up 41 min, 2 users, load average: 2.17, 1.93, 2.45 Tasks: 67 total, 2 running, 65 sleeping, 0 stopped, 0 zombie Cpu(s): 69.5%us, 10.1%sy, 0.0%ni, 0.0%id, 19.8%wa, 0.0%hi, 0.6%si, 0.0%st Mem: 514860k total, 497884k used, 16976k free, 432k buffers Swap: 524696k total, 330008k used, 194688k free, 1664k cached PID USER PR NI VIRT RES SHR S %CPU %MEM TIME+ COMMAND 6012 root 20 0 793m 468m 488 R 73.3 93.3 2:39.16 cc1 37 root 15 -5 0 0 0 S 6.8 0.0 0:03.54 kswapd0 902 root 15 -5 0 0 0 S 1.0 0.0 0:03.15 usb-storage 3 root 15 -5 0 0 0 S 0.6 0.0 0:02.04 ksoftirqd/0 top - 06:56:45 up 42 min, 2 users, load average: 2.03, 1.94, 2.42 Tasks: 67 total, 2 running, 65 sleeping, 0 stopped, 0 zombie Cpu(s): 2.0%us, 9.1%sy, 0.0%ni, 0.0%id, 88.3%wa, 0.3%hi, 0.3%si, 0.0%st Mem: 514860k total, 504704k used, 10156k free, 444k buffers Swap: 524696k total, 328668k used, 196028k free, 3684k cached PID USER PR NI VIRT RES SHR S %CPU %MEM TIME+ COMMAND 37 root 15 -5 0 0 0 S 7.9 0.0 0:06.81 kswapd0 6012 root 20 0 793m 469m 152 R 2.0 93.5 2:49.70 cc1 902 root 15 -5 0 0 0 S 0.8 0.0 0:04.42 usb-storage top - 07:00:22 up 46 min, 2 users, load average: 3.75, 2.44, 2.48 Tasks: 68 total, 1 running, 67 sleeping, 0 stopped, 0 zombie Cpu(s): 0.6%us, 3.8%sy, 0.0%ni, 0.0%id, 94.9%wa, 0.0%hi, 0.6%si, 0.0%st Mem: 514860k total, 511292k used, 3568k free, 432k buffers Swap: 524696k total, 316196k used, 208500k free, 1612k cached PID USER PR NI VIRT RES SHR S %CPU %MEM TIME+ COMMAND 37 root 15 -5 0 0 0 S 2.3 0.0 0:17.64 kswapd0 902 root 15 -5 0 0 0 S 0.9 0.0 0:06.66 usb-storage 5118 root 20 0 2548 420 256 R 0.9 0.1 0:02.81 top 3 root 15 -5 0 0 0 S 0.6 0.0 0:03.85 ksoftirqd/0 4162 root 20 0 8084 104 4 S 0.6 0.0 0:01.73 sshd 6012 root 20 0 793m 481m 176 D 0.6 95.9 2:57.16 cc1 When I hit Control-C, here's the output: ^Cmake[3]: *** [fortran/intrinsic.o] Interrupt make[2]: *** [all-stage2-gcc] Interrupt make[1]: *** [stage2-bubble] Interrupt make: *** [all] Interrupt I'm new at this, so please let me know what I can provide to troubleshoot. I can provide the 152 line make output, if desired. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From bugzilla-daemon at icedtea.classpath.org Sun Oct 4 07:09:17 2009 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Sun, 04 Oct 2009 14:09:17 +0000 Subject: [Bug 388] Compile of gcc hangs at fortran/intrinsic.o Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=388 ------- Comment #1 from jlpoole at pon.net 2009-10-04 14:09 ------- Created an attachment (id=265) --> (http://icedtea.classpath.org/bugzilla/attachment.cgi?id=265&action=view) make output (subsequent run) Attaching 152 "make" subsequent run. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From bugzilla-daemon at icedtea.classpath.org Sun Oct 4 07:12:24 2009 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Sun, 04 Oct 2009 14:12:24 +0000 Subject: [Bug 388] Compile of gcc hangs at fortran/intrinsic.o Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=388 ------- Comment #2 from jlpoole at pon.net 2009-10-04 14:12 ------- localhost gnu # gcc -v Using built-in specs. Target: armv5tel-softfloat-linux-gnueabi Configured with: /var/tmp/portage/sys-devel/gcc-4.1.2/work/gcc-4.1.2/configure --prefix=/usr --bindir=/usr/armv5tel-softfloat-linux-gnueabi/gcc-bin/4.1.2 --includedir=/usr/lib/gcc/armv5tel-softfloat-linux-gnueabi/4.1.2/include --datadir=/usr/share/gcc-data/armv5tel-softfloat-linux-gnueabi/4.1.2 --mandir=/usr/share/gcc-data/armv5tel-softfloat-linux-gnueabi/4.1.2/man --infodir=/usr/share/gcc-data/armv5tel-softfloat-linux-gnueabi/4.1.2/info --with-gxx-include-dir=/usr/lib/gcc/armv5tel-softfloat-linux-gnueabi/4.1.2/include/g++-v4 --host=armv5tel-softfloat-linux-gnueabi --build=armv5tel-softfloat-linux-gnueabi --disable-altivec --with-float=soft --enable-nls --without-included-gettext --with-system-zlib --disable-checking --disable-werror --enable-secureplt --disable-multilib --enable-libmudflap --disable-libssp --disable-libgcj --enable-languages=c,c++,treelang,fortran --enable-shared --enable-threads=posix --enable-__cxa_atexit --enable-clocale=gnu Thread model: posix gcc version 4.1.2 (Gentoo 4.1.2 p1.3) localhost gnu # -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From bugzilla-daemon at icedtea.classpath.org Sun Oct 4 07:19:45 2009 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Sun, 04 Oct 2009 14:19:45 +0000 Subject: [Bug 388] Compile of gcc hangs at fortran/intrinsic.o Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=388 ------- Comment #3 from jlpoole at pon.net 2009-10-04 14:19 ------- Here's what was built on my system. I just assumed I had to build a gcc with the java support, but maybe I don't? localhost gnu # eix sys-devel/gcc [U] sys-devel/gcc Available versions: (2.95) [P]*2.95.3-r9 [P]~*2.95.3-r10!s (3.1) [P]*3.1.1-r2 (3.2) **3.2.2!s *3.2.3-r4 (3.3) ~*3.3.6-r1!s (3.4) 3.4.6-r2!s (4.0) ~*4.0.4!s (4.1) 4.1.2!s (4.2) (~)4.2.4-r1!s (4.3) **4.3.0!s ~*4.3.1!s ~*4.3.1-r1!s (~)4.3.2!s (~)4.3.2-r2!s (~)4.3.2-r3!s (~)4.3.3!s (~)4.3.3-r2!s {altivec bootstrap boundschecking build d doc fixed-point fortran gcj gtk hardened ip28 ip32r10k java libffi mudflap multilib multislot n32 n64 nls nocxx nopie nossp objc objc++ objc-gc openmp static test vanilla} Installed versions: 4.1.2(4.1)!s(04:41:40 AM 04/07/2009)(fortran mudflap nls -altivec -bootstrap -build -d -doc -gcj -gtk -hardened -ip28 -ip32r10k -libffi -multilib -multislot -n32 -n64 -nocxx -objc -objc++ -objc-gc -test -vanilla) 4.3.2-r4(4.3)!s(07:10:07 AM 08/11/2009)(fortran mudflap nls nptl openmp -altivec -bootstrap -build -doc -fixed-point -gcj -gtk -hardened -ip28 -ip32r10k -libffi -multilib -multislot -n32 -n64 -nocxx -nopie -objc -objc++ -objc-gc -test -vanilla) Homepage: http://gcc.gnu.org/ Description: The GNU Compiler Collection. Includes C/C++, java compilers, pie+ssp extensions, Haj Ten Brugge runtime bounds checking [D] sys-devel/gcc-config Available versions: 1.3.16 1.4.0-r4 ~1.4.1 Installed versions: 1.4.1(10:18:18 PM 08/10/2009) Homepage: http://www.gentoo.org/ Description: Utility to change the gcc compiler being used * sys-devel/gcc-nios2 Available versions: (nios2-elf-3.4) ~*5.1!s {multislot test} Homepage: http://gcc.gnu.org/ Description: Compiler for Nios2 targets Found 3 matches. localhost gnu # -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From bugzilla-daemon at icedtea.classpath.org Sun Oct 4 23:33:25 2009 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 05 Oct 2009 06:33:25 +0000 Subject: [Bug 388] Compile of gcc hangs at fortran/intrinsic.o Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=388 ------- Comment #4 from jlpoole at pon.net 2009-10-05 06:33 ------- I'm seeing that I have a USE flag option: gcj Enable building with gcj (The GNU Compiler for the Javatm Programming Language) Maybe I need I need to emerge, again, the packaged gcc compiler using the "gcj" use flag rather than building from the downloaded source from this web site. The reason being that someone in Gentoo may have finessed the problem starting this bug (and others). I'll try and advise. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From enevill at icedtea.classpath.org Mon Oct 5 06:10:02 2009 From: enevill at icedtea.classpath.org (enevill at icedtea.classpath.org) Date: Mon, 05 Oct 2009 13:10:02 +0000 Subject: /hg/icedtea6: Edward Nevill (ed@camswl.com) Message-ID: changeset c7458f207acf in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=c7458f207acf author: "Edward Nevill (ed at camswl.com)" date: Mon Oct 05 14:13:48 2009 +0100 Edward Nevill (ed at camswl.com) diffstat: 7 files changed, 288 insertions(+), 177 deletions(-) ChangeLog | 8 contrib/jck/compile-native-code.sh | 3 ports/hotspot/src/cpu/zero/vm/asm_helper.cpp | 8 ports/hotspot/src/cpu/zero/vm/bytecodes_arm.def | 283 +++++++++++--------- ports/hotspot/src/cpu/zero/vm/bytecodes_zero.cpp | 7 ports/hotspot/src/cpu/zero/vm/bytecodes_zero.hpp | 1 ports/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S | 155 ++++++---- diffs (truncated from 1544 to 500 lines): diff -r 66ad418c7b91 -r c7458f207acf ChangeLog --- a/ChangeLog Thu Oct 01 11:24:55 2009 +0200 +++ b/ChangeLog Mon Oct 05 14:13:48 2009 +0100 @@ -1,3 +1,11 @@ 2009-10-01 Robert Schuster + + * Support for generation of native libraries for JCK on ARM + * Addition / updating of copyright notices + * Support for building icedteat-debug (incomplete) + * Minor performance optimisations + * Fix to stack overflow checking + 2009-10-01 Robert Schuster * configure.ac: Added --with-cacao-src-dir option. diff -r 66ad418c7b91 -r c7458f207acf contrib/jck/compile-native-code.sh --- a/contrib/jck/compile-native-code.sh Thu Oct 01 11:24:55 2009 +0200 +++ b/contrib/jck/compile-native-code.sh Mon Oct 05 14:13:48 2009 +0100 @@ -19,6 +19,9 @@ fi arch=$(uname -m) case "$arch" in + arm*) + MFLAG= + ;; i?86|ppc) MFLAG=-m32 ;; diff -r 66ad418c7b91 -r c7458f207acf ports/hotspot/src/cpu/zero/vm/asm_helper.cpp --- a/ports/hotspot/src/cpu/zero/vm/asm_helper.cpp Thu Oct 01 11:24:55 2009 +0200 +++ b/ports/hotspot/src/cpu/zero/vm/asm_helper.cpp Mon Oct 05 14:13:48 2009 +0100 @@ -10,6 +10,10 @@ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. */ #include "incls/_precompiled.incl" @@ -74,8 +78,8 @@ void VMStructs::print_vm_offsets(void) print_def("THREAD_STATE", offset_of(JavaThread, _thread_state)); print_def("THREAD_DO_NOT_UNLOCK", offset_of(JavaThread, _do_not_unlock_if_synchronized)); - print_def("THREAD_JAVA_STACK_BASE", offset_of(JavaThread, _zero_stack) + ZeroStack::base_offset()); - print_def("THREAD_JAVA_SP", offset_of(JavaThread, _zero_stack) + ZeroStack::sp_offset()); + print_def("THREAD_JAVA_STACK_BASE", offset_of(JavaThread, _zero_stack) + in_bytes(ZeroStack::base_offset())); + print_def("THREAD_JAVA_SP", offset_of(JavaThread, _zero_stack) + in_bytes(ZeroStack::sp_offset())); print_def("THREAD_TOP_ZERO_FRAME", offset_of(JavaThread, _top_zero_frame)); print_def("THREAD_SPECIALRUNTIMEEXITCONDITION", offset_of(JavaThread, _special_runtime_exit_condition)); nl(); diff -r 66ad418c7b91 -r c7458f207acf ports/hotspot/src/cpu/zero/vm/bytecodes_arm.def --- a/ports/hotspot/src/cpu/zero/vm/bytecodes_arm.def Thu Oct 01 11:24:55 2009 +0200 +++ b/ports/hotspot/src/cpu/zero/vm/bytecodes_arm.def Mon Oct 05 14:13:48 2009 +0100 @@ -1,3 +1,20 @@ +@ Copyright 2009 Edward Nevill +@ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +@ +@ This code is free software; you can redistribute it and/or modify it +@ under the terms of the GNU General Public License version 2 only, as +@ published by the Free Software Foundation. +@ +@ This code is distributed in the hope that it will be useful, but WITHOUT +@ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +@ version 2 for more details (a copy is included in the LICENSE file that +@ accompanied this code). +@ +@ You should have received a copy of the GNU General Public License version +@ 2 along with this work; if not, write to the Free Software Foundation, +@ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + #ifndef DISABLE_HW_FP #define HW_FP #endif @@ -281,7 +298,7 @@ return_register_finalizer = 0xe5, 1 } (aconst_null,fconst_0) u4const_0 { - DISPATCH_START \seq_len + DISPATCH_START_R2 mov lr, #0 DISPATCH_NEXT PUSH lr @@ -290,13 +307,13 @@ return_register_finalizer = 0xe5, 1 (iconst_m1,iconst_0,iconst_1,iconst_2,iconst_3,iconst_4,iconst_5) iconst_N { sub lr, r0, #opc_iconst_0 - DISPATCH_START \seq_len + DISPATCH_START_R2 PUSH lr DISPATCH_FINISH } (lconst_0,dconst_0) u8const_0 { - DISPATCH_START \seq_len + DISPATCH_START_R2 mov tmp1, #0 DISPATCH_NEXT PUSH tmp1 @@ -308,7 +325,7 @@ return_register_finalizer = 0xe5, 1 } (lconst_1) lconst_1 { - DISPATCH_START \seq_len + DISPATCH_START_R2 mov tmp2, #1 DISPATCH_NEXT mov tmp1, #0 @@ -320,7 +337,7 @@ return_register_finalizer = 0xe5, 1 } (fconst_1) fconst_1 { - DISPATCH_START \seq_len + DISPATCH_START_R2 mov tmp1, #0x3f800000 DISPATCH_NEXT PUSH tmp1 @@ -328,7 +345,7 @@ return_register_finalizer = 0xe5, 1 } (fconst_2) fconst_2 { - DISPATCH_START \seq_len + DISPATCH_START_R2 mov r2, #0x40000000 DISPATCH_NEXT PUSH r2 @@ -336,7 +353,7 @@ return_register_finalizer = 0xe5, 1 } (dconst_1) dconst_1 { - DISPATCH_START \seq_len + DISPATCH_START_R2 mov tmp1, #0x3f000000 DISPATCH_NEXT orr tmp1, tmp1, #0x00f00000 @@ -363,12 +380,12 @@ return_register_finalizer = 0xe5, 1 @ r2 = [jpc, #1] @ r1 = [jpc, #2] (sipush) sipush { - DISPATCH_START \seq_len - mov tmp1, r1 + ldrb r1, [jpc, #2] + DISPATCH_START \seq_len DISPATCH_NEXT mov r2, r2, lsl #24 - DISPATCH_NEXT - orr tmp1, tmp1, r2, asr #16 + orr tmp1, r1, r2, asr #16 + DISPATCH_NEXT DISPATCH_NEXT DISPATCH_NEXT PUSH tmp1 @@ -403,7 +420,7 @@ return_register_finalizer = 0xe5, 1 (aload_0,aload_1,aload_2,aload_3) { rsb tmp1, r0, #opc_aload_0 - DISPATCH_START \seq_len + DISPATCH_START_R2 DISPATCH_NEXT ldr tmp1, [locals, tmp1, lsl #2] DISPATCH_NEXT @@ -415,7 +432,7 @@ return_register_finalizer = 0xe5, 1 (iload_0,iload_1,iload_2,iload_3) { rsb tmp1, r0, #opc_iload_0 - DISPATCH_START \seq_len + DISPATCH_START_R2 DISPATCH_NEXT ldr tmp1, [locals, tmp1, lsl #2] DISPATCH_NEXT @@ -427,7 +444,7 @@ return_register_finalizer = 0xe5, 1 (fload_0,fload_1,fload_2,fload_3) { rsb tmp1, r0, #opc_fload_0 - DISPATCH_START \seq_len + DISPATCH_START_R2 DISPATCH_NEXT ldr tmp1, [locals, tmp1, lsl #2] DISPATCH_NEXT @@ -438,7 +455,7 @@ return_register_finalizer = 0xe5, 1 } (lload_0,dload_0) u8load_0 { - DISPATCH_START \seq_len + DISPATCH_START_R2 ldmda locals, {tmp2-tmp1} DISPATCH_NEXT PUSH tmp1 @@ -450,7 +467,7 @@ return_register_finalizer = 0xe5, 1 } (lload_1,dload_1) u8load_1 { - DISPATCH_START \seq_len + DISPATCH_START_R2 ldmdb locals, {tmp2-tmp1} DISPATCH_NEXT PUSH tmp1 @@ -462,7 +479,7 @@ return_register_finalizer = 0xe5, 1 } (lload_2,dload_2) u8load_2 { - DISPATCH_START \seq_len + DISPATCH_START_R2 ldr tmp2, [locals, #-12] DISPATCH_NEXT ldr tmp1, [locals, #-8] @@ -474,7 +491,7 @@ return_register_finalizer = 0xe5, 1 } (lload_3,dload_3) u8load_3 { - DISPATCH_START \seq_len + DISPATCH_START_R2 ldr tmp2, [locals, #-16] DISPATCH_NEXT ldr tmp1, [locals, #-12] @@ -486,8 +503,10 @@ return_register_finalizer = 0xe5, 1 } (iaload,faload,aaload) u4aload { - POP r2, r3 @ r2 = index, r3 = arrayref - DISPATCH_START \seq_len + GET_STACK 1, r3 + DISPATCH_START_R2_R0 + POP r2 + DISPATCH_START_R2_JPC SW_NPC cmp r3, #0 SW_NPC beq null_ptr_exception_jpc_1 .abortentry5: @@ -500,13 +519,15 @@ return_register_finalizer = 0xe5, 1 DISPATCH_NEXT ldr tmp1, [r3, #12] DISPATCH_NEXT - PUSH tmp1 + PUT_STACK 0, tmp1 DISPATCH_FINISH } (laload,daload) u8aload { - POP r2, r3 - DISPATCH_START \seq_len + GET_STACK 1, r3 + DISPATCH_START_R2_R0 + GET_STACK 0, r2 + DISPATCH_START_R2_JPC SW_NPC cmp r3, #0 SW_NPC beq null_ptr_exception_jpc_1 .abortentry6: @@ -520,13 +541,16 @@ return_register_finalizer = 0xe5, 1 DISPATCH_NEXT ldr tmp1, [r3, #20] DISPATCH_NEXT - PUSH tmp2, tmp1 + PUT_STACK 1, tmp1 + PUT_STACK 0, tmp2 DISPATCH_FINISH } (baload) baload { - POP r2, r3 @ r2 = index, r3 = arrayref - DISPATCH_START \seq_len + GET_STACK 1, r3 + DISPATCH_START_R2_R0 + POP r2 + DISPATCH_START_R2_JPC SW_NPC cmp r3, #0 SW_NPC beq null_ptr_exception_jpc_1 .abortentry7: @@ -539,13 +563,15 @@ return_register_finalizer = 0xe5, 1 DISPATCH_NEXT ldrsb tmp1, [r3, #12] DISPATCH_NEXT - PUSH tmp1 + PUT_STACK 0, tmp1 DISPATCH_FINISH } (caload) caload { - POP r2, r3 @ r2 = index, r3 = arrayref - DISPATCH_START \seq_len + GET_STACK 1, r3 + DISPATCH_START_R2_R0 + POP r2 + DISPATCH_START_R2_JPC SW_NPC cmp r3, #0 SW_NPC beq null_ptr_exception_jpc_1 .abortentry8: @@ -558,13 +584,15 @@ return_register_finalizer = 0xe5, 1 DISPATCH_NEXT ldrh tmp1, [r3, #12] DISPATCH_NEXT - PUSH tmp1 + PUT_STACK 0, tmp1 DISPATCH_FINISH } (saload) saload { - POP r2, r3 @ r2 = index, r3 = arrayref - DISPATCH_START \seq_len + GET_STACK 1, r3 + DISPATCH_START_R2_R0 + POP r2 + DISPATCH_START_R2_JPC SW_NPC cmp r3, #0 SW_NPC beq null_ptr_exception_jpc_1 .abortentry9: @@ -577,7 +605,7 @@ return_register_finalizer = 0xe5, 1 DISPATCH_NEXT ldrsh tmp1, [r3, #12] DISPATCH_NEXT - PUSH tmp1 + PUT_STACK 0, tmp1 DISPATCH_FINISH } @@ -608,7 +636,7 @@ return_register_finalizer = 0xe5, 1 } (astore_0,istore_0,fstore_0) u4store_0 { - DISPATCH_START \seq_len + DISPATCH_START_R2 DISPATCH_NEXT POP tmp1 DISPATCH_NEXT @@ -619,7 +647,7 @@ return_register_finalizer = 0xe5, 1 } (astore_1,istore_1,fstore_1) u4store_1 { - DISPATCH_START \seq_len + DISPATCH_START_R2 DISPATCH_NEXT POP tmp1 DISPATCH_NEXT @@ -630,7 +658,7 @@ return_register_finalizer = 0xe5, 1 } (astore_2,istore_2,fstore_2) u4store_2 { - DISPATCH_START \seq_len + DISPATCH_START_R2 DISPATCH_NEXT POP tmp1 DISPATCH_NEXT @@ -641,7 +669,7 @@ return_register_finalizer = 0xe5, 1 } (astore_3,istore_3,fstore_3) u4store_3 { - DISPATCH_START \seq_len + DISPATCH_START_R2 DISPATCH_NEXT POP tmp1 DISPATCH_NEXT @@ -652,7 +680,7 @@ return_register_finalizer = 0xe5, 1 } (lstore_0,dstore_0) u8store_0 { - DISPATCH_START \seq_len + DISPATCH_START_R2 DISPATCH_NEXT POP tmp2, tmp1 DISPATCH_NEXT @@ -663,7 +691,7 @@ return_register_finalizer = 0xe5, 1 } (lstore_1,dstore_1) u8store_1 { - DISPATCH_START \seq_len + DISPATCH_START_R2 DISPATCH_NEXT POP tmp2, tmp1 DISPATCH_NEXT @@ -674,7 +702,7 @@ return_register_finalizer = 0xe5, 1 } (lstore_2,dstore_2) u8store_2 { - DISPATCH_START \seq_len + DISPATCH_START_R2 POP tmp2, tmp1 DISPATCH_NEXT str tmp2, [locals, #-12] @@ -686,7 +714,7 @@ return_register_finalizer = 0xe5, 1 } (lstore_3,dstore_3) u8store_3 { - DISPATCH_START \seq_len + DISPATCH_START_R2 POP tmp2, tmp1 DISPATCH_NEXT str tmp2, [locals, #-16] @@ -699,7 +727,7 @@ return_register_finalizer = 0xe5, 1 (iastore,fastore) u4astore { POP r3, tmp2, tmp1 @ r3 = value, tmp2 = index, tmp1 = arrayref - DISPATCH_START \seq_len + DISPATCH_START_R2 SW_NPC cmp tmp1, #0 SW_NPC beq null_ptr_exception_jpc_1 .abortentry10: @@ -715,8 +743,8 @@ return_register_finalizer = 0xe5, 1 } (lastore,dastore) u8astore { - POP r2, r3, tmp2, tmp1 @ r2,r3 = value, tmp2 = index, tmp1 = arrayref - DISPATCH_START \seq_len + POP r1, r3, tmp2, tmp1 @ r1,r3 = value, tmp2 = index, tmp1 = arrayref + DISPATCH_START_R2 SW_NPC cmp tmp1, #0 SW_NPC beq null_ptr_exception_jpc_1 .abortentry11: @@ -726,7 +754,7 @@ return_register_finalizer = 0xe5, 1 bcs array_bound_exception_jpc_1_tmp2 DISPATCH_NEXT add tmp2, tmp1, tmp2, lsl #3 - str r2, [tmp2, #16] + str r1, [tmp2, #16] DISPATCH_NEXT DISPATCH_NEXT str r3, [tmp2, #20] @@ -735,7 +763,7 @@ return_register_finalizer = 0xe5, 1 (bastore) bastore { POP r3, tmp2, tmp1 @ r3 = value, tmp2 = index, tmp1 = arrayref - DISPATCH_START \seq_len + DISPATCH_START_R2 SW_NPC cmp tmp1, #0 SW_NPC beq null_ptr_exception_jpc_1 .abortentry12: @@ -752,7 +780,7 @@ return_register_finalizer = 0xe5, 1 (castore,sastore) u2astore { POP r3, tmp2, tmp1 @ r3 = value, tmp2 = index, tmp1 = arrayref - DISPATCH_START \seq_len + DISPATCH_START_R2 SW_NPC cmp tmp1, #0 SW_NPC beq null_ptr_exception_jpc_1 .abortentry13: @@ -768,19 +796,19 @@ return_register_finalizer = 0xe5, 1 } (pop) jpop { - DISPATCH_START \seq_len + DISPATCH_START_R2 add stack, stack, #4 DISPATCH_FINISH } (pop2) jpop2 { - DISPATCH_START \seq_len + DISPATCH_START_R2 add stack, stack, #8 DISPATCH_FINISH } (dup) dup { - DISPATCH_START \seq_len + DISPATCH_START_R2 ldr lr, [stack, #4] DISPATCH_NEXT PUSH lr @@ -788,7 +816,7 @@ return_register_finalizer = 0xe5, 1 } (dup_x1) dup_x1 { - DISPATCH_START \seq_len + DISPATCH_START_R2 POP r2, r3 DISPATCH_NEXT PUSH r2 @@ -798,7 +826,7 @@ return_register_finalizer = 0xe5, 1 } (dup_x2) dup_x2 { - DISPATCH_START \seq_len + DISPATCH_START_R2 POP r2, r3, lr DISPATCH_NEXT PUSH r2 @@ -808,7 +836,7 @@ return_register_finalizer = 0xe5, 1 } (dup2) dup2 { - DISPATCH_START \seq_len + DISPATCH_START_R2 ldmib stack, {r2, r3} DISPATCH_NEXT PUSH r2, r3 @@ -816,7 +844,7 @@ return_register_finalizer = 0xe5, 1 } (dup2_x1) dup2_x1 { - DISPATCH_START \seq_len + DISPATCH_START_R2 POP r2, r3, lr DISPATCH_NEXT PUSH r2, r3 @@ -826,7 +854,7 @@ return_register_finalizer = 0xe5, 1 } (dup2_x2) dup2_x2 { - DISPATCH_START \seq_len From Joe.Darcy at Sun.COM Mon Oct 5 14:50:30 2009 From: Joe.Darcy at Sun.COM (Joseph D. Darcy) Date: Mon, 05 Oct 2009 14:50:30 -0700 Subject: b17 In-Reply-To: <17c6771e0910021520t7af0582m10830585e1101669@mail.gmail.com> References: <17c6771e0909290504u46e7536cjc5b477cd693c2fce@mail.gmail.com> <4AC2CFDB.6030206@sun.com> <17c6771e0909300250m10cc023evae0de3471fdcf7df@mail.gmail.com> <4AC39331.3070806@sun.com> <4AC3FC44.7020400@sun.com> <17c6771e0910020506o6c8450b4m8160ac4a8c0cf807@mail.gmail.com> <17c6771e0910020610p14bb8ad0gb532205830108083@mail.gmail.com> <4AC63861.1090400@sun.com> <17c6771e0910021520t7af0582m10830585e1101669@mail.gmail.com> Message-ID: <4ACA6A26.4050003@sun.com> Andrew John Hughes wrote: > 2009/10/2 Joseph D. Darcy : > >> Andrew John Hughes wrote: >> >>> 2009/10/2 Andrew John Hughes : >>> >>> >>>> 2009/10/1 Joe Darcy : >>>> >>>> >>>>> Joseph D. Darcy wrote: >>>>> >>>>> >>>>>> Andrew John Hughes wrote: >>>>>> >>>>>> >>>>>>> 2009/9/30 Joe Darcy : >>>>>>> >>>>>>> >>>>>>> >>>>>>>> Andrew John Hughes wrote: >>>>>>>> >>>>>>>> >>>>>>>> >>>>>>>>> Now that HotSpot 14 is merged, are we going to have a b17 release? >>>>>>>>> >>>>>>>>> >>>>>>>>> >>>>>>>>> >>>>>>>> Real soon now :-) >>>>>>>> >>>>>>>> >>>>>>>> >>>>>>>> >>>>>>>>> I thought this is what we were waiting on, but it seems more >>>>>>>>> changesets are being added >>>>>>>>> (http://hg.openjdk.java.net/jdk6/jdk6/langtools/rev/f754eab3d93a) >>>>>>>>> without any public discussion on the mailing list. >>>>>>>>> >>>>>>>>> >>>>>>>>> >>>>>>>>> >>>>>>>>> >>>>>>>> There is another javac fix to go back in b17 and a recently added >>>>>>>> test >>>>>>>> needs >>>>>>>> to be moved. >>>>>>>> >>>>>>>> >>>>>>>> >>>>>>>> >>>>>>> Ok, are these backports from OpenJDK7? I haven't seen anything on the >>>>>>> list other than the commits. >>>>>>> >>>>>>> >>>>>>> >>>>>>> >>>>>>>> I'd also like to see a port of your DeoptimizeALot fix since I think >>>>>>>> it >>>>>>>> affects one of the tests currently in the OpenJDK 6 HotSpot repo. >>>>>>>> >>>>>>>> >>>>>>>> >>>>>>>> >>>>>>> http://cr.openjdk.java.net/~andrew/6886353/webrev.01/ >>>>>>> >>>>>>> Same bug, same bug ID, different patch. The two tests affected in >>>>>>> hs17 aren't present in hs14, but a test that's not in hs17 is. >>>>>>> >>>>>>> >>>>>>> >>>>>> Please push this change. >>>>>> >>>>>> >>>>>> >>>>>>>> The preliminary tests I've run on b17 look good. >>>>>>>> >>>>>>>> >>>>>>>> >>>>>>>> >>>>>>> What tests? JTreg or something else? >>>>>>> >>>>>>> >>>>>>> >>>>>> jtreg. >>>>>> >>>>>> >>>>>> >>>>>>> I think IcedTea6 has support for building against hg. We should do >>>>>>> that before the release. >>>>>>> >>>>>>> >>>>>>> >>>>>> Sounds prudent. >>>>>> >>>>>> >>>>>> >>>>> Hello. >>>>> >>>>> Other than Andrew's fix for the HotSpot test, all the planned fixes for >>>>> b17 >>>>> are back in the OpenJDK 6 repository now so it would be a good time to >>>>> start >>>>> building and testing IcedTea6 against the upstream repo. >>>>> >>>>> -Joe >>>>> >>>>> >>>>> >>>>> >>>> I committed this yesterday morning: >>>> >>>> http://hg.openjdk.java.net/jdk6/jdk6/hotspot/rev/012339cadcba >>>> >>>> I'm currently working on getting IcedTea6 building with my hg >>>> checkout, and will push this to my personal branch: >>>> http://icedtea.classpath.org/hg/people/andrew/icedtea6 >>>> when I'm done. There are a lot of patches that are now redundant :) >>>> >>>> Are all the recent security patches in JDK6 hg? >>>> >>>> >> Yes, OpenJDK 6 is up to date on security fixes. >> >> >>>> Thanks, >>>> -- >>>> Andrew :-) >>>> >>>> Free Java Software Engineer >>>> Red Hat, Inc. (http://www.redhat.com) >>>> >>>> Support Free Java! >>>> Contribute to GNU Classpath and the OpenJDK >>>> http://www.gnu.org/software/classpath >>>> http://openjdk.java.net >>>> >>>> PGP Key: 94EFD9D8 (http://subkeys.pgp.net) >>>> Fingerprint: F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 >>>> >>>> >>>> >>> It seems hs14 doesn't have the IgnoreUnrecognizedVMOptions flag >>> itself. This webrev: >>> >>> http://cr.openjdk.java.net/~andrew/6788376/ >>> >>> backported from OpenJDK7: >>> http://hg.openjdk.java.net/jdk7/hotspot-rt/hotspot/rev/323728917cf4 >>> adds it. It also includes the change to the test I added with the >>> last changeset. >>> >>> It seems this was added to IcedTea6 but not backported to OpenJDK6. >>> >>> Ok to push? >>> >>> >> Yes, approved to push. >> >> Thanks, >> >> -Joe >> >> >> > > Thanks, pushed: http://hg.openjdk.java.net/jdk6/jdk6/hotspot/rev/f6c52a081457 > > A version of IcedTea6 which builds against current hg (which will > become b17) is now available in > http://icedtea.classpath.org/people/andrew/icedtea6 > > The langtools JTreg tests all pass, as do the HotSpot tests in OpenJDK6. > > There is a testcase related to > http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6707044 which was > never added upstream when the bug was fixed, and which seems to have > been disabled in IcedTea when we switched to hs14. Re-enabling it > shows that this fails with b17. > > ----------messages:(3/133)---------- > command: main -XbatchLuceneCrash > reason: User specified action: run main/othervm -Xbatch LuceneCrash > elapsed time (seconds): 0.203 > ----------System.out:(18/635)---------- > # > # A fatal error has been detected by the Java Runtime Environment: > # > # SIGSEGV (0xb) at pc=0x00002ba66acd4b50, pid=23877, tid=47996055058704 > # > # JRE version: 6.0-b16 > # Java VM: OpenJDK 64-Bit Server VM (14.0-b16 mixed mode linux-amd64 ) > # Distribution: Custom build (Fri Oct 2 21:43:43 BST 2009) > # Problematic frame: > # V [libjvm.so+0x58fb50] > > It claims to produce a log under JTwork/scratch but I don't see one. > > I haven't run the whole JDK test suite. I may leave it running overnight. > Hello. Any results for the jdk/test regression tests? -Joe From bugzilla-daemon at icedtea.classpath.org Mon Oct 5 17:11:33 2009 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 06 Oct 2009 00:11:33 +0000 Subject: [Bug 388] Compile of gcc hangs at fortran/intrinsic.o Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=388 ------- Comment #5 from jlpoole at pon.net 2009-10-06 00:11 ------- USE="+gcj" emerge sys-devel/gcc failed: * * ERROR: sys-devel/gcc-4.3.4 failed. * Call stack: * ebuild.sh, line 49: Called src_compile * environment, line 4840: Called toolchain_src_compile * environment, line 5366: Called gcc_src_compile * environment, line 3067: Called gcc_do_make * environment, line 2857: Called die * The specific snippet of code: * emake LDFLAGS="${LDFLAGS}" STAGE1_CFLAGS="${STAGE1_CFLAGS}" LIBPATH="${LIBPATH}" BOOT_CFLAGS="${BOOT_CFLAGS}" ${GCC_MAKE_TARGET} || die "emake failed with ${GCC_MAKE_TARGET}"; * The die message: * emake failed with bootstrap-lean * * If you need support, post the topmost build error, and the call stack if relevant. * A complete build log is located at '/var/tmp/portage/sys-devel/gcc-4.3.4/temp/build.log'. * The ebuild environment file is located at '/var/tmp/portage/sys-devel/gcc-4.3.4/temp/environment'. * -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From gnu_andrew at member.fsf.org Tue Oct 6 01:37:58 2009 From: gnu_andrew at member.fsf.org (Andrew John Hughes) Date: Tue, 6 Oct 2009 09:37:58 +0100 Subject: b17 In-Reply-To: <4ACA6A26.4050003@sun.com> References: <17c6771e0909290504u46e7536cjc5b477cd693c2fce@mail.gmail.com> <4AC2CFDB.6030206@sun.com> <17c6771e0909300250m10cc023evae0de3471fdcf7df@mail.gmail.com> <4AC39331.3070806@sun.com> <4AC3FC44.7020400@sun.com> <17c6771e0910020506o6c8450b4m8160ac4a8c0cf807@mail.gmail.com> <17c6771e0910020610p14bb8ad0gb532205830108083@mail.gmail.com> <4AC63861.1090400@sun.com> <17c6771e0910021520t7af0582m10830585e1101669@mail.gmail.com> <4ACA6A26.4050003@sun.com> Message-ID: <17c6771e0910060137h1ade6e1u976a58e515dcd5d5@mail.gmail.com> 2009/10/5 Joseph D. Darcy : > Andrew John Hughes wrote: >> >> 2009/10/2 Joseph D. Darcy : >> >>> >>> Andrew John Hughes wrote: >>> >>>> >>>> 2009/10/2 Andrew John Hughes : >>>> >>>> >>>>> >>>>> 2009/10/1 Joe Darcy : >>>>> >>>>> >>>>>> >>>>>> Joseph D. Darcy wrote: >>>>>> >>>>>> >>>>>>> >>>>>>> Andrew John Hughes wrote: >>>>>>> >>>>>>> >>>>>>>> >>>>>>>> 2009/9/30 Joe Darcy : >>>>>>>> >>>>>>>> >>>>>>>> >>>>>>>>> >>>>>>>>> Andrew John Hughes wrote: >>>>>>>>> >>>>>>>>> >>>>>>>>> >>>>>>>>>> >>>>>>>>>> Now that HotSpot 14 is merged, are we going to have a b17 release? >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> >>>>>>>>> >>>>>>>>> Real soon now :-) >>>>>>>>> >>>>>>>>> >>>>>>>>> >>>>>>>>> >>>>>>>>>> >>>>>>>>>> I thought this is what we were waiting on, but it seems more >>>>>>>>>> changesets are being added >>>>>>>>>> (http://hg.openjdk.java.net/jdk6/jdk6/langtools/rev/f754eab3d93a) >>>>>>>>>> without any public discussion on the mailing list. >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> >>>>>>>>> >>>>>>>>> There is another javac fix to go back in b17 and a recently added >>>>>>>>> test >>>>>>>>> needs >>>>>>>>> to be moved. >>>>>>>>> >>>>>>>>> >>>>>>>>> >>>>>>>>> >>>>>>>> >>>>>>>> Ok, are these backports from OpenJDK7? I haven't seen anything on >>>>>>>> the >>>>>>>> list other than the commits. >>>>>>>> >>>>>>>> >>>>>>>> >>>>>>>> >>>>>>>>> >>>>>>>>> I'd also like to see a port of your DeoptimizeALot fix since I >>>>>>>>> think >>>>>>>>> it >>>>>>>>> affects one of the tests currently in the OpenJDK 6 HotSpot repo. >>>>>>>>> >>>>>>>>> >>>>>>>>> >>>>>>>>> >>>>>>>> >>>>>>>> http://cr.openjdk.java.net/~andrew/6886353/webrev.01/ >>>>>>>> >>>>>>>> Same bug, same bug ID, different patch. ?The two tests affected in >>>>>>>> hs17 aren't present in hs14, but a test that's not in hs17 is. >>>>>>>> >>>>>>>> >>>>>>>> >>>>>>> >>>>>>> Please push this change. >>>>>>> >>>>>>> >>>>>>> >>>>>>>>> >>>>>>>>> The preliminary tests I've run on b17 look good. >>>>>>>>> >>>>>>>>> >>>>>>>>> >>>>>>>>> >>>>>>>> >>>>>>>> What tests? ?JTreg or something else? >>>>>>>> >>>>>>>> >>>>>>>> >>>>>>> >>>>>>> jtreg. >>>>>>> >>>>>>> >>>>>>> >>>>>>>> >>>>>>>> I think IcedTea6 has support for building against hg. ?We should do >>>>>>>> that before the release. >>>>>>>> >>>>>>>> >>>>>>>> >>>>>>> >>>>>>> Sounds prudent. >>>>>>> >>>>>>> >>>>>>> >>>>>> >>>>>> Hello. >>>>>> >>>>>> Other than Andrew's fix for the HotSpot test, all the planned fixes >>>>>> for >>>>>> b17 >>>>>> are back in the OpenJDK 6 repository now so it would be a good time to >>>>>> start >>>>>> building and testing IcedTea6 against the upstream repo. >>>>>> >>>>>> -Joe >>>>>> >>>>>> >>>>>> >>>>>> >>>>> >>>>> I committed this yesterday morning: >>>>> >>>>> http://hg.openjdk.java.net/jdk6/jdk6/hotspot/rev/012339cadcba >>>>> >>>>> I'm currently working on getting IcedTea6 building with my hg >>>>> checkout, and will push this to my personal branch: >>>>> http://icedtea.classpath.org/hg/people/andrew/icedtea6 >>>>> when I'm done. ?There are a lot of patches that are now redundant :) >>>>> >>>>> Are all the recent security patches in JDK6 hg? >>>>> >>>>> >>> >>> Yes, OpenJDK 6 is up to date on security fixes. >>> >>> >>>>> >>>>> Thanks, >>>>> -- >>>>> Andrew :-) >>>>> >>>>> Free Java Software Engineer >>>>> Red Hat, Inc. (http://www.redhat.com) >>>>> >>>>> Support Free Java! >>>>> Contribute to GNU Classpath and the OpenJDK >>>>> http://www.gnu.org/software/classpath >>>>> http://openjdk.java.net >>>>> >>>>> PGP Key: 94EFD9D8 (http://subkeys.pgp.net) >>>>> Fingerprint: F8EF F1EA 401E 2E60 15FA ?7927 142C 2591 94EF D9D8 >>>>> >>>>> >>>>> >>>> >>>> It seems hs14 doesn't have the IgnoreUnrecognizedVMOptions flag >>>> itself. ?This webrev: >>>> >>>> http://cr.openjdk.java.net/~andrew/6788376/ >>>> >>>> backported from OpenJDK7: >>>> http://hg.openjdk.java.net/jdk7/hotspot-rt/hotspot/rev/323728917cf4 >>>> adds it. ?It also includes the change to the test I added with the >>>> last changeset. >>>> >>>> It seems this was added to IcedTea6 but not backported to OpenJDK6. >>>> >>>> Ok to push? >>>> >>>> >>> >>> Yes, approved to push. >>> >>> Thanks, >>> >>> -Joe >>> >>> >>> >> >> Thanks, pushed: >> http://hg.openjdk.java.net/jdk6/jdk6/hotspot/rev/f6c52a081457 >> >> A version of IcedTea6 which builds against current hg (which will >> become b17) is now available in >> http://icedtea.classpath.org/people/andrew/icedtea6 >> >> The langtools JTreg tests all pass, as do the HotSpot tests in OpenJDK6. >> >> There is a testcase related to >> http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6707044 which was >> never added upstream when the bug was fixed, and which seems to have >> been disabled in IcedTea when we switched to hs14. ?Re-enabling it >> shows that this fails with b17. >> >> ----------messages:(3/133)---------- >> command: main ?-XbatchLuceneCrash >> reason: User specified action: run main/othervm -Xbatch LuceneCrash >> elapsed time (seconds): 0.203 >> ----------System.out:(18/635)---------- >> # >> # A fatal error has been detected by the Java Runtime Environment: >> # >> # ?SIGSEGV (0xb) at pc=0x00002ba66acd4b50, pid=23877, tid=47996055058704 >> # >> # JRE version: 6.0-b16 >> # Java VM: OpenJDK 64-Bit Server VM (14.0-b16 mixed mode linux-amd64 ) >> # Distribution: Custom build (Fri Oct ?2 21:43:43 BST 2009) >> # Problematic frame: >> # V ?[libjvm.so+0x58fb50] >> >> It claims to produce a log under JTwork/scratch but I don't see one. >> >> I haven't run the whole JDK test suite. ?I may leave it running overnight. >> > > Hello. > > Any results for the jdk/test regression tests? > > -Joe > I didn't get chance to run this at the weekend. It's going now, so I'll post when I have the results. It would be good if some other IcedTea folks could have a look before this becomes final. You just need to hg clone http://icedtea.classpath.org/people/andrew/icedtea6 and build using --with-openjdk-dir= in addition to any usual options. -- Andrew :-) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint: F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From gbenson at icedtea.classpath.org Tue Oct 6 05:39:19 2009 From: gbenson at icedtea.classpath.org (gbenson at icedtea.classpath.org) Date: Tue, 06 Oct 2009 12:39:19 +0000 Subject: /hg/icedtea6: 2009-10-06 Gary Benson Message-ID: changeset f61b94ebf46a in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=f61b94ebf46a author: Gary Benson date: Tue Oct 06 13:42:46 2009 +0100 2009-10-06 Gary Benson * patches/icedtea-s390-serialize.patch: New file. * Makefile.am: Apply the above. * HACKING: Document the above. diffstat: 4 files changed, 23 insertions(+) ChangeLog | 6 ++++++ HACKING | 1 + Makefile.am | 1 + patches/icedtea-s390-serialize.patch | 15 +++++++++++++++ diffs (54 lines): diff -r c7458f207acf -r f61b94ebf46a ChangeLog --- a/ChangeLog Mon Oct 05 14:13:48 2009 +0100 +++ b/ChangeLog Tue Oct 06 13:42:46 2009 +0100 @@ -1,3 +1,9 @@ 2009-10-05 Edward Nevill + + * patches/icedtea-s390-serialize.patch: New file. + * Makefile.am: Apply the above. + * HACKING: Document the above. + 2009-10-05 Edward Nevill * Support for generation of native libraries for JCK on ARM diff -r c7458f207acf -r f61b94ebf46a HACKING --- a/HACKING Mon Oct 05 14:13:48 2009 +0100 +++ b/HACKING Tue Oct 06 13:42:46 2009 +0100 @@ -106,6 +106,7 @@ The following patches are currently appl * icedtea-test-atomic-operations.patch: Add check to see if GCC's sync_lock_test works. * icedtea-zero.patch: Generalise architecture support, add ARM and #ifdef out non-zero applicable parts. * icedtea-shark.patch: Add support for the Shark JIT. +* icedtea-s390-serialize.patch: Correctly detect serialization segfaults on s390. The following patches are only applied to OpenJDK6 in IcedTea6: diff -r c7458f207acf -r f61b94ebf46a Makefile.am --- a/Makefile.am Mon Oct 05 14:13:48 2009 +0100 +++ b/Makefile.am Tue Oct 06 13:42:46 2009 +0100 @@ -752,6 +752,7 @@ ICEDTEA_PATCHES += \ patches/openjdk/6648816.patch \ patches/openjdk/oj100103-debugger-socket-overflow.patch \ patches/hotspot/$(HSBUILD)/icedtea-gcc-stack-markings.patch \ + patches/icedtea-s390-serialize.patch \ $(DISTRIBUTION_PATCHES) stamps/extract.stamp: stamps/download.stamp diff -r c7458f207acf -r f61b94ebf46a patches/icedtea-s390-serialize.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/icedtea-s390-serialize.patch Tue Oct 06 13:42:46 2009 +0100 @@ -0,0 +1,15 @@ +diff -r 54de806cda4f -r 16b4f99fe54e openjdk-ecj/hotspot/src/share/vm/runtime/os.hpp +--- openjdk/hotspot/src/share/vm/runtime/os.hpp Fri Oct 02 14:46:11 2009 +0100 ++++ openjdk/hotspot/src/share/vm/runtime/os.hpp Fri Oct 02 15:28:00 2009 +0100 +@@ -300,6 +300,11 @@ + // of the form: + // return ((_mem_serialize_page ^ addr) & -pagesize) == 0 + // ++#ifdef S390 ++ // s390 is one of those "some platforms" ++ if (addr == (address)_mem_serialize_page) ++ return true; ++#endif // S390 + thr_addr = (address)(((uintptr_t)thread >> + get_serialize_page_shift_count()) & + get_serialize_page_mask()) + (uintptr_t)_mem_serialize_page; From xerxes at zafena.se Tue Oct 6 07:22:56 2009 From: xerxes at zafena.se (=?ISO-8859-1?Q?Xerxes_R=E5nby?=) Date: Tue, 06 Oct 2009 16:22:56 +0200 Subject: [patch] rfc: shark overloaded intrinsic suffix fix Message-ID: <4ACB52C0.10609@zafena.se> I was toying with adding some optimization passes and verify passes to speed up and more runtime checks to shark, while doing so then one of the verify passes found at least one oddity in the shark sourcecode. The attached patch fixes this verifier issue. verifier output: Overloaded intrinsic has incorrect suffix: '.i32'. It should be '.i32.p0i32' i32 (i32*, i32, i32)* @llvm.atomic.cmp.swap.i32 Broken module found, compilation aborted! Stack dump: 0. Running pass 'Module Verifier' on function '@"java.io.BufferedReader::readLine"' Avbruten (SIGABRT) http://llvm.org/docs/LangRef.html#int_atomics Ok to push? Cheers Xerxes -------------- next part -------------- A non-text attachment was scrubbed... Name: fix_verifier.patch Type: text/x-patch Size: 787 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20091006/046d34b0/attachment.bin From andrew at icedtea.classpath.org Tue Oct 6 10:36:32 2009 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Tue, 06 Oct 2009 17:36:32 +0000 Subject: /hg/icedtea: 12 new changesets Message-ID: changeset dfd69fa0c812 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=dfd69fa0c812 author: Deepak Bhole date: Thu Aug 06 10:43:31 2009 -0400 Updates to NP plugin. - Plugin request processor threads now use condition based wait rather than periodic polling - Added support for fetching field information and values, and method invocation from JS -> Java - Added support for static calls (e.g. System.out.println(...)) from JS - Implented a cost-based overloaded method resolver for when JS calls an overloaded Java method with ambiguous types. changeset c1c108662db8 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=c1c108662db8 author: Deepak Bhole date: Fri Aug 14 15:58:23 2009 -0400 This commit: - Reworks memory allocation to make it less leaky by using heap as little as possible. - Implements JSObject.call and JSObject.eval which allow invocation of JavaScript methods, and execution of arbitrary scripts. Everything except for array types is currently handled. - Fixes a few new race conditions that surfaced as result of less messages/faster initialization. - Starts laying out call security. - Fixes unicode handling so that UTF-8 is used correctly across the board. Most prominently, new sites that now work include: - Facebook photo uploader - Yahoo! games applets - A whole bunch of banking applets changeset e0f4520ae470 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=e0f4520ae470 author: Deepak Bhole date: Fri Aug 14 15:58:42 2009 -0400 Missed a file. Adding.. changeset d38d3977ca3e in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=d38d3977ca3e author: Andrew John Hughes date: Tue Oct 06 18:01:08 2009 +0100 Make child JNLPs use the same classloader as parent for a given instance. 2009-08-25 Deepak Bhole * netx/net/sourceforge/jnlp/JNLPFile.java: Add a new key variable that is unique to each instance. (JNLPFile): Existing constructor changed to generate a new key on call. (JNLPFile): New constructor that takes a key. If called, sets the file's key to it. (getUniqueKey): Returns the unique key for the instance. * netx/net/sourceforge/jnlp/PluginBridge.java: Generate new instance specific unique key. * netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java (getInstance): Use unique instance keys to determine which classloader to use, rather than using the URL. (getInstance): Same. (initializeExtensions): Provide unique key to getInstance. changeset dbe859b50636 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=dbe859b50636 author: Andrew John Hughes date: Tue Oct 06 18:06:43 2009 +0100 Patch to detect certificate CN mismatches and offer user the choice to ignore it. 2009-08-25 Deepak Bhole * netx/net/sourceforge/jnlp/resources/Messages.properties: Add new message key for CN name mismatches. * netx/net/sourceforge/jnlp/security/HttpsCertVerifier.java (HttpsCertVerifier): Accept new parameters that indicate certificate trust status, CN mismatch status, and the hostname. (getAlreadyTrustPublisher): Use provided isTrusted boolean to get around checkServerTrusted() synchronization. (getDetails): Include details about CN mismatch. (getNamesForCert): New private method. Returns all acceptable names for a given X509Certificate. (R): Overloaded the method to return messages that have 2 variables. * netx/net/sourceforge/jnlp/security/VariableX509TrustManager.java: Extend X509ExtendedTrustManager rather than X509TrustManager. (checkClientTrusted): Overloaded method with one that takes a hostname. (checkServerTrusted): Same. The new overloaded method also checks for CN mismatch if the certificate is not explicitly trusted. (isExplicitlyTrusted): Returns if the given certificate chain is part of the local user trusted DB. (askUser): Change parameters to accept information about trust, host match status, and hostname. changeset 47802906c81f in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=47802906c81f author: Deepak Bhole date: Tue Aug 25 10:30:05 2009 -0400 Use a custom cookie manager rather than just a custom cookiestore. This allows cookie strings with spaces to return correctly, as expected by some webservers (e.g. Miniserv from WebMin). changeset be850f0b74e2 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=be850f0b74e2 author: Deepak Bhole date: Tue Aug 25 10:34:09 2009 -0400 Fix NPE due to race condition when panel is still being initialized when a request for it comes in. Remove new-lines from status messages, as status bar is single line. changeset fbdb1c1ba782 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=fbdb1c1ba782 author: Deepak Bhole date: Tue Aug 25 10:38:03 2009 -0400 Adding/removing files missed in previous commit changeset 52eee2ca6d37 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=52eee2ca6d37 author: Deepak Bhole date: Wed Aug 26 01:14:21 2009 -0400 Fix minor logic bug in earlier commit. changeset 518cf0feb646 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=518cf0feb646 author: Deepak Bhole date: Wed Aug 26 15:06:47 2009 -0400 - Support for Chromium and Firefox 3.6 A1 - Added object construction support - Port over cookie/cert cn mismatch/etc. fixes from current plugin changeset 5edc8307c7ab in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=5edc8307c7ab author: Deepak Bhole date: Thu Aug 27 13:16:24 2009 -0400 - Fix static instantiation support for xulrunner >= 1.9.2 - Remove JS <-> Class source match check, as NPAPI does not allow cross-site calls anyway ChangeLog: * plugin/icedteanp/IcedTeaNPPlugin.cc (GCJ_New): Use arg count to determine whether or not a send an applet tag to Java side. Set a new is_applet_instance variable in GCJPluginData. (get_scriptable_object): Use the new is_applet_instance variable in instance->pdata to determine what kind of object to return. * plugin/icedteanp/IcedTeaNPPlugin.h: Add a new is_applet_instance bool to GCJPluginData, which determines whether it is an applet instance or a dummy one. * plugin/icedteanp/java/sun/applet/PluginAppletSecurityContext.java (checkPermission): Disable js src == class src check, as NPAPI does not allow cross site scripting. changeset 5e20e6468dd1 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=5e20e6468dd1 author: Deepak Bhole date: Tue Sep 15 12:47:59 2009 -0400 Updates to the new NP plugin: - Added preliminary array support (get/set from JS->Java) - Fixed some timing issues to make plugin faster - Implemented object resuse so that comparison of Java objects on JS side works * plugin/icedteanp/IcedTeaJavaRequestProcessor.cc (newMessageOnBus): Handle certain callbacks in a more uniform manner. (postAndWaitForResponse): Lower poll time to 200 us for more responsiveness. (findClass): Accept instance ID which is used for searching classes in specific applet instance classloaders. (getArrayLength): New function. Returns length of an array on Java side. (getSlot): New function. Returns element at requested index in an array. (setSlot): New function. Sets requested index in array to supplied value. (getField): Accept object id. (getStaticField): Fix parameter ordering for consistency. (set): New function. Sets Java side fields to given value. (setStaticField): New function. Sets value of a static field in a Java object. (setField): New function. Sets value of a static field in a class. (createJavaObjectFromVariant): Handle void and null variants. Handle case where object is already created. (call): Use a string to store object id. (newObject): Same. (hasPackage): Accept instance id and pass it on. * plugin/icedteanp/IcedTeaJavaRequestProcessor.h: Relevant changes as needed by the updates to the .cc file. * plugin/icedteanp/IcedTeaNPPlugin.cc (get_scriptable_object): Pass false for the new isArray arg to get_scriptable_java_object. * plugin/icedteanp/IcedTeaPluginRequestProcessor.cc: Pass 0 as the instance id to all findClass calls. * plugin/icedteanp/IcedTeaScriptablePluginObject.cc: Reuse Java object pointers. (IcedTeaScriptableJavaPackageObject::hasProperty): Pass the instance id to findClass. (get_scriptable_java_object): Update code so that Java object pointers can be reused. (IcedTeaScriptableJavaObject::setIsArray): New function. Sets if this object represents an array. (IcedTeaScriptableJavaObject::getIsArray): New function. Returns if this object represents an array. (IcedTeaScriptableJavaObject::hasMethod): Bypass "array indexes" passed to the method. (IcedTeaScriptableJavaObject::javaResultToNPVariant): Handle void and null values correctly. Handle array objects. (IcedTeaScriptableJavaObject::invoke): Set exceptions in JS engine if one occurred on Java side. (IcedTeaScriptableJavaObject::hasProperty): Handle array length and index properties. (IcedTeaScriptableJavaObject::getProperty): Same. (IcedTeaScriptableJavaObject::setProperty): Add support for setting array index values. * plugin/icedteanp/IcedTeaScriptablePluginObject.h: Changes as necessitated by changes to the .cc file. * plugin/icedteanp/java/sun/applet/JavaConsole.java: Handle changed API in PluginAppletSecurityContext. * plugin/icedteanp/java/sun/applet/MethodOverloadResolver.java (getMatchingMethod): Handle un-castable/deferred casts. (getMatchingConstructor): Same. (getNum): Fix handling for characters. * plugin/icedteanp/java/sun/applet/PluginAppletSecurityContext.java (associateInstance): New function. Associated a loader with an instance. (getLoaderInfo): New function. Returns loader info in a map. (handleMessage): Look for class in instance specific loaders as well. Handle float/double precision upto 308 (E308 is max for double). * plugin/icedteanp/java/sun/applet/PluginAppletViewer.java (AppletEventListener::appletStateChanged): Fix race condition during initialization. (handleMessage): Fix race condition to handle GetJavaObject calls when panel is still being initialized. diffstat: 35 files changed, 5123 insertions(+), 1322 deletions(-) ChangeLog | 385 +++ netx/net/sourceforge/jnlp/JNLPFile.java | 38 netx/net/sourceforge/jnlp/PluginBridge.java | 6 netx/net/sourceforge/jnlp/resources/Messages.properties | 1 netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java | 52 netx/net/sourceforge/jnlp/security/HttpsCertVerifier.java | 83 netx/net/sourceforge/jnlp/security/VariableX509TrustManager.java | 97 plugin/icedtea/sun/applet/PluginAppletViewer.java | 4 plugin/icedtea/sun/applet/PluginCookieInfoRequest.java | 48 plugin/icedtea/sun/applet/PluginCookieManager.java | 88 plugin/icedtea/sun/applet/PluginCookieStore.java | 73 plugin/icedtea/sun/applet/PluginMain.java | 4 plugin/icedteanp/IcedTeaJavaRequestProcessor.cc | 999 +++++++++- plugin/icedteanp/IcedTeaJavaRequestProcessor.h | 131 + plugin/icedteanp/IcedTeaNPPlugin.cc | 498 ++-- plugin/icedteanp/IcedTeaNPPlugin.h | 46 plugin/icedteanp/IcedTeaPluginRequestProcessor.cc | 958 ++++++--- plugin/icedteanp/IcedTeaPluginRequestProcessor.h | 38 plugin/icedteanp/IcedTeaPluginUtils.cc | 238 +- plugin/icedteanp/IcedTeaPluginUtils.h | 48 plugin/icedteanp/IcedTeaRunnable.cc | 3 plugin/icedteanp/IcedTeaRunnable.h | 6 plugin/icedteanp/IcedTeaScriptablePluginObject.cc | 807 ++++++++ plugin/icedteanp/IcedTeaScriptablePluginObject.h | 125 + plugin/icedteanp/java/netscape/javascript/JSObject.java | 37 plugin/icedteanp/java/netscape/javascript/JSObjectCreatePermission.java | 47 plugin/icedteanp/java/sun/applet/GetMemberPluginCallRequest.java | 7 plugin/icedteanp/java/sun/applet/JavaConsole.java | 8 plugin/icedteanp/java/sun/applet/MethodOverloadResolver.java | 591 +++++ plugin/icedteanp/java/sun/applet/PluginAppletSecurityContext.java | 648 +++--- plugin/icedteanp/java/sun/applet/PluginAppletViewer.java | 118 - plugin/icedteanp/java/sun/applet/PluginCookieInfoRequest.java | 48 plugin/icedteanp/java/sun/applet/PluginCookieManager.java | 88 plugin/icedteanp/java/sun/applet/PluginCookieStore.java | 73 plugin/icedteanp/java/sun/applet/PluginMain.java | 4 diffs (truncated from 8456 to 500 lines): diff -r 34fd2f476040 -r 5e20e6468dd1 ChangeLog --- a/ChangeLog Fri Oct 02 21:34:18 2009 +0100 +++ b/ChangeLog Tue Sep 15 12:47:59 2009 -0400 @@ -1,3 +1,370 @@ 2009-10-02 Andrew John Hughes + + * plugin/icedteanp/IcedTeaJavaRequestProcessor.cc + (newMessageOnBus): Handle certain callbacks in a more uniform manner. + (postAndWaitForResponse): Lower poll time to 200 us for more + responsiveness. + (findClass): Accept instance ID which is used for searching classes in + specific applet instance classloaders. + (getArrayLength): New function. Returns length of an array on Java side. + (getSlot): New function. Returns element at requested index in an array. + (setSlot): New function. Sets requested index in array to supplied value. + (getField): Accept object id. + (getStaticField): Fix parameter ordering for consistency. + (set): New function. Sets Java side fields to given value. + (setStaticField): New function. Sets value of a static field in a Java + object. + (setField): New function. Sets value of a static field in a class. + (createJavaObjectFromVariant): Handle void and null variants. Handle case + where object is already created. + (call): Use a string to store object id. + (newObject): Same. + (hasPackage): Accept instance id and pass it on. + * plugin/icedteanp/IcedTeaJavaRequestProcessor.h: Relevant changes as + needed by the updates to the .cc file. + * plugin/icedteanp/IcedTeaNPPlugin.cc + (get_scriptable_object): Pass false for the new isArray arg to + get_scriptable_java_object. + * plugin/icedteanp/IcedTeaPluginRequestProcessor.cc: Pass 0 as the + instance id to all findClass calls. + * plugin/icedteanp/IcedTeaScriptablePluginObject.cc: Reuse Java object + pointers. + (IcedTeaScriptableJavaPackageObject::hasProperty): Pass the instance id to + findClass. + (get_scriptable_java_object): Update code so that Java object pointers can + be reused. + (IcedTeaScriptableJavaObject::setIsArray): New function. Sets if this object + represents an array. + (IcedTeaScriptableJavaObject::getIsArray): New function. Returns if this + object represents an array. + (IcedTeaScriptableJavaObject::hasMethod): Bypass "array indexes" passed to + the method. + (IcedTeaScriptableJavaObject::javaResultToNPVariant): Handle void and null + values correctly. Handle array objects. + (IcedTeaScriptableJavaObject::invoke): Set exceptions in JS engine if one + occurred on Java side. + (IcedTeaScriptableJavaObject::hasProperty): Handle array length and index + properties. + (IcedTeaScriptableJavaObject::getProperty): Same. + (IcedTeaScriptableJavaObject::setProperty): Add support for setting array + index values. + * plugin/icedteanp/IcedTeaScriptablePluginObject.h: Changes as + necessitated by changes to the .cc file. + * plugin/icedteanp/java/sun/applet/JavaConsole.java: Handle changed API in + PluginAppletSecurityContext. + * plugin/icedteanp/java/sun/applet/MethodOverloadResolver.java + (getMatchingMethod): Handle un-castable/deferred casts. + (getMatchingConstructor): Same. + (getNum): Fix handling for characters. + * plugin/icedteanp/java/sun/applet/PluginAppletSecurityContext.java + (associateInstance): New function. Associated a loader with an instance. + (getLoaderInfo): New function. Returns loader info in a map. + (handleMessage): Look for class in instance specific loaders as well. + Handle float/double precision upto 308 (E308 is max for double). + * plugin/icedteanp/java/sun/applet/PluginAppletViewer.java + (AppletEventListener::appletStateChanged): Fix race condition during + initialization. + (handleMessage): Fix race condition to handle GetJavaObject calls when + panel is still being initialized. + +2009-08-27 Deepak Bhole + + * plugin/icedteanp/IcedTeaNPPlugin.cc + (GCJ_New): Use arg count to determine whether or not a send an applet tag + to Java side. Set a new is_applet_instance variable in GCJPluginData. + (get_scriptable_object): Use the new is_applet_instance variable in + instance->pdata to determine what kind of object to return. + * plugin/icedteanp/IcedTeaNPPlugin.h: Add a new is_applet_instance bool to + GCJPluginData, which determines whether it is an applet instance or a + dummy one. + * plugin/icedteanp/java/sun/applet/PluginAppletSecurityContext.java + (checkPermission): Disable js src == class src check, as NPAPI does not + allow cross site scripting. + +2009-08-26 Deepak Bhole + + * plugin/icedteanp/IcedTeaJavaRequestProcessor.cc + (createJavaObjectFromVariant): Add conditional compilation blocks to + handle new API along with old. Call renamed newObjectWithConstructor + function. + (newObject): New function. Creates an object based on the most optimum + cost with arbitrary arguments. + (newObjectWithConstructor): Renamed from newObject(). Also, take source as + an argument to provide to Java. + * plugin/icedteanp/IcedTeaJavaRequestProcessor.h: Change as per above .cc + file changes. + * plugin/icedteanp/IcedTeaNPPlugin.cc: Include XPCOM specific headers only + if xulrunner version is < 1.9.2. Instantiate internal Mozilla objects only + if xulrunner < 1.9.2. + (GCJ_New): Correctly account for documentbase length when allocating tag + memory to prevent corruption. + (GCJ_Destroy): Remove old instance mappings when destroyed. + (GCJ_GetJavaClass): Remove unused method. + (get_cookie_info): Change object signature to include length result. Based + on xulrunner version, either use internal Mozilla API for fetching cookie + info, or use NPN_GetValueForURL. + (plugin_get_documentbase): Define for when xulrunner is >= 1.9.2. + (consume_message): Deal with single proxy URL rather than components. + Update to handle when xulrunner is >= 1.9.2 + (get_proxy_info): Change signature to deal with single url rather than + components. Use NPN_GetValueForURL if xulrunner is >= 1.9.2. + (NP_Initialize): Add pointers for getvalueforurl and setvalueforurl in the + NPPluginFuncs table. Also, handle case for when browser provides the + plugin .so name as the link location rather than target location. + * plugin/icedteanp/IcedTeaNPPlugin.h: Include XPCOM specific headers only + if xulrunner version is < 1.9.2. + * plugin/icedteanp/IcedTeaPluginRequestProcessor.cc + (eval): Use the new NPN_PluginThreadAsynCcall function to dispatch events + to main thread asynchronously. + (call): Same. + (setMember): Same. + (getMember): Same. + (storeVariantInJava): Handle changed API when xulrunner >= 1.9.2 + (_setMember): Account for changes in the way that the callerpacks + arguments. + (_getMember): Same. + (_call): Same. + (_eval): Same. + * plugin/icedteanp/IcedTeaPluginRequestProcessor.h: Include Mozilla + specific headers only if xulrunner is < 1.9.2. Remove old ThreadData + struct and add new AyncCallThreadData struct that contains results and + arguments. + * plugin/icedteanp/IcedTeaPluginUtils.cc + (getSourceFromInstance): Provide null source location due to lack of a + secure way to get documentbase. + (printNPVariant): Account for change API in xulrunner 1.9.2. + (NPVariantToString): Same. + * plugin/icedteanp/IcedTeaPluginUtils.h: Include Mozilla specific headers + only if xulrunner is < 1.9.2. + * plugin/icedteanp/IcedTeaScriptablePluginObject.cc + (invoke): Pass exception over to JS engine. + (construct): Implement object construction. + * plugin/icedteanp/IcedTeaScriptablePluginObject.h: Include Mozilla + specific headers only if xulrunner is < 1.9.2. + * plugin/icedteanp/java/sun/applet/MethodOverloadResolver.java + (getMatchingConstructor): New method, returns a matching constructor based + on arguments. + (getMatchingConstructors): New helper method for getMatchingConstructor. + * plugin/icedteanp/java/sun/applet/PluginAppletSecurityContext.java + (handleMessage): Handle new type of call, "NewObjectWithConstructor". + (checkPermission): Disable checks for the time being, as NPRuntime does + not allow cross-site calling anyway. + * plugin/icedteanp/java/sun/applet/PluginAppletViewer.java + (setStatus): Remove newlines from status messages. + * plugin/icedteanp/sun/applet/PluginCookieInfoRequest.java + (parseReturn): Store cookie info as a string rather than a list of + HttpCookie objects. + (getObject): Return the new cookie string. + * plugin/icedteanp/sun/applet/PluginCookieManager.java: New file, extends + CookieManager as is set as the default cookie manager for the plugin. + * plugin/icedteanp/sun/applet/PluginCookieStore.java : Deleted. New design + uses a custom cookiemanager rather than just a custom store. + * plugin/icedteanp/sun/applet/PluginMain.java + (init): Wire in the new cookie manager. + +2009-08-26 Deepak Bhole + + * plugin/icedtea/sun/applet/PluginAppletViewer.java + (handleMessage): Fix logic bug introduced in previous commit. + +2009-08-25 Deepak Bhole + + * plugin/icedtea/sun/applet/PluginAppletViewer.java + (handleMessage): Wait until panel is set before pinging it for + life status. + (showStatus): Replace new lines with spaces, as the status is + on a single line anyway. + +2009-08-25 Deepak Bhole + + * plugin/icedtea/sun/applet/PluginCookieInfoRequest.java + (parseReturn): Store cookie info as a string rather than a list of + HttpCookie objects. + (getObject): Return the new cookie string. + * plugin/icedtea/sun/applet/PluginCookieManager.java: New file, extends + CookieManager as is set as the default cookie manager for the plugin. + * plugin/icedtea/sun/applet/PluginCookieStore.java : Deleted. New design + uses a custom cookiemanager rather than just a custom store. + * plugin/icedtea/sun/applet/PluginMain.java + (init): Wire in the new cookie manager. + +2009-08-25 Deepak Bhole + + * netx/net/sourceforge/jnlp/resources/Messages.properties: Add new + message key for CN name mismatches. + * netx/net/sourceforge/jnlp/security/HttpsCertVerifier.java + (HttpsCertVerifier): Accept new parameters that indicate certificate trust + status, CN mismatch status, and the hostname. + (getAlreadyTrustPublisher): Use provided isTrusted boolean to get around + checkServerTrusted() synchronization. + (getDetails): Include details about CN mismatch. + (getNamesForCert): New private method. Returns all acceptable names for + a given X509Certificate. + (R): Overloaded the method to return messages that have 2 variables. + * netx/net/sourceforge/jnlp/security/VariableX509TrustManager.java: Extend + X509ExtendedTrustManager rather than X509TrustManager. + (checkClientTrusted): Overloaded method with one that takes a hostname. + (checkServerTrusted): Same. The new overloaded method also checks for CN + mismatch if the certificate is not explicitly trusted. + (isExplicitlyTrusted): Returns if the given certificate chain is part of + the local user trusted DB. + (askUser): Change parameters to accept information about trust, host match + status, and hostname. + +2009-08-25 Deepak Bhole + + * netx/net/sourceforge/jnlp/JNLPFile.java: Add a new key variable that is + unique to each instance. + (JNLPFile): Existing constructor changed to generate a new key on call. + (JNLPFile): New constructor that takes a key. If called, sets the file's + key to it. + (getUniqueKey): Returns the unique key for the instance. + * netx/net/sourceforge/jnlp/PluginBridge.java: Generate new instance + specific unique key. + * netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java + (getInstance): Use unique instance keys to determine which classloader to + use, rather than using the URL. + (getInstance): Same. + (initializeExtensions): Provide unique key to getInstance. + +2009-08-14 Deepak Bhole + + * plugin/icedteanp/IcedTeaJavaRequestProcessor.cc + (newMessageOnBus): Handle additional request types. + (postAndWaitForResponse): Modify parameter type and reset the result + before proceeding. + (getToStringValue): Remove all heap allocations and allocate on stack. + (getString): Same. + (deleteReference): Same. + (addReference): Same. + (findClass): Same. + (getClassName): Same. + (getClassID): Same. + (getFieldID): Same. + (getStaticFieldID): Same. + (getField): Same. Also, send the source to Java side. + (getStaticField): Same. + (getMethodID): Remove all heap allocations and allocate on stack. + (getStaticMethodID): Same. + (callStaticMethod): Same. Also, send the source to Java side. + (callMethod): Same. + (call): Same. + (getObjectClass): Remove all heap allocations and allocate on stack. + (newObject): Same. Also, send the source to Java side. + (newString): Remove all heap allocations and allocate on stack. + (hasPackage): Same. + (hasMethod): Same. + (hasField): Same. + (isInstanceOf): New method. + (getAppletObjectInstance): Remove all heap allocations and allocate on + stack. + * plugin/icedteanp/IcedTeaJavaRequestProcessor.h: Bump timeout to 120 to + allow for slower connections. Other misc. changes related to the .cc file + changes. + * plugin/icedteanp/IcedTeaNPPlugin.cc: Moved GCJPluginData decleration to + the header file. Don't initialize message bus and request processors + statically. + (GCJ_New): Initialize the buses and processors. Store source url in plugin + data struct. + (GCJ_Destroy): Cleanup source url pointer. + * plugin/icedteanp/IcedTeaNPPlugin.h: Moved GCJPluginData struct + decleration to here. + * plugin/icedteanp/IcedTeaPluginRequestProcessor.cc + (getInstanceFromMemberPtr): Moved to plugin utils. + (storeInstanceID): Same. + (newMessageOnBus): Handle additional request types. + (dispatch): Remove unused method. + (sendWindow): Remove unnecessary heap allocations and use function stack + instead. + (eval): New function. Evaluates calls to JavaScript functions and returns + the result. Arrays are not yet handled. + (call): New function. Evaluates the given script and returns the result. + Arrays are not yet handled. + (sendString): Remove unnecessary heap allocations and use function stack + instead. + (setMember): Same. + (convertToNPVariant): New function. Narrows given java type to an + NPVariant as per type conversion specifications. + (sendMember): Remove unnecessary heap allocations and use function stack + instead. + (storeVariantInJava): New function. Given an NPVariant, does the + appropriate conversion and saves it on the Java side. Arrays are not yet + handled. + (_eval): New function. Evaluates the script via NPN_Evaluate. Meant to be + run in the main thread. + (_call): New function. Invokes the function via NPN_Invoke. Meant to be run + in the main thread. + * plugin/icedteanp/IcedTeaPluginRequestProcessor.h: Appropriate changes as + necessitated by the above changes in the .cc. + * plugin/icedteanp/IcedTeaPluginUtils.cc + (constructMessagePrefix): All versions of this functions changed to remove + heap allocation, and instead store result in a given pre-allocated parameter. + (getReference): Use an ever growing reference number, and cycle when + integer max approaches. + (releaseReference): Remove code so nothing is done for now. + (itoa): Store result in pre-allocated parameter, rather than on heap. + (getSourceFromInstance): Given an NPP instance, returns the assocated + source. + (storeInstanceID): Moved from IcedTeaPluginRequestProcessor. Associates an + NPObject with an instance. + (getInstanceFromMemberPtr): Moved from IcedTeaPluginRequestProcessor. + Given an NPObject, returns the associated instance. + (variantToClassName): Remove unused method. + * plugin/icedteanp/IcedTeaPluginUtils.h: Appropriate changes as necessitated + by the above changes in the .cc. + * plugin/icedteanp/IcedTeaRunnable.cc (IcedTeaRunnableMethod): Change + result parameter type to void* so that caller/callee can use variable + formats. + * plugin/icedteanp/IcedTeaRunnable.h: Appropriate changes as necessitated + by the above changes in the .cc. + * plugin/icedteanp/IcedTeaScriptablePluginObject.cc: Call storeInstanceID + and getInstanceFromMemberPtr from plugin utils. + (IcedTeaScriptableJavaObject::getProperty): Get the source url and send it to + Java side when making the request. + (IcedTeaScriptableJavaObject::invoke): Same. + * plugin/icedteanp/java/netscape/javascript/JSObject.java: Merge + constructor access control fixes from older plugin. + * plugin/icedteanp/java/sun/applet/GetMemberPluginCallRequest.java: Handle + void and null return types. + * plugin/icedteanp/java/sun/applet/MethodOverloadResolver.java: Add an + additional test case for Boolean. + (getPrimitive): Handle java.lang.Boolean (minor bug fix). + * plugin/icedteanp/java/sun/applet/PluginAppletSecurityContext.java: Use + URLs when comparing source locations for security verification, rather + than String which return false negatives. + * plugin/icedteanp/java/sun/applet/PluginAppletViewer.java + (handleMessage): Set status to ACTIVE only after initialization finishes. + (AppletEventListener::appletStateChanged): Same. + * plugin/icedteanp/java/sun/applet/PluginCookieInfoRequest.java + (parseReturn): Handle improper cookies from firefox. + +2009-08-06 Deepak Bhole + + * plugin/icedteanp/IcedTeaJavaRequestProcessor.cc: Handle error messages + from Java side. Add referencing/de-referencing support, and support for + fetching fields, invoking methods, and returning applet instances. + * plugin/icedteanp/IcedTeaJavaRequestProcessor.h: Decrease timeout to 20 + seconds. Declare new functions created in the associated .cc file. + * plugin/icedteanp/IcedTeaNPPlugin.cc: Add support for dynamic NPObject + creation per instance. Add a new global pthread_cond_t for message + availability. + * plugin/icedteanp/IcedTeaNPPlugin.h: Misc. changes related to the above + associated file. + * plugin/icedteanp/IcedTeaPluginRequestProcessor.cc: Use condition based + wait for message availability, rather than periodic poll. + * plugin/icedteanp/IcedTeaPluginRequestProcessor.h: Make + getInstanceFromMemberPtr and storeInstanceID global. + * plugin/icedteanp/IcedTeaPluginUtils.cc: Force use of file:// src until + security subsystem is implemented. + * plugin/icedteanp/IcedTeaScriptablePluginObject.cc: Created skeletons for + Java and JavaPackage NPObjects, and implemented hasProperty, hasMethod, + getProperty and getMethod. + * plugin/icedteanp/IcedTeaScriptablePluginObject.h: Appropriate header + changes associated with the above. + * plugin/icedteanp/java/sun/applet/MethodOverloadResolver.java: New file. + Uses a cost-based approach to resolve overloaded methods when JavaScript + calls Java methods with potentially ambiguous type arguments. + 2009-10-02 Andrew John Hughes * Makefile.am: @@ -13,7 +380,7 @@ 2009-10-02 Andrew John Hughes * Makefile.am: @@ -26,7 +393,7 @@ 2009-10-01 Andrew John Hughes Reorganise Makefile and rename some @@ -186,7 +553,7 @@ 2009-09-23 Jon VanAlten * Makefile.am: - Build PulseAudio class files into distinct subdirectory. + Build PulseAudio class files into distinct subdirectory. 2009-09-04 Andrew John Hughes @@ -288,12 +655,12 @@ 2009-08-06 Andrew John Hughes * Makefile.am (ICEDTEA_ENV, ICEDTEA_ENV_ECJ): Allow passing as environment. - + 2009-08-06 Matthias Klose * Makefile.am (ICEDTEA_PATCHES): Make $(DISTRIBUTION_PATCHES) the @@ -350,7 +717,7 @@ 2009-08-04 Andrew John Hughes * Makefile.am: @@ -428,7 +795,7 @@ 2009-08-04 Andrew John Hughes * patches/icedtea-webstart.patch: Make javax.jnlp package visible to @@ -458,10 +825,10 @@ 2009-07-29 Omair Majid diff -r 34fd2f476040 -r 5e20e6468dd1 netx/net/sourceforge/jnlp/JNLPFile.java --- a/netx/net/sourceforge/jnlp/JNLPFile.java Fri Oct 02 21:34:18 2009 +0100 +++ b/netx/net/sourceforge/jnlp/JNLPFile.java Tue Sep 15 12:47:59 2009 -0400 @@ -23,6 +23,7 @@ import java.net.URL; import java.net.URL; import java.util.ArrayList; import java.util.Arrays; +import java.util.Calendar; import java.util.LinkedList; import java.util.List; import java.util.Locale; @@ -66,6 +67,9 @@ public class JNLPFile { /** the network location of this JNLP file */ protected URL fileLocation; + + /** A key that uniquely identifies connected instances (main jnlp+ext) */ + protected String uniqueKey = null; /** the URL used to resolve relative URLs in the file */ protected URL codeBase; @@ -171,6 +175,33 @@ public class JNLPFile { parse(root, strict, location); this.fileLocation = location; + + this.uniqueKey = Calendar.getInstance().getTimeInMillis() + "-" + + Math.abs(((new java.util.Random()).nextInt())) + "-" + + location; + + if (JNLPRuntime.isDebug()) + System.err.println("UNIQUEKEY=" + this.uniqueKey); + } + + /** + * Create a JNLPFile from a URL, parent URLm a version and checking for + * updates using the specified policy. + * + * @param location the location of the JNLP file + * @param uniqueKey A string that uniquely identifies connected instances + * @param version the version of the JNLP file + * @param strict whether to enforce the spec when + * @param policy the update policy + * @throws IOException if an IO exception occurred + * @throws ParseException if the JNLP file was invalid + */ + public JNLPFile(URL location, String uniqueKey, Version version, boolean strict, UpdatePolicy policy) throws IOException, ParseException { + this(location, version, strict, policy); + this.uniqueKey = uniqueKey; + + if (JNLPRuntime.isDebug()) + System.err.println("UNIQUEKEY (override) =" + this.uniqueKey); } From gnu_andrew at member.fsf.org Tue Oct 6 10:47:22 2009 From: gnu_andrew at member.fsf.org (Andrew John Hughes) Date: Tue, 6 Oct 2009 18:47:22 +0100 Subject: b17 In-Reply-To: <4ACA6A26.4050003@sun.com> References: <17c6771e0909290504u46e7536cjc5b477cd693c2fce@mail.gmail.com> <4AC2CFDB.6030206@sun.com> <17c6771e0909300250m10cc023evae0de3471fdcf7df@mail.gmail.com> <4AC39331.3070806@sun.com> <4AC3FC44.7020400@sun.com> <17c6771e0910020506o6c8450b4m8160ac4a8c0cf807@mail.gmail.com> <17c6771e0910020610p14bb8ad0gb532205830108083@mail.gmail.com> <4AC63861.1090400@sun.com> <17c6771e0910021520t7af0582m10830585e1101669@mail.gmail.com> <4ACA6A26.4050003@sun.com> Message-ID: <17c6771e0910061047y46200811yb3b34f850e20bd70@mail.gmail.com> 2009/10/5 Joseph D. Darcy : > Andrew John Hughes wrote: >> >> 2009/10/2 Joseph D. Darcy : >> >>> >>> Andrew John Hughes wrote: >>> >>>> >>>> 2009/10/2 Andrew John Hughes : >>>> >>>> >>>>> >>>>> 2009/10/1 Joe Darcy : >>>>> >>>>> >>>>>> >>>>>> Joseph D. Darcy wrote: >>>>>> >>>>>> >>>>>>> >>>>>>> Andrew John Hughes wrote: >>>>>>> >>>>>>> >>>>>>>> >>>>>>>> 2009/9/30 Joe Darcy : >>>>>>>> >>>>>>>> >>>>>>>> >>>>>>>>> >>>>>>>>> Andrew John Hughes wrote: >>>>>>>>> >>>>>>>>> >>>>>>>>> >>>>>>>>>> >>>>>>>>>> Now that HotSpot 14 is merged, are we going to have a b17 release? >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> >>>>>>>>> >>>>>>>>> Real soon now :-) >>>>>>>>> >>>>>>>>> >>>>>>>>> >>>>>>>>> >>>>>>>>>> >>>>>>>>>> I thought this is what we were waiting on, but it seems more >>>>>>>>>> changesets are being added >>>>>>>>>> (http://hg.openjdk.java.net/jdk6/jdk6/langtools/rev/f754eab3d93a) >>>>>>>>>> without any public discussion on the mailing list. >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> >>>>>>>>> >>>>>>>>> There is another javac fix to go back in b17 and a recently added >>>>>>>>> test >>>>>>>>> needs >>>>>>>>> to be moved. >>>>>>>>> >>>>>>>>> >>>>>>>>> >>>>>>>>> >>>>>>>> >>>>>>>> Ok, are these backports from OpenJDK7? I haven't seen anything on >>>>>>>> the >>>>>>>> list other than the commits. >>>>>>>> >>>>>>>> >>>>>>>> >>>>>>>> >>>>>>>>> >>>>>>>>> I'd also like to see a port of your DeoptimizeALot fix since I >>>>>>>>> think >>>>>>>>> it >>>>>>>>> affects one of the tests currently in the OpenJDK 6 HotSpot repo. >>>>>>>>> >>>>>>>>> >>>>>>>>> >>>>>>>>> >>>>>>>> >>>>>>>> http://cr.openjdk.java.net/~andrew/6886353/webrev.01/ >>>>>>>> >>>>>>>> Same bug, same bug ID, different patch. ?The two tests affected in >>>>>>>> hs17 aren't present in hs14, but a test that's not in hs17 is. >>>>>>>> >>>>>>>> >>>>>>>> >>>>>>> >>>>>>> Please push this change. >>>>>>> >>>>>>> >>>>>>> >>>>>>>>> >>>>>>>>> The preliminary tests I've run on b17 look good. >>>>>>>>> >>>>>>>>> >>>>>>>>> >>>>>>>>> >>>>>>>> >>>>>>>> What tests? ?JTreg or something else? >>>>>>>> >>>>>>>> >>>>>>>> >>>>>>> >>>>>>> jtreg. >>>>>>> >>>>>>> >>>>>>> >>>>>>>> >>>>>>>> I think IcedTea6 has support for building against hg. ?We should do >>>>>>>> that before the release. >>>>>>>> >>>>>>>> >>>>>>>> >>>>>>> >>>>>>> Sounds prudent. >>>>>>> >>>>>>> >>>>>>> >>>>>> >>>>>> Hello. >>>>>> >>>>>> Other than Andrew's fix for the HotSpot test, all the planned fixes >>>>>> for >>>>>> b17 >>>>>> are back in the OpenJDK 6 repository now so it would be a good time to >>>>>> start >>>>>> building and testing IcedTea6 against the upstream repo. >>>>>> >>>>>> -Joe >>>>>> >>>>>> >>>>>> >>>>>> >>>>> >>>>> I committed this yesterday morning: >>>>> >>>>> http://hg.openjdk.java.net/jdk6/jdk6/hotspot/rev/012339cadcba >>>>> >>>>> I'm currently working on getting IcedTea6 building with my hg >>>>> checkout, and will push this to my personal branch: >>>>> http://icedtea.classpath.org/hg/people/andrew/icedtea6 >>>>> when I'm done. ?There are a lot of patches that are now redundant :) >>>>> >>>>> Are all the recent security patches in JDK6 hg? >>>>> >>>>> >>> >>> Yes, OpenJDK 6 is up to date on security fixes. >>> >>> >>>>> >>>>> Thanks, >>>>> -- >>>>> Andrew :-) >>>>> >>>>> Free Java Software Engineer >>>>> Red Hat, Inc. (http://www.redhat.com) >>>>> >>>>> Support Free Java! >>>>> Contribute to GNU Classpath and the OpenJDK >>>>> http://www.gnu.org/software/classpath >>>>> http://openjdk.java.net >>>>> >>>>> PGP Key: 94EFD9D8 (http://subkeys.pgp.net) >>>>> Fingerprint: F8EF F1EA 401E 2E60 15FA ?7927 142C 2591 94EF D9D8 >>>>> >>>>> >>>>> >>>> >>>> It seems hs14 doesn't have the IgnoreUnrecognizedVMOptions flag >>>> itself. ?This webrev: >>>> >>>> http://cr.openjdk.java.net/~andrew/6788376/ >>>> >>>> backported from OpenJDK7: >>>> http://hg.openjdk.java.net/jdk7/hotspot-rt/hotspot/rev/323728917cf4 >>>> adds it. ?It also includes the change to the test I added with the >>>> last changeset. >>>> >>>> It seems this was added to IcedTea6 but not backported to OpenJDK6. >>>> >>>> Ok to push? >>>> >>>> >>> >>> Yes, approved to push. >>> >>> Thanks, >>> >>> -Joe >>> >>> >>> >> >> Thanks, pushed: >> http://hg.openjdk.java.net/jdk6/jdk6/hotspot/rev/f6c52a081457 >> >> A version of IcedTea6 which builds against current hg (which will >> become b17) is now available in >> http://icedtea.classpath.org/people/andrew/icedtea6 >> >> The langtools JTreg tests all pass, as do the HotSpot tests in OpenJDK6. >> >> There is a testcase related to >> http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6707044 which was >> never added upstream when the bug was fixed, and which seems to have >> been disabled in IcedTea when we switched to hs14. ?Re-enabling it >> shows that this fails with b17. >> >> ----------messages:(3/133)---------- >> command: main ?-XbatchLuceneCrash >> reason: User specified action: run main/othervm -Xbatch LuceneCrash >> elapsed time (seconds): 0.203 >> ----------System.out:(18/635)---------- >> # >> # A fatal error has been detected by the Java Runtime Environment: >> # >> # ?SIGSEGV (0xb) at pc=0x00002ba66acd4b50, pid=23877, tid=47996055058704 >> # >> # JRE version: 6.0-b16 >> # Java VM: OpenJDK 64-Bit Server VM (14.0-b16 mixed mode linux-amd64 ) >> # Distribution: Custom build (Fri Oct ?2 21:43:43 BST 2009) >> # Problematic frame: >> # V ?[libjvm.so+0x58fb50] >> >> It claims to produce a log under JTwork/scratch but I don't see one. >> >> I haven't run the whole JDK test suite. ?I may leave it running overnight. >> > > Hello. > > Any results for the jdk/test regression tests? > > -Joe > JDK: Test results: passed: 3,269; failed: 168; error: 3 The failed seems high, the number of errors matches our usual JTreg runs. I'll have to take a closer look but I don't usually do runs on this box. What were your own results like for OpenJDK6 b17? -- Andrew :-) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint: F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From Joe.Darcy at Sun.COM Tue Oct 6 17:21:50 2009 From: Joe.Darcy at Sun.COM (Joe Darcy) Date: Tue, 06 Oct 2009 17:21:50 -0700 Subject: b17 In-Reply-To: <17c6771e0910061047y46200811yb3b34f850e20bd70@mail.gmail.com> References: <17c6771e0909290504u46e7536cjc5b477cd693c2fce@mail.gmail.com> <4AC2CFDB.6030206@sun.com> <17c6771e0909300250m10cc023evae0de3471fdcf7df@mail.gmail.com> <4AC39331.3070806@sun.com> <4AC3FC44.7020400@sun.com> <17c6771e0910020506o6c8450b4m8160ac4a8c0cf807@mail.gmail.com> <17c6771e0910020610p14bb8ad0gb532205830108083@mail.gmail.com> <4AC63861.1090400@sun.com> <17c6771e0910021520t7af0582m10830585e1101669@mail.gmail.com> <4ACA6A26.4050003@sun.com> <17c6771e0910061047y46200811yb3b34f850e20bd70@mail.gmail.com> Message-ID: <4ACBDF1E.8060402@sun.com> Andrew John Hughes wrote: > 2009/10/5 Joseph D. Darcy : > >> [big snip] >> Hello. >> >> Any results for the jdk/test regression tests? >> >> -Joe >> >> > > > JDK: Test results: passed: 3,269; failed: 168; error: 3 > > The failed seems high, the number of errors matches our usual JTreg > runs. I'll have to take a closer look but I don't usually do runs on > this box. What were your own results like for OpenJDK6 b17? > My results for building OpenJDK 6 on Ubuntu 9.04 x64 and running tests there are: hotspot/test: Test results: passed: 24 langtools/test: Test results: passed: 1354 jdk/test: Test results: passed: 3,100; failed: 43; error: 1 All test suites were run with "-a -ignore:quiet"; in addition, langtools was run with "-s". I've uploaded my summary.txt files to: http://cr.openjdk.java.net/~darcy/OpenJDK6-jtreg-pre-b17/ (The jdk tests were run a bit differently than my usual test setup where I point the graphical tests into a virtual framefer. In this case, I just ran the tests without redirecting the graphics.) I haven't looked at the IcedTea patch set recently; if the Gervill sound tests are still being duplicated, I think the IcedTea copies can be removed at this point since Karl is keeping the OpenJDK 6 copy of the code and tests up-to-date. -Joe From gnu_andrew at member.fsf.org Wed Oct 7 02:20:16 2009 From: gnu_andrew at member.fsf.org (Andrew John Hughes) Date: Wed, 7 Oct 2009 10:20:16 +0100 Subject: b17 In-Reply-To: <4ACBDF1E.8060402@sun.com> References: <17c6771e0909290504u46e7536cjc5b477cd693c2fce@mail.gmail.com> <4AC39331.3070806@sun.com> <4AC3FC44.7020400@sun.com> <17c6771e0910020506o6c8450b4m8160ac4a8c0cf807@mail.gmail.com> <17c6771e0910020610p14bb8ad0gb532205830108083@mail.gmail.com> <4AC63861.1090400@sun.com> <17c6771e0910021520t7af0582m10830585e1101669@mail.gmail.com> <4ACA6A26.4050003@sun.com> <17c6771e0910061047y46200811yb3b34f850e20bd70@mail.gmail.com> <4ACBDF1E.8060402@sun.com> Message-ID: <17c6771e0910070220u5e8f45d9jec9bf7ab8434be48@mail.gmail.com> 2009/10/7 Joe Darcy : > Andrew John Hughes wrote: >> >> 2009/10/5 Joseph D. Darcy : >> >>> > > [big snip] >>> >>> Hello. >>> >>> Any results for the jdk/test regression tests? >>> >>> -Joe >>> >>> >> >> >> JDK: Test results: passed: 3,269; failed: 168; error: 3 >> >> The failed seems high, the number of errors matches our usual JTreg >> runs. ?I'll have to take a closer look but I don't usually do runs on >> this box. ?What were your own results like for OpenJDK6 b17? >> > > My results for building OpenJDK 6 on Ubuntu 9.04 x64 and running tests there > are: > > hotspot/test: > Test results: passed: 24 > > langtools/test: > Test results: passed: 1354 > > jdk/test: > Test results: passed: 3,100; failed: 43; error: 1 > > All test suites were run with "-a -ignore:quiet"; in addition, langtools was > run with "-s". > > I've uploaded my summary.txt files to: > http://cr.openjdk.java.net/~darcy/OpenJDK6-jtreg-pre-b17/ > > (The jdk tests were run a bit differently than my usual test setup where I > point the graphical tests into a virtual framefer. ?In this case, I just ran > the tests without redirecting the graphics.) > > I haven't looked at the IcedTea patch set recently; if the Gervill sound > tests are still being duplicated, I think the IcedTea copies can be removed > at this point since Karl is keeping the OpenJDK 6 copy of the code and tests > up-to-date. > > -Joe > Ok, the majority of JDK failures I'm seeing are not an issue; they are either compile failures from the optional NIO2 backport in IcedTea6 or headless exceptions for the AWT/Swing stuff. The former are known to fail, as I just haven't had time to backport the tests. This isn't a major issue as most IcedTea6 builds don't enable the backport anyway. The headless exceptions are also expected given the tests were run in screen without any virtual framebuffer. Perhaps we should have the check-jdk target use Xvfb by default? Two Gervill tests fail: javax/sound/midi/Gervill/SoftReceiver/GetMidiDevice.java (compile failure) javax/sound/midi/Gervill/SoftChannel/NoteOverFlowTest2.java : IndexOutOfBounds The rest seem to be related to java.beans (can't find java.awt.Color -- possibly a headless issue again) or crypto (having ECC enabled seems to cause additional failures). I don't think there's anything that's a stopper for b17, especially as your results seem pretty good (and the failures seem the same as we've seen). We just need to make some decisions on how to resolve the differences between the IcedTea6 and plain OpenJDK6 builds. What do you think? -- Andrew :-) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint: F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From gnu_andrew at member.fsf.org Wed Oct 7 02:24:34 2009 From: gnu_andrew at member.fsf.org (Andrew John Hughes) Date: Wed, 7 Oct 2009 10:24:34 +0100 Subject: b17 In-Reply-To: <17c6771e0910070220u5e8f45d9jec9bf7ab8434be48@mail.gmail.com> References: <17c6771e0909290504u46e7536cjc5b477cd693c2fce@mail.gmail.com> <4AC3FC44.7020400@sun.com> <17c6771e0910020506o6c8450b4m8160ac4a8c0cf807@mail.gmail.com> <17c6771e0910020610p14bb8ad0gb532205830108083@mail.gmail.com> <4AC63861.1090400@sun.com> <17c6771e0910021520t7af0582m10830585e1101669@mail.gmail.com> <4ACA6A26.4050003@sun.com> <17c6771e0910061047y46200811yb3b34f850e20bd70@mail.gmail.com> <4ACBDF1E.8060402@sun.com> <17c6771e0910070220u5e8f45d9jec9bf7ab8434be48@mail.gmail.com> Message-ID: <17c6771e0910070224l7d7eb2daifdb7f9b0669068ad@mail.gmail.com> 2009/10/7 Andrew John Hughes : > 2009/10/7 Joe Darcy : >> Andrew John Hughes wrote: >>> >>> 2009/10/5 Joseph D. Darcy : >>> >>>> >> >> [big snip] >>>> >>>> Hello. >>>> >>>> Any results for the jdk/test regression tests? >>>> >>>> -Joe >>>> >>>> >>> >>> >>> JDK: Test results: passed: 3,269; failed: 168; error: 3 >>> >>> The failed seems high, the number of errors matches our usual JTreg >>> runs. ?I'll have to take a closer look but I don't usually do runs on >>> this box. ?What were your own results like for OpenJDK6 b17? >>> >> >> My results for building OpenJDK 6 on Ubuntu 9.04 x64 and running tests there >> are: >> >> hotspot/test: >> Test results: passed: 24 >> >> langtools/test: >> Test results: passed: 1354 >> >> jdk/test: >> Test results: passed: 3,100; failed: 43; error: 1 >> >> All test suites were run with "-a -ignore:quiet"; in addition, langtools was >> run with "-s". >> >> I've uploaded my summary.txt files to: >> http://cr.openjdk.java.net/~darcy/OpenJDK6-jtreg-pre-b17/ >> >> (The jdk tests were run a bit differently than my usual test setup where I >> point the graphical tests into a virtual framefer. ?In this case, I just ran >> the tests without redirecting the graphics.) >> >> I haven't looked at the IcedTea patch set recently; if the Gervill sound >> tests are still being duplicated, I think the IcedTea copies can be removed >> at this point since Karl is keeping the OpenJDK 6 copy of the code and tests >> up-to-date. >> >> -Joe >> > > Ok, the majority of JDK failures I'm seeing are not an issue; they are > either compile failures from the optional NIO2 backport in IcedTea6 or > headless exceptions for the AWT/Swing stuff. ?The former are known to > fail, as I just haven't had time to backport the tests. ?This isn't a > major issue as most IcedTea6 builds don't enable the backport anyway. > The headless exceptions are also expected given the tests were run in > screen without any virtual framebuffer. ?Perhaps we should have the > check-jdk target use Xvfb by default? > > Two Gervill tests fail: > > javax/sound/midi/Gervill/SoftReceiver/GetMidiDevice.java (compile failure) > javax/sound/midi/Gervill/SoftChannel/NoteOverFlowTest2.java : IndexOutOfBounds > > The rest seem to be related to java.beans (can't find java.awt.Color > -- possibly a headless issue again) or crypto (having ECC enabled > seems to cause additional failures). > > I don't think there's anything that's a stopper for b17, especially as > your results seem pretty good (and the failures seem the same as we've > seen). ?We just need to make some decisions on how to resolve the > differences between the IcedTea6 and plain OpenJDK6 builds. > > What do you think? > -- > Andrew :-) > > Free Java Software Engineer > Red Hat, Inc. (http://www.redhat.com) > > Support Free Java! > Contribute to GNU Classpath and the OpenJDK > http://www.gnu.org/software/classpath > http://openjdk.java.net > > PGP Key: 94EFD9D8 (http://subkeys.pgp.net) > Fingerprint: F8EF F1EA 401E 2E60 15FA ?7927 142C 2591 94EF D9D8 > My results are being pushed to http://cr.openjdk.java.net/~andrew/jdk/ now. Should be there shortly. -- Andrew :-) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint: F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From andrew at icedtea.classpath.org Wed Oct 7 04:14:05 2009 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Wed, 07 Oct 2009 11:14:05 +0000 Subject: /hg/icedtea: Synchronise netx sources with IcedTea6 copy. Message-ID: changeset 175529fae103 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=175529fae103 author: Andrew John Hughes date: Wed Oct 07 09:48:00 2009 +0100 Synchronise netx sources with IcedTea6 copy. 2009-10-08 Andrew John Hughes * netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java: Synchronise whitespace with IcedTea6 copy. * netx/net/sourceforge/jnlp/security/HttpsCertVerifier.java: Fix find/replace error with cert being changed to cenetx. diffstat: 3 files changed, 195 insertions(+), 186 deletions(-) ChangeLog | 7 netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java | 372 ++++++------- netx/net/sourceforge/jnlp/security/HttpsCertVerifier.java | 2 diffs (truncated from 627 to 500 lines): diff -r 5e20e6468dd1 -r 175529fae103 ChangeLog --- a/ChangeLog Tue Sep 15 12:47:59 2009 -0400 +++ b/ChangeLog Wed Oct 07 09:48:00 2009 +0100 @@ -1,3 +1,10 @@ 2009-09-15 Deepak Bhole + + * netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java: + Synchronise whitespace with IcedTea6 copy. + * netx/net/sourceforge/jnlp/security/HttpsCertVerifier.java: + Fix find/replace error with cert being changed to cenetx. + 2009-09-15 Deepak Bhole * plugin/icedteanp/IcedTeaJavaRequestProcessor.cc diff -r 5e20e6468dd1 -r 175529fae103 netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java --- a/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java Tue Sep 15 12:47:59 2009 -0400 +++ b/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java Wed Oct 07 09:48:00 2009 +0100 @@ -1,15 +1,15 @@ -// +// // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public // License as published by the Free Software Foundation; either // version 2.1 of the License, or (at your option) any later version. -// +// // This library is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU // Lesser General Public License for more details. -// +// // You should have received a copy of the GNU Lesser General Public // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -66,7 +66,7 @@ import sun.misc.JarIndex; * security context when the classloader was created. * * @author Jon A. Maxwell (JAM) - initial author - * @version $Revision: 1.20 $ + * @version $Revision: 1.20 $ */ public class JNLPClassLoader extends URLClassLoader { @@ -115,29 +115,29 @@ public class JNLPClassLoader extends URL /** the security section */ private SecurityDesc security; - + /** Permissions granted by the user during runtime. */ private ArrayList runtimePermissions = new ArrayList(); /** all jars not yet part of classloader or active */ private List available = new ArrayList(); - /** all of the jar files that were verified */ - private ArrayList verifiedJars = null; - - /** all of the jar files that were not verified */ - private ArrayList unverifiedJars = null; - - /** the jarsigner tool to verify our jars */ - private JarSigner js = null; - - private boolean signing = false; - - /** ArrayList containing jar indexes for various jars available to this classloader */ - private ArrayList jarIndexes = new ArrayList(); - - /** File entries in the jar files available to this classloader */ - private TreeSet jarEntries = new TreeSet(); + /** all of the jar files that were verified */ + private ArrayList verifiedJars = null; + + /** all of the jar files that were not verified */ + private ArrayList unverifiedJars = null; + + /** the jarsigner tool to verify our jars */ + private JarSigner js = null; + + private boolean signing = false; + + /** ArrayList containing jar indexes for various jars available to this classloader */ + private ArrayList jarIndexes = new ArrayList(); + + /** File entries in the jar files available to this classloader */ + private TreeSet jarEntries = new TreeSet(); /** * Create a new JNLPClassLoader from the specified file. @@ -167,41 +167,41 @@ public class JNLPClassLoader extends URL } private void setSecurity() { - /** - * When we're trying to load an applet, file.getSecurity() will return - * null since there is no jnlp file to specify permissions. We - * determine security settings here, after trying to verify jars. - */ - if (file instanceof PluginBridge) { - if (signing == true) { - this.security = new SecurityDesc(file, - SecurityDesc.ALL_PERMISSIONS, - file.getCodeBase().getHost()); - } else { - this.security = new SecurityDesc(file, - SecurityDesc.SANDBOX_PERMISSIONS, - file.getCodeBase().getHost()); - } - } else { //regular jnlp file - - /** - * If the application is signed, then we set the SecurityDesc to the - * tag in the jnlp file. Note that if an application is - * signed, but there is no tag in the jnlp file, the - * application will get sandbox permissions. - * If the application is unsigned, we ignore the tag and - * use a sandbox instead. - */ - if (signing == true) { - this.security = file.getSecurity(); - } else { - this.security = new SecurityDesc(file, - SecurityDesc.SANDBOX_PERMISSIONS, - file.getCodeBase().getHost()); - } - } - } - + /** + * When we're trying to load an applet, file.getSecurity() will return + * null since there is no jnlp file to specify permissions. We + * determine security settings here, after trying to verify jars. + */ + if (file instanceof PluginBridge) { + if (signing == true) { + this.security = new SecurityDesc(file, + SecurityDesc.ALL_PERMISSIONS, + file.getCodeBase().getHost()); + } else { + this.security = new SecurityDesc(file, + SecurityDesc.SANDBOX_PERMISSIONS, + file.getCodeBase().getHost()); + } + } else { //regular jnlp file + + /** + * If the application is signed, then we set the SecurityDesc to the + * tag in the jnlp file. Note that if an application is + * signed, but there is no tag in the jnlp file, the + * application will get sandbox permissions. + * If the application is unsigned, we ignore the tag and + * use a sandbox instead. + */ + if (signing == true) { + this.security = file.getSecurity(); + } else { + this.security = new SecurityDesc(file, + SecurityDesc.SANDBOX_PERMISSIONS, + file.getCodeBase().getHost()); + } + } + } + /** * Returns a JNLP classloader for the specified JNLP file. * @@ -213,18 +213,20 @@ public class JNLPClassLoader extends URL JNLPClassLoader loader = null; String uniqueKey = file.getUniqueKey(); - if (uniqueKey != null) - baseLoader = (JNLPClassLoader) urlToLoader.get(uniqueKey); - - try { - - // If base loader is null, or the baseloader's file and this - // file is different, initialize a new loader - if (baseLoader == null || - !baseLoader.getJNLPFile().getFileLocation().equals(file.getFileLocation())) { + if (uniqueKey != null) + baseLoader = (JNLPClassLoader) urlToLoader.get(uniqueKey); + + try { + + // If base loader is null, or the baseloader's file and this + // file is different, initialize a new loader + if (baseLoader == null || + !baseLoader.getJNLPFile().getFileLocation().equals(file.getFileLocation())) { + loader = new JNLPClassLoader(file, policy); + // New loader init may have caused extentions to create a - // loader for this unique key. Check. + // loader for this unique key. Check. JNLPClassLoader extLoader = (JNLPClassLoader) urlToLoader.get(uniqueKey); if (extLoader != null) { @@ -248,19 +250,20 @@ public class JNLPClassLoader extends URL loader = baseLoader; } - } catch (LaunchException e) { - throw e; - } - - if (file.getInformation().isSharingAllowed()) - urlToLoader.put(location, loader); + } catch (LaunchException e) { + throw e; + } + + // loaders are mapped to a unique key. Only extensions and parent + // share a key, so it is safe to always share based on it + urlToLoader.put(uniqueKey, loader); return loader; } /** * Returns a JNLP classloader for the JNLP file at the specified - * location. + * location. * * @param location the file's location * @param version the file's version @@ -286,17 +289,18 @@ public class JNLPClassLoader extends URL loaderList.add(this); - //if (ext != null) { - for (int i=0; i < ext.length; i++) { - try { - JNLPClassLoader loader = getInstance(ext[i].getLocation(), ext[i].getVersion(), updatePolicy); - loaderList.add(loader); - } - catch (Exception ex) { - ex.printStackTrace(); - } - } - //} + //if (ext != null) { + for (int i=0; i < ext.length; i++) { + try { + String uniqueKey = this.getJNLPFile().getUniqueKey(); + JNLPClassLoader loader = getInstance(ext[i].getLocation(), uniqueKey, ext[i].getVersion(), updatePolicy); + loaderList.add(loader); + } + catch (Exception ex) { + ex.printStackTrace(); + } + } + //} loaders = (JNLPClassLoader[]) loaderList.toArray(new JNLPClassLoader[ loaderList.size()]); } @@ -313,10 +317,10 @@ public class JNLPClassLoader extends URL jars[i].getVersion()); if (JNLPRuntime.isDebug()) { - if (p == null) - System.out.println("Unable to add permission for " + jars[i].getLocation()); - else - System.out.println("Permission added: " + p.toString()); + if (p == null) + System.out.println("Unable to add permission for " + jars[i].getLocation()); + else + System.out.println("Permission added: " + p.toString()); } if (p != null) resourcePermissions.add(p); @@ -329,14 +333,14 @@ public class JNLPClassLoader extends URL */ void initializeResources() throws LaunchException { JARDesc jars[] = resources.getJARs(); - if (jars == null || jars.length == 0) - return; - /* - if (jars == null || jars.length == 0) { - throw new LaunchException(null, null, R("LSFatal"), - R("LCInit"), R("LFatalVerification"), "No jars!"); - } - */ + if (jars == null || jars.length == 0) + return; + /* + if (jars == null || jars.length == 0) { + throw new LaunchException(null, null, R("LSFatal"), + R("LCInit"), R("LFatalVerification"), "No jars!"); + } + */ List initialJars = new ArrayList(); for (int i=0; i < jars.length; i++) { @@ -347,7 +351,7 @@ public class JNLPClassLoader extends URL initialJars.add(jars[i]); // regardless of part tracker.addResource(jars[i].getLocation(), - jars[i].getVersion(), + jars[i].getVersion(), jars[i].isCacheable() ? JNLPRuntime.getDefaultUpdatePolicy() : UpdatePolicy.FORCE ); } @@ -355,42 +359,42 @@ public class JNLPClassLoader extends URL if (strict) fillInPartJars(initialJars); // add in each initial part's lazy jars - if (JNLPRuntime.isVerifying()) { - - JarSigner js; - waitForJars(initialJars); //download the jars first. - - try { - js = verifyJars(initialJars); - } catch (Exception e) { - //we caught an Exception from the JarSigner class. - //Note: one of these exceptions could be from not being able - //to read the cacerts or trusted.certs files. - e.printStackTrace(); - throw new LaunchException(null, null, R("LSFatal"), - R("LCInit"), R("LFatalVerification"), R("LFatalVerificationInfo")); - } - - //Case when at least one jar has some signing - if (js.anyJarsSigned()){ - signing = true; - - //user does not trust this publisher - if (!js.getAlreadyTrustPublisher()) { - checkTrustWithUser(js); - } else { - /** - * If the user trusts this publisher (i.e. the publisher's certificate - * is in the user's trusted.certs file), we do not show any dialogs. - */ - } - } else { - - signing = false; - //otherwise this jar is simply unsigned -- make sure to ask - //for permission on certain actions - } - } + if (JNLPRuntime.isVerifying()) { + + JarSigner js; + waitForJars(initialJars); //download the jars first. + + try { + js = verifyJars(initialJars); + } catch (Exception e) { + //we caught an Exception from the JarSigner class. + //Note: one of these exceptions could be from not being able + //to read the cacerts or trusted.certs files. + e.printStackTrace(); + throw new LaunchException(null, null, R("LSFatal"), + R("LCInit"), R("LFatalVerification"), R("LFatalVerificationInfo")); + } + + //Case when at least one jar has some signing + if (js.anyJarsSigned()){ + signing = true; + + //user does not trust this publisher + if (!js.getAlreadyTrustPublisher()) { + checkTrustWithUser(js); + } else { + /** + * If the user trusts this publisher (i.e. the publisher's certificate + * is in the user's trusted.certs file), we do not show any dialogs. + */ + } + } else { + + signing = false; + //otherwise this jar is simply unsigned -- make sure to ask + //for permission on certain actions + } + } activateJars(initialJars); } @@ -400,7 +404,7 @@ public class JNLPClassLoader extends URL boolean b = SecurityWarningDialog.showCertWarningDialog( SecurityWarningDialog.AccessType.UNVERIFIED, file, js); if (!b) - throw new LaunchException(null, null, R("LSFatal"), + throw new LaunchException(null, null, R("LSFatal"), R("LCLaunching"), R("LNotVerified"), ""); } else if (js.getRootInCacerts()) { //root cert is in cacerts boolean b = false; @@ -465,19 +469,19 @@ public class JNLPClassLoader extends URL // access w/o security dialog once we actually check certificates. // copy security permissions from SecurityDesc element - if (security != null) { + if (security != null) { // Security desc. is used only to track security settings for the // application. However, an application may comprise of multiple // jars, and as such, security must be evaluated on a per jar basis. - + // set default perms PermissionCollection permissions = security.getSandBoxPermissions(); - + // If more than default is needed, evaluate based on codesource if (security.getSecurityType().equals(SecurityDesc.ALL_PERMISSIONS) || security.getSecurityType().equals(SecurityDesc.J2EE_PERMISSIONS)) { - if (cs.getCodeSigners() != null) { + if (cs.getCodeSigners() != null) { permissions = security.getPermissions(); } } @@ -487,23 +491,21 @@ public class JNLPClassLoader extends URL result.add(e.nextElement()); } - - // add in permission to read the cached JAR files for (int i=0; i < resourcePermissions.size(); i++) result.add((Permission) resourcePermissions.get(i)); // add in the permissions that the user granted. for (int i=0; i < runtimePermissions.size(); i++) - result.add(runtimePermissions.get(i)); + result.add(runtimePermissions.get(i)); return result; } protected void addPermission(Permission p) { - runtimePermissions.add(p); - } - + runtimePermissions.add(p); + } + /** * Adds to the specified list of JARS any other JARs that need * to be loaded at the same time as the JARs specified (ie, are @@ -549,25 +551,25 @@ public class JNLPClassLoader extends URL URL location = jar.getLocation(); // non-cacheable, use source location if (localFile != null) { location = localFile.toURL(); // cached file - - // This is really not the best way.. but we need some way for - // PluginAppletViewer::getCachedImageRef() to check if the image - // is available locally, and it cannot use getResources() because - // that prefetches the resource, which confuses MediaTracker.waitForAll() - // which does a wait(), waiting for notification (presumably + + // This is really not the best way.. but we need some way for + // PluginAppletViewer::getCachedImageRef() to check if the image + // is available locally, and it cannot use getResources() because + // that prefetches the resource, which confuses MediaTracker.waitForAll() + // which does a wait(), waiting for notification (presumably // thrown after a resource is fetched). This bug manifests itself // particularly when using The FileManager applet from Webmin. - + JarFile jarFile = new JarFile(localFile); Enumeration e = jarFile.entries(); while (e.hasMoreElements()) { - + JarEntry je = (JarEntry) e.nextElement(); - - // another jar in my jar? it is more likely than you think + + // another jar in my jar? it is more likely than you think if (je.getName().endsWith(".jar")) { - // We need to extract that jar so that it can be loaded - // (inline loading with "jar:..!/..." path will not work + // We need to extract that jar so that it can be loaded + // (inline loading with "jar:..!/..." path will not work // with standard classloader methods) String extractedJarLocation = localFile.getParent() + "/" + je.getName(); @@ -612,7 +614,7 @@ public class JNLPClassLoader extends URL addURL(location); - // there is currently no mechanism to cache files per + // there is currently no mechanism to cache files per // instance.. so only index cached files if (localFile != null) { JarIndex index = JarIndex.getJarIndex(new JarFile(localFile.getAbsolutePath()), null); @@ -684,11 +686,11 @@ public class JNLPClassLoader extends URL * calls. */ protected File getNativeDir() { - nativeDir = new File(System.getProperty("java.io.tmpdir") - + File.separator + "netx-native-" + nativeDir = new File(System.getProperty("java.io.tmpdir") + + File.separator + "netx-native-" From Joe.Darcy at Sun.COM Wed Oct 7 15:46:24 2009 From: Joe.Darcy at Sun.COM (Joe Darcy) Date: Wed, 07 Oct 2009 15:46:24 -0700 Subject: b17 In-Reply-To: <17c6771e0910070224l7d7eb2daifdb7f9b0669068ad@mail.gmail.com> References: <17c6771e0909290504u46e7536cjc5b477cd693c2fce@mail.gmail.com> <4AC3FC44.7020400@sun.com> <17c6771e0910020506o6c8450b4m8160ac4a8c0cf807@mail.gmail.com> <17c6771e0910020610p14bb8ad0gb532205830108083@mail.gmail.com> <4AC63861.1090400@sun.com> <17c6771e0910021520t7af0582m10830585e1101669@mail.gmail.com> <4ACA6A26.4050003@sun.com> <17c6771e0910061047y46200811yb3b34f850e20bd70@mail.gmail.com> <4ACBDF1E.8060402@sun.com> <17c6771e0910070220u5e8f45d9jec9bf7ab8434be48@mail.gmail.com> <17c6771e0910070224l7d7eb2daifdb7f9b0669068ad@mail.gmail.com> Message-ID: <4ACD1A40.8070605@sun.com> Andrew John Hughes wrote: > 2009/10/7 Andrew John Hughes : > >> 2009/10/7 Joe Darcy : >> >>> Andrew John Hughes wrote: >>> >>>> 2009/10/5 Joseph D. Darcy : >>>> >>>> >>> [big snip] >>> >>>>> Hello. >>>>> >>>>> Any results for the jdk/test regression tests? >>>>> >>>>> -Joe >>>>> >>>>> >>>>> >>>> JDK: Test results: passed: 3,269; failed: 168; error: 3 >>>> >>>> The failed seems high, the number of errors matches our usual JTreg >>>> runs. I'll have to take a closer look but I don't usually do runs on >>>> this box. What were your own results like for OpenJDK6 b17? >>>> >>>> >>> My results for building OpenJDK 6 on Ubuntu 9.04 x64 and running tests there >>> are: >>> >>> hotspot/test: >>> Test results: passed: 24 >>> >>> langtools/test: >>> Test results: passed: 1354 >>> >>> jdk/test: >>> Test results: passed: 3,100; failed: 43; error: 1 >>> >>> All test suites were run with "-a -ignore:quiet"; in addition, langtools was >>> run with "-s". >>> >>> I've uploaded my summary.txt files to: >>> http://cr.openjdk.java.net/~darcy/OpenJDK6-jtreg-pre-b17/ >>> >>> (The jdk tests were run a bit differently than my usual test setup where I >>> point the graphical tests into a virtual framefer. In this case, I just ran >>> the tests without redirecting the graphics.) >>> >>> I haven't looked at the IcedTea patch set recently; if the Gervill sound >>> tests are still being duplicated, I think the IcedTea copies can be removed >>> at this point since Karl is keeping the OpenJDK 6 copy of the code and tests >>> up-to-date. >>> >>> -Joe >>> >>> >> Ok, the majority of JDK failures I'm seeing are not an issue; they are >> either compile failures from the optional NIO2 backport in IcedTea6 or >> headless exceptions for the AWT/Swing stuff. The former are known to >> fail, as I just haven't had time to backport the tests. This isn't a >> major issue as most IcedTea6 builds don't enable the backport anyway. >> The headless exceptions are also expected given the tests were run in >> screen without any virtual framebuffer. Perhaps we should have the >> check-jdk target use Xvfb by default? >> >> Two Gervill tests fail: >> >> javax/sound/midi/Gervill/SoftReceiver/GetMidiDevice.java (compile failure) >> javax/sound/midi/Gervill/SoftChannel/NoteOverFlowTest2.java : IndexOutOfBounds >> >> The rest seem to be related to java.beans (can't find java.awt.Color >> -- possibly a headless issue again) or crypto (having ECC enabled >> seems to cause additional failures). >> >> I don't think there's anything that's a stopper for b17, especially as >> your results seem pretty good (and the failures seem the same as we've >> seen). We just need to make some decisions on how to resolve the >> differences between the IcedTea6 and plain OpenJDK6 builds. >> >> What do you think? >> -- >> Andrew :-) >> >> Free Java Software Engineer >> Red Hat, Inc. (http://www.redhat.com) >> >> Support Free Java! >> Contribute to GNU Classpath and the OpenJDK >> http://www.gnu.org/software/classpath >> http://openjdk.java.net >> >> PGP Key: 94EFD9D8 (http://subkeys.pgp.net) >> Fingerprint: F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 >> >> > > My results are being pushed to http://cr.openjdk.java.net/~andrew/jdk/ > now. Should be there shortly. > Hello. Below is the jtdiff between my OpenJDK 6 test/jdk regression tests and your IcedTea test/jdk tests. Most of the additional passes are the duplicated Gervill tests and most of the failures differences are from the awt configuration issue (and the nio2 backport). So I think this looks pretty good. -Joe 0: 6-open/summary.txt pass: 3,100; fail: 43; error: 1 1: IcedTea/summary.txt pass: 3,269; fail: 168; error: 3 0 1 Test --- pass closed/tools/pack200/MemoryAllocatorTest.java fail pass com/sun/jdi/BadHandshakeTest.java pass fail com/sun/jdi/OptionTest.java pass --- com/sun/jmx/snmp/SnmpOidHashCode.java pass --- com/sun/jmx/snmp/TimeTicksWrapping.java --- pass com/sun/media/sound/AudioFloatConverter/GetFormat.java --- pass com/sun/media/sound/AudioFloatConverter/ToFloatArray.java --- pass com/sun/media/sound/AudioFloatInputStream/Available.java --- pass com/sun/media/sound/AudioFloatInputStream/Close.java --- pass com/sun/media/sound/AudioFloatInputStream/GetFormat.java --- pass com/sun/media/sound/AudioFloatInputStream/GetFrameLength.java --- pass com/sun/media/sound/AudioFloatInputStream/MarkSupported.java --- pass com/sun/media/sound/AudioFloatInputStream/Read.java --- pass com/sun/media/sound/AudioFloatInputStream/ReadFloatArray.java --- pass com/sun/media/sound/AudioFloatInputStream/ReadFloatArrayIntInt.java --- pass com/sun/media/sound/AudioFloatInputStream/Reset.java --- pass com/sun/media/sound/AudioFloatInputStream/Skip.java --- pass com/sun/media/sound/DLSSoundbankReader/TestGetSoundbankFile.java --- pass com/sun/media/sound/DLSSoundbankReader/TestGetSoundbankInputStream.java --- pass com/sun/media/sound/DLSSoundbankReader/TestGetSoundbankInputStream2.java --- pass com/sun/media/sound/DLSSoundbankReader/TestGetSoundbankUrl.java --- pass com/sun/media/sound/EmergencySoundbank/TestCreateSoundbank.java --- pass com/sun/media/sound/ModelByteBuffer/GetInputStream.java --- pass com/sun/media/sound/ModelByteBuffer/GetRoot.java --- pass com/sun/media/sound/ModelByteBuffer/Load.java --- pass com/sun/media/sound/ModelByteBuffer/LoadAll.java --- pass com/sun/media/sound/ModelByteBuffer/NewModelByteBufferByteArray.java --- pass com/sun/media/sound/ModelByteBuffer/NewModelByteBufferByteArrayIntInt.java --- pass com/sun/media/sound/ModelByteBuffer/NewModelByteBufferFile.java --- pass com/sun/media/sound/ModelByteBuffer/NewModelByteBufferFileLongLong.java --- pass com/sun/media/sound/ModelByteBuffer/RandomFileInputStream/Available.java --- pass com/sun/media/sound/ModelByteBuffer/RandomFileInputStream/Close.java --- pass com/sun/media/sound/ModelByteBuffer/RandomFileInputStream/MarkReset.java --- pass com/sun/media/sound/ModelByteBuffer/RandomFileInputStream/MarkSupported.java --- pass com/sun/media/sound/ModelByteBuffer/RandomFileInputStream/Read.java --- pass com/sun/media/sound/ModelByteBuffer/RandomFileInputStream/ReadByte.java --- pass com/sun/media/sound/ModelByteBuffer/RandomFileInputStream/ReadByteIntInt.java --- pass com/sun/media/sound/ModelByteBuffer/RandomFileInputStream/Skip.java --- pass com/sun/media/sound/ModelByteBuffer/SubbufferLong.java --- pass com/sun/media/sound/ModelByteBuffer/SubbufferLongLong.java --- pass com/sun/media/sound/ModelByteBuffer/SubbufferLongLongBoolean.java --- pass com/sun/media/sound/ModelByteBuffer/Unload.java --- pass com/sun/media/sound/ModelByteBuffer/WriteTo.java --- pass com/sun/media/sound/ModelByteBufferWavetable/GetAttenuation.java --- pass com/sun/media/sound/ModelByteBufferWavetable/GetChannels.java --- pass com/sun/media/sound/ModelByteBufferWavetable/GetLoopLength.java --- pass com/sun/media/sound/ModelByteBufferWavetable/GetLoopStart.java --- pass com/sun/media/sound/ModelByteBufferWavetable/GetPitchCorrection.java --- pass com/sun/media/sound/ModelByteBufferWavetable/NewModelByteBufferWavetableModelByteBuffer.java --- pass com/sun/media/sound/ModelByteBufferWavetable/NewModelByteBufferWavetableModelByteBufferAudioFormat.java --- pass com/sun/media/sound/ModelByteBufferWavetable/NewModelByteBufferWavetableModelByteBufferAudioFormatFloat.java --- pass com/sun/media/sound/ModelByteBufferWavetable/NewModelByteBufferWavetableModelByteBufferFloat.java --- pass com/sun/media/sound/ModelByteBufferWavetable/Open.java --- pass com/sun/media/sound/ModelByteBufferWavetable/Set8BitExtensionBuffer.java --- pass com/sun/media/sound/ModelByteBufferWavetable/SetLoopType.java --- pass com/sun/media/sound/ModelDestination/NewModelDestination.java --- pass com/sun/media/sound/ModelDestination/NewModelDestinationModelIdentifier.java --- pass com/sun/media/sound/ModelDestination/SetIdentifier.java --- pass com/sun/media/sound/ModelDestination/SetTransform.java --- pass com/sun/media/sound/ModelIdentifier/EqualsObject.java --- pass com/sun/media/sound/ModelIdentifier/NewModelIdentifierString.java --- pass com/sun/media/sound/ModelIdentifier/NewModelIdentifierStringInt.java --- pass com/sun/media/sound/ModelIdentifier/NewModelIdentifierStringString.java --- pass com/sun/media/sound/ModelIdentifier/NewModelIdentifierStringStringInt.java --- pass com/sun/media/sound/ModelIdentifier/SetInstance.java --- pass com/sun/media/sound/ModelIdentifier/SetObject.java --- pass com/sun/media/sound/ModelIdentifier/SetVariable.java --- pass com/sun/media/sound/ModelPerformer/GetOscillators.java --- pass com/sun/media/sound/ModelPerformer/SetConnectionBlocks.java --- pass com/sun/media/sound/ModelPerformer/SetDefaultConnectionsEnabled.java --- pass com/sun/media/sound/ModelPerformer/SetExclusiveClass.java --- pass com/sun/media/sound/ModelPerformer/SetKeyFrom.java --- pass com/sun/media/sound/ModelPerformer/SetKeyTo.java --- pass com/sun/media/sound/ModelPerformer/SetName.java --- pass com/sun/media/sound/ModelPerformer/SetSelfNonExclusive.java --- pass com/sun/media/sound/ModelPerformer/SetVelFrom.java --- pass com/sun/media/sound/ModelPerformer/SetVelTo.java --- pass com/sun/media/sound/ModelSource/NewModelSource.java --- pass com/sun/media/sound/ModelSource/NewModelSourceModelIdentifier.java --- pass com/sun/media/sound/ModelSource/NewModelSourceModelIdentifierBoolean.java --- pass com/sun/media/sound/ModelSource/NewModelSourceModelIdentifierBooleanBoolean.java --- pass com/sun/media/sound/ModelSource/NewModelSourceModelIdentifierBooleanBooleanInt.java --- pass com/sun/media/sound/ModelSource/NewModelSourceModelIdentifierModelTransform.java --- pass com/sun/media/sound/ModelSource/SetIdentifier.java --- pass com/sun/media/sound/ModelSource/SetTransform.java --- pass com/sun/media/sound/ModelStandardTransform/NewModelStandardTransform.java --- pass com/sun/media/sound/ModelStandardTransform/NewModelStandardTransformBoolean.java --- pass com/sun/media/sound/ModelStandardTransform/NewModelStandardTransformBooleanBoolean.java --- pass com/sun/media/sound/ModelStandardTransform/NewModelStandardTransformBooleanBooleanInt.java --- pass com/sun/media/sound/ModelStandardTransform/SetDirection.java --- pass com/sun/media/sound/ModelStandardTransform/SetPolarity.java --- pass com/sun/media/sound/ModelStandardTransform/SetTransform.java --- pass com/sun/media/sound/ModelStandardTransform/TransformAbsolute.java --- pass com/sun/media/sound/ModelStandardTransform/TransformConcave.java --- pass com/sun/media/sound/ModelStandardTransform/TransformConvex.java --- pass com/sun/media/sound/ModelStandardTransform/TransformLinear.java --- pass com/sun/media/sound/ModelStandardTransform/TransformSwitch.java --- pass com/sun/media/sound/RiffReaderWriter/Available.java --- pass com/sun/media/sound/RiffReaderWriter/Close.java --- pass com/sun/media/sound/RiffReaderWriter/GetFilePointer.java --- pass com/sun/media/sound/RiffReaderWriter/GetSize.java --- pass com/sun/media/sound/RiffReaderWriter/HasNextChunk.java --- pass com/sun/media/sound/RiffReaderWriter/Read.java --- pass com/sun/media/sound/RiffReaderWriter/ReadByte.java --- pass com/sun/media/sound/RiffReaderWriter/ReadByteArrayIntInt.java --- pass com/sun/media/sound/RiffReaderWriter/ReadInt.java --- pass com/sun/media/sound/RiffReaderWriter/ReadLong.java --- pass com/sun/media/sound/RiffReaderWriter/ReadShort.java --- pass com/sun/media/sound/RiffReaderWriter/ReadString.java --- pass com/sun/media/sound/RiffReaderWriter/ReadUnsignedByte.java --- pass com/sun/media/sound/RiffReaderWriter/ReadUnsignedInt.java --- pass com/sun/media/sound/RiffReaderWriter/ReadUnsignedShort.java --- pass com/sun/media/sound/RiffReaderWriter/Skip.java --- pass com/sun/media/sound/RiffReaderWriter/WriteOutputStream.java --- pass com/sun/media/sound/SF2SoundbankReader/TestGetSoundbankFile.java --- pass com/sun/media/sound/SF2SoundbankReader/TestGetSoundbankInputStream.java --- pass com/sun/media/sound/SF2SoundbankReader/TestGetSoundbankInputStream2.java --- pass com/sun/media/sound/SF2SoundbankReader/TestGetSoundbankUrl.java --- pass com/sun/media/sound/SimpleInstrument/AddModelInstrument.java --- pass com/sun/media/sound/SimpleInstrument/AddModelInstrumentIntInt.java --- pass com/sun/media/sound/SimpleInstrument/AddModelInstrumentIntIntIntInt.java --- pass com/sun/media/sound/SimpleInstrument/AddModelInstrumentIntIntIntIntInt.java --- pass com/sun/media/sound/SimpleInstrument/AddModelPerformer.java --- pass com/sun/media/sound/SimpleInstrument/AddModelPerformerArray.java --- pass com/sun/media/sound/SimpleInstrument/AddModelPerformerArrayIntInt.java --- pass com/sun/media/sound/SimpleInstrument/AddModelPerformerArrayIntIntIntInt.java --- pass com/sun/media/sound/SimpleInstrument/AddModelPerformerArrayIntIntIntIntInt.java --- pass com/sun/media/sound/SimpleInstrument/AddModelPerformerIntInt.java --- pass com/sun/media/sound/SimpleInstrument/AddModelPerformerIntIntIntInt.java --- pass com/sun/media/sound/SimpleInstrument/AddModelPerformerIntIntIntIntInt.java --- pass com/sun/media/sound/SimpleInstrument/Clear.java --- pass com/sun/media/sound/SimpleInstrument/SetName.java --- pass com/sun/media/sound/SimpleInstrument/SetPatch.java --- pass com/sun/media/sound/SimpleSoundbank/AddInstrument.java --- pass com/sun/media/sound/SimpleSoundbank/AddResource.java --- pass com/sun/media/sound/SimpleSoundbank/GetInstrument.java --- pass com/sun/media/sound/SimpleSoundbank/RemoveInstrument.java --- pass com/sun/media/sound/SimpleSoundbank/SetDescription.java --- pass com/sun/media/sound/SimpleSoundbank/SetName.java --- pass com/sun/media/sound/SimpleSoundbank/SetVendor.java --- pass com/sun/media/sound/SimpleSoundbank/SetVersion.java --- pass com/sun/media/sound/SoftAudioBuffer/Array.java --- pass com/sun/media/sound/SoftAudioBuffer/Clear.java --- pass com/sun/media/sound/SoftAudioBuffer/Get.java --- pass com/sun/media/sound/SoftAudioBuffer/NewSoftAudioBuffer.java --- pass com/sun/media/sound/SoftAudioSynthesizer/GetFormat.java --- pass com/sun/media/sound/SoftAudioSynthesizer/GetPropertyInfo.java --- pass com/sun/media/sound/SoftAudioSynthesizer/Open.java --- pass com/sun/media/sound/SoftAudioSynthesizer/OpenStream.java --- pass com/sun/media/sound/SoftChannel/AllNotesOff.java --- pass com/sun/media/sound/SoftChannel/AllSoundOff.java --- pass com/sun/media/sound/SoftChannel/ChannelPressure.java --- pass com/sun/media/sound/SoftChannel/Controller.java --- pass com/sun/media/sound/SoftChannel/LocalControl.java --- pass com/sun/media/sound/SoftChannel/Mono.java --- pass com/sun/media/sound/SoftChannel/Mute.java --- pass com/sun/media/sound/SoftChannel/NoteOff.java --- pass com/sun/media/sound/SoftChannel/NoteOff2.java --- pass com/sun/media/sound/SoftChannel/NoteOn.java --- pass com/sun/media/sound/SoftChannel/Omni.java --- pass com/sun/media/sound/SoftChannel/PitchBend.java --- pass com/sun/media/sound/SoftChannel/PolyPressure.java --- pass com/sun/media/sound/SoftChannel/ProgramChange.java --- pass com/sun/media/sound/SoftChannel/ResetAllControllers.java --- pass com/sun/media/sound/SoftChannel/Solo.java --- pass com/sun/media/sound/SoftCubicResampler/Interpolate.java --- pass com/sun/media/sound/SoftFilter/TestProcessAudio.java --- pass com/sun/media/sound/SoftLanczosResampler/Interpolate.java --- pass com/sun/media/sound/SoftLimiter/ProcessAudio_replace_mix.java --- pass com/sun/media/sound/SoftLimiter/ProcessAudio_replace_mix_mono.java --- pass com/sun/media/sound/SoftLimiter/ProcessAudio_replace_mix_mono_overdrive.java --- pass com/sun/media/sound/SoftLimiter/ProcessAudio_replace_mix_overdrive.java --- pass com/sun/media/sound/SoftLimiter/ProcessAudio_replace_normal.java --- pass com/sun/media/sound/SoftLimiter/ProcessAudio_replace_normal_mono.java --- pass com/sun/media/sound/SoftLimiter/ProcessAudio_replace_overdrive.java --- pass com/sun/media/sound/SoftLimiter/ProcessAudio_replace_overdrive_mono.java --- pass com/sun/media/sound/SoftLinearResampler/Interpolate.java --- pass com/sun/media/sound/SoftLinearResampler2/Interpolate.java --- pass com/sun/media/sound/SoftLowFrequencyOscillator/TestProcessControlLogic.java --- pass com/sun/media/sound/SoftPointResampler/Interpolate.java --- pass com/sun/media/sound/SoftProvider/GetDevice.java --- pass com/sun/media/sound/SoftReceiver/Close.java --- pass com/sun/media/sound/SoftReceiver/Send_ActiveSense.java --- pass com/sun/media/sound/SoftReceiver/Send_AllNotesOff.java --- pass com/sun/media/sound/SoftReceiver/Send_AllSoundOff.java --- pass com/sun/media/sound/SoftReceiver/Send_ChannelPressure.java --- pass com/sun/media/sound/SoftReceiver/Send_Controller.java --- pass com/sun/media/sound/SoftReceiver/Send_Mono.java --- pass com/sun/media/sound/SoftReceiver/Send_NoteOff.java --- pass com/sun/media/sound/SoftReceiver/Send_NoteOn.java --- pass com/sun/media/sound/SoftReceiver/Send_NoteOn_AllChannels.java --- pass com/sun/media/sound/SoftReceiver/Send_NoteOn_Delayed.java --- pass com/sun/media/sound/SoftReceiver/Send_NoteOn_Multiple.java --- pass com/sun/media/sound/SoftReceiver/Send_Omni.java --- pass com/sun/media/sound/SoftReceiver/Send_PitchBend.java --- pass com/sun/media/sound/SoftReceiver/Send_PolyPressure.java --- pass com/sun/media/sound/SoftReceiver/Send_ProgramChange.java --- pass com/sun/media/sound/SoftReceiver/Send_ResetAllControllers.java --- pass com/sun/media/sound/SoftSincResampler/Interpolate.java --- pass com/sun/media/sound/SoftSynthesizer/Close.java --- pass com/sun/media/sound/SoftSynthesizer/GetAvailableInstruments.java --- pass com/sun/media/sound/SoftSynthesizer/GetChannels.java --- pass com/sun/media/sound/SoftSynthesizer/GetDefaultSoundbank.java --- pass com/sun/media/sound/SoftSynthesizer/GetDeviceInfo.java --- pass com/sun/media/sound/SoftSynthesizer/GetLatency.java --- pass com/sun/media/sound/SoftSynthesizer/GetLoadedInstruments.java --- pass com/sun/media/sound/SoftSynthesizer/GetMaxPolyphony.java --- pass com/sun/media/sound/SoftSynthesizer/GetMaxReceivers.java --- pass com/sun/media/sound/SoftSynthesizer/GetMaxTransmitters.java --- pass com/sun/media/sound/SoftSynthesizer/GetMicrosecondPosition.java --- pass com/sun/media/sound/SoftSynthesizer/GetReceiver.java --- pass com/sun/media/sound/SoftSynthesizer/GetReceiver2.java --- pass com/sun/media/sound/SoftSynthesizer/GetReceivers.java --- pass com/sun/media/sound/SoftSynthesizer/GetTransmitter.java --- pass com/sun/media/sound/SoftSynthesizer/GetTransmitters.java --- pass com/sun/media/sound/SoftSynthesizer/GetVoiceStatus.java --- pass com/sun/media/sound/SoftSynthesizer/ImplicitOpenClose.java --- pass com/sun/media/sound/SoftSynthesizer/IsOpen.java --- pass com/sun/media/sound/SoftSynthesizer/IsSoundbankSupported.java --- pass com/sun/media/sound/SoftSynthesizer/LoadAllInstruments.java --- pass com/sun/media/sound/SoftSynthesizer/LoadInstrument.java --- pass com/sun/media/sound/SoftSynthesizer/LoadInstruments.java --- pass com/sun/media/sound/SoftSynthesizer/Open.java --- pass com/sun/media/sound/SoftSynthesizer/OpenStream.java --- pass com/sun/media/sound/SoftSynthesizer/RemapInstrument.java --- pass com/sun/media/sound/SoftSynthesizer/TestRender1.java --- pass com/sun/media/sound/SoftSynthesizer/UnloadAllInstruments.java --- pass com/sun/media/sound/SoftSynthesizer/UnloadInstrument.java --- pass com/sun/media/sound/SoftSynthesizer/UnloadInstruments.java --- pass com/sun/media/sound/SoftTuning/GetName.java --- pass com/sun/media/sound/SoftTuning/GetTuning.java --- pass com/sun/media/sound/SoftTuning/GetTuningInt.java --- pass com/sun/media/sound/SoftTuning/Load1.java --- pass com/sun/media/sound/SoftTuning/Load2.java --- pass com/sun/media/sound/SoftTuning/Load4.java --- pass com/sun/media/sound/SoftTuning/Load5.java --- pass com/sun/media/sound/SoftTuning/Load6.java --- pass com/sun/media/sound/SoftTuning/Load7.java --- pass com/sun/media/sound/SoftTuning/Load8.java --- pass com/sun/media/sound/SoftTuning/Load9.java --- pass com/sun/media/sound/SoftTuning/NewSoftTuning.java --- pass com/sun/media/sound/SoftTuning/NewSoftTuningByteArray.java --- pass com/sun/media/sound/SoftTuning/NewSoftTuningPatch.java --- pass com/sun/media/sound/SoftTuning/NewSoftTuningPatchByteArray.java pass error com/sun/net/httpserver/Test12.java fail pass com/sun/net/httpserver/bugs/B6361557.java --- pass com/sun/org/apache/xml/internal/serializer/XMLStackOverflowBug.java fail pass com/sun/org/apache/xml/internal/ws/server/Test.java pass fail demo/jvmti/mtrace/TraceJFrame.java --- fail demo/nio/ZipFileSystem/sanity.sh pass fail java/awt/Choice/ChoiceKeyEventReaction/ChoiceKeyEventReaction.html pass fail java/awt/Choice/UnfocusableToplevel/UnfocusableToplevel.java pass fail java/awt/Component/F10TopToplevel/F10TopToplevel.html pass fail java/awt/Dialog/DialogOverflowSizeTest/DialogSizeOverflowTest.java pass fail java/awt/Dialog/NonResizableDialogSysMenuResize/NonResizableDialogSysMenuResize.java pass fail java/awt/FileDialog/FilenameFilterTest/FilenameFilterTest.html pass fail java/awt/Focus/DeiconifiedFrameLoosesFocus/DeiconifiedFrameLoosesFocus.html pass fail java/awt/Focus/FocusEmbeddedFrameTest/FocusEmbeddedFrameTest.java pass fail java/awt/Focus/FrameMinimizeTest/FrameMinimizeTest.java pass fail java/awt/Focus/InputVerifierTest3/InputVerifierTest3.java pass fail java/awt/Focus/ModalBlockedStealsFocusTest/ModalBlockedStealsFocusTest.html pass fail java/awt/Focus/RequestFocusAndHideTest/RequestFocusAndHideTest.java pass fail java/awt/Focus/RequestOnCompWithNullParent/RequestOnCompWithNullParent1.java pass fail java/awt/Focus/RestoreFocusOnDisabledComponentTest/RestoreFocusOnDisabledComponentTest.java pass fail java/awt/Focus/WindowInitialFocusTest/WindowInitialFocusTest.html pass fail java/awt/FontClass/CreateFont/BigFont.java pass fail java/awt/Frame/DynamicLayout/DynamicLayout.java --- fail java/awt/Frame/FrameSize/TestFrameSize.java pass fail java/awt/Frame/LayoutOnMaximizeTest/LayoutOnMaximizeTest.java pass fail java/awt/Frame/MaximizedToIconified/MaximizedToIconified.java pass fail java/awt/Frame/ShownOffScreenOnWin98/ShownOffScreenOnWin98Test.java pass fail java/awt/Frame/UnfocusableMaximizedFrameResizablity/UnfocusableMaximizedFrameResizablity.java pass fail java/awt/GridLayout/LayoutExtraGaps/LayoutExtraGaps.java pass fail java/awt/Insets/CombinedTestApp1.java pass fail java/awt/KeyboardFocusmanager/TypeAhead/ButtonActionKeyTest/ButtonActionKeyTest.html pass fail java/awt/KeyboardFocusmanager/TypeAhead/MenuItemActivatedTest/MenuItemActivatedTest.html pass fail java/awt/List/ActionAfterRemove/ActionAfterRemove.java pass fail java/awt/List/SingleModeDeselect/SingleModeDeselect.java pass fail java/awt/Mixing/setComponentZOrder.java pass fail java/awt/Modal/LWModalTest/LWModalTest.java pass fail java/awt/Modal/NpeOnClose/NpeOnCloseTest.java pass fail java/awt/Modal/SupportedTest/SupportedTest.java pass fail java/awt/Mouse/TitleBarDoubleClick/TitleBarDoubleClick.html pass fail java/awt/Multiscreen/UpdateGCTest/UpdateGCTest.java pass fail java/awt/Multiscreen/WPanelPeerPerf/WPanelPeerPerf.java pass fail java/awt/Multiscreen/WindowGCChangeTest/WindowGCChangeTest.html pass fail java/awt/PrintJob/MultipleEnd/MultipleEnd.java pass fail java/awt/PrintJob/PrintArcTest/PrintArcTest.java pass fail java/awt/PrintJob/QuoteAndBackslashTest/QuoteAndBackslashTest.java pass fail java/awt/PrintJob/RoundedRectTest/RoundedRectTest.java pass fail java/awt/Toolkit/AutoShutdown/ShowExitTest/ShowExitTest.sh pass fail java/awt/Toolkit/RealSync/RealSyncOnEDT.java pass fail java/awt/Toolkit/ScreenInsetsTest/ScreenInsetsTest.java pass fail java/awt/TrayIcon/ProtectedModeCrashTest/ProtectedModeCrashTest.java pass fail java/awt/Window/AlwaysOnTop/AlwaysOnTopEvenOfWindow.java pass fail java/awt/Window/PropertyChangeListenerLockSerialization/PropertyChangeListenerLockSerialization.java pass fail java/awt/event/KeyEvent/KeyTyped/CtrlASCII.html pass fail java/awt/event/MouseEvent/EventTimeInFuture/EventTimeInFuture.java pass fail java/awt/event/MouseEvent/FrameMouseEventAbsoluteCoordsTest/FrameMouseEventAbsoluteCoordsTest.html pass fail java/awt/event/MouseEvent/MenuDragMouseEventAbsoluteCoordsTest/MenuDragMouseEventAbsoluteCoordsTest.html pass fail java/awt/event/MouseEvent/MouseWheelEventAbsoluteCoordsTest/MouseWheelEventAbsoluteCoordsTest.html pass fail java/beans/PropertyEditor/TestColorClass.java pass fail java/beans/PropertyEditor/TestColorClassJava.java pass fail java/beans/PropertyEditor/TestColorClassNull.java pass fail java/beans/PropertyEditor/TestColorClassValue.java pass fail java/beans/PropertyEditor/TestFontClass.java pass fail java/beans/PropertyEditor/TestFontClassJava.java pass fail java/beans/PropertyEditor/TestFontClassNull.java pass fail java/beans/PropertyEditor/TestFontClassValue.java pass fail java/beans/XMLEncoder/java_awt_ScrollPane.java pass fail java/io/File/isDirectory/Applet.java pass fail java/io/Serializable/resolveClass/deserializeButton/run.sh --- pass java/lang/annotation/AnnotationTypeMismatchException/FoundType.java --- pass java/lang/annotation/Missing/MissingTest.java --- pass java/lang/annotation/RecursiveAnnotation.java --- pass java/lang/annotation/UnitTest.java --- pass java/lang/annotation/loaderLeak/Main.java --- pass java/lang/annotation/package-info.java pass fail java/net/Socket/TrafficClass.java fail pass java/net/ipv6tests/TcpTest.java pass --- java/nio/channels/DatagramChannel/AdaptDatagramSocket.java pass error java/nio/channels/Selector/Connect.java pass fail java/nio/channels/Selector/OpRead.java pass fail java/nio/channels/SocketChannel/AdaptSocket.java pass fail java/security/KeyPairGenerator/Failover.java --- pass java/text/Bidi/BidiBug.java --- pass java/text/Bidi/BidiEmbeddingTest.java --- pass java/text/Bidi/BidiSurrogateTest.java pass fail java/util/ResourceBundle/RestrictedBundleTest.java --- pass java/util/TimeZone/TimeZoneDatePermissionCheck.sh fail --- javax/print/attribute/PSCopiesFlavorTest.java pass fail javax/sound/midi/Gervill/SoftChannel/NoteOverFlowTest2.java pass fail javax/sound/midi/Gervill/SoftReceiver/GetMidiDevice.java pass fail javax/sound/midi/Gervill/SoftSynthesizer/TestPreciseTimestampRendering.java pass fail javax/swing/JTextArea/Test6593649.java --- fail org/classpath/icedtea/java/io/Inputs/Basic.java --- fail org/classpath/icedtea/java/nio/channels/AsynchronousChannelGroup/Basic.java --- fail org/classpath/icedtea/java/nio/channels/AsynchronousChannelGroup/GroupOfOne.java --- fail org/classpath/icedtea/java/nio/channels/AsynchronousChannelGroup/Identity.java --- fail org/classpath/icedtea/java/nio/channels/AsynchronousChannelGroup/Restart.java --- fail org/classpath/icedtea/java/nio/channels/AsynchronousChannelGroup/Unbounded.java --- pass org/classpath/icedtea/java/nio/channels/AsynchronousChannelGroup/run_any_task.sh --- fail org/classpath/icedtea/java/nio/channels/AsynchronousDatagramChannel/Basic.java --- fail org/classpath/icedtea/java/nio/channels/AsynchronousFileChannel/Basic.java --- fail org/classpath/icedtea/java/nio/channels/AsynchronousFileChannel/CustomThreadPool.java --- fail org/classpath/icedtea/java/nio/channels/AsynchronousFileChannel/Lock.java --- fail org/classpath/icedtea/java/nio/channels/AsynchronousServerSocketChannel/Basic.java --- fail org/classpath/icedtea/java/nio/channels/AsynchronousServerSocketChannel/WithSecurityManager.java --- fail org/classpath/icedtea/java/nio/channels/AsynchronousSocketChannel/Basic.java --- fail org/classpath/icedtea/java/nio/channels/AsynchronousSocketChannel/Leaky.java --- fail org/classpath/icedtea/java/nio/channels/Channels/Basic2.java --- fail org/classpath/icedtea/java/nio/channels/spi/AsynchronousChannelProvider/custom_provider.sh --- fail org/classpath/icedtea/java/nio/file/DirectoryStream/Basic.java --- fail org/classpath/icedtea/java/nio/file/DirectoryStream/Filters.java --- fail org/classpath/icedtea/java/nio/file/DirectoryStream/SecureDS.java --- fail org/classpath/icedtea/java/nio/file/FileStore/Basic.java --- fail org/classpath/icedtea/java/nio/file/FileSystem/Basic.java --- fail org/classpath/icedtea/java/nio/file/Files/ForceLoad.java --- fail org/classpath/icedtea/java/nio/file/Files/Misc.java --- fail org/classpath/icedtea/java/nio/file/Files/content_type.sh --- fail org/classpath/icedtea/java/nio/file/Files/walk_file_tree.sh --- fail org/classpath/icedtea/java/nio/file/Path/CopyAndMove.java --- fail org/classpath/icedtea/java/nio/file/Path/InterruptCopy.java --- fail org/classpath/icedtea/java/nio/file/Path/Links.java --- fail org/classpath/icedtea/java/nio/file/Path/Misc.java --- fail org/classpath/icedtea/java/nio/file/Path/PathOps.java --- fail org/classpath/icedtea/java/nio/file/Path/SBC.java --- fail org/classpath/icedtea/java/nio/file/Path/UriImportExport.java --- fail org/classpath/icedtea/java/nio/file/Path/delete_on_close.sh --- fail org/classpath/icedtea/java/nio/file/Path/temporary_files.sh --- fail org/classpath/icedtea/java/nio/file/PathMatcher/Basic.java --- fail org/classpath/icedtea/java/nio/file/WatchService/Basic.java --- fail org/classpath/icedtea/java/nio/file/WatchService/FileTreeModifier.java --- fail org/classpath/icedtea/java/nio/file/WatchService/WithSecurityManager.java --- fail org/classpath/icedtea/java/nio/file/attribute/AclFileAttributeView/Basic.java --- fail org/classpath/icedtea/java/nio/file/attribute/Attributes/Basic.java --- fail org/classpath/icedtea/java/nio/file/attribute/BasicFileAttributeView/Basic.java --- fail org/classpath/icedtea/java/nio/file/attribute/DosFileAttributeView/Basic.java --- fail org/classpath/icedtea/java/nio/file/attribute/FileStoreAttributeView/Basic.java --- fail org/classpath/icedtea/java/nio/file/attribute/NamedAttributeView/Basic.java --- fail org/classpath/icedtea/java/nio/file/attribute/PosixFileAttributeView/Basic.java --- fail org/classpath/icedtea/java/nio/file/spi/SetDefaultProvider.java error fail sun/java2d/OpenGL/GradientPaints.java pass error sun/java2d/cmm/ColorConvertOp/ConstructorsNullTest/ConstructorsNullTest.html pass --- sun/net/idn/TestStringPrep.java --- pass sun/pisces/MiterInternalCloseJointTest.java --- pass sun/pisces/MiterInternalJointTest.java fail pass sun/rmi/transport/proxy/EagerHttpFallback.java pass fail sun/security/pkcs11/ec/ReadCertificates.java pass fail sun/security/pkcs11/ec/ReadPKCS12.java pass fail sun/security/pkcs11/ec/TestCurves.java pass fail sun/security/pkcs11/ec/TestECDH.java pass fail sun/security/pkcs11/ec/TestECDSA.java pass fail sun/security/pkcs11/ec/TestECGenSpec.java pass fail sun/security/pkcs11/ec/TestKeyFactory.java pass fail sun/security/pkcs11/sslecc/ClientJSSEServerJSSE.java pass fail sun/security/pkcs11/tls/TestPRF.java pass fail sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/TestAllSuites.java pass fail sun/security/ssl/sanity/ciphersuites/CheckCipherSuites.java pass fail sun/security/ssl/sanity/interop/ClientJSSEServerJSSE.java fail pass sun/tools/jhat/HatHeapDump1Test.java --- pass sun/tools/jrunscript/Testjrunscript.java pass --- sun/tools/jrunscript/jrunscriptTest.sh fail pass sun/tools/native2ascii/NativeErrors.java pass --- tools/pack200/MemoryAllocatorTest.java 405 differences From doko at ubuntu.com Wed Oct 7 15:44:50 2009 From: doko at ubuntu.com (Matthias Klose) Date: Thu, 08 Oct 2009 00:44:50 +0200 Subject: [patch] build shark as an additional vm, if the default vm is zero Message-ID: <4ACD19E2.70509@ubuntu.com> this allows you to configure with --additional-vms=shark, when the default vm is zero. it's useful if you build packages with shark support which shouldn't mess around with you default configuration. You can start with -Xint, but I didn't see anything how to make this the default, and for now I'd like to give developers the chance to test with shark without interfering with the default vm. Matthias -------------- next part -------------- A non-text attachment was scrubbed... Name: addshark.diff Type: text/x-diff Size: 3041 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20091008/e770d651/attachment.bin From doko at icedtea.classpath.org Thu Oct 8 04:05:47 2009 From: doko at icedtea.classpath.org (doko at icedtea.classpath.org) Date: Thu, 08 Oct 2009 11:05:47 +0000 Subject: /hg/icedtea6: Allow shark builds as additional vm when zero is t... Message-ID: changeset 70ec5cda5f7c in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=70ec5cda5f7c author: doko at ubuntu.com date: Thu Oct 08 13:08:52 2009 +0200 Allow shark builds as additional vm when zero is the default vm 2009-10-08 Matthias Klose * Makefile.am (stamps/icedtea.stamp, stamps/icedtea- debug.stamp): Add shark aliases to jvm.cfg. (stamps /add-zero.stamp): Install as shark if default vm is zero. * configure.ac: Allow shark as additional vm when default vm is zero. * INSTALL, README: Document new build options. diffstat: 5 files changed, 48 insertions(+), 9 deletions(-) ChangeLog | 8 ++++++++ INSTALL | 7 +++++-- Makefile.am | 22 ++++++++++++++++++++++ README | 15 +++++++++------ configure.ac | 5 ++++- diffs (140 lines): diff -r f61b94ebf46a -r 70ec5cda5f7c ChangeLog --- a/ChangeLog Tue Oct 06 13:42:46 2009 +0100 +++ b/ChangeLog Thu Oct 08 13:08:52 2009 +0200 @@ -1,3 +1,11 @@ 2009-10-06 Gary Benson + + * Makefile.am (stamps/icedtea.stamp, stamps/icedtea-debug.stamp): + Add shark aliases to jvm.cfg. + (stamps/add-zero.stamp): Install as shark if default vm is zero. + * configure.ac: Allow shark as additional vm when default vm is zero. + * INSTALL, README: Document new build options. + 2009-10-06 Gary Benson * patches/icedtea-s390-serialize.patch: New file. diff -r f61b94ebf46a -r 70ec5cda5f7c INSTALL --- a/INSTALL Tue Oct 06 13:42:46 2009 +0100 +++ b/INSTALL Thu Oct 08 13:08:52 2009 +0200 @@ -125,10 +125,13 @@ on architectures where only zero (or sha --with-additional-vms=cacao to build the additional VM's. It's not possible to build cacao as the default VM, and zero as additional VM. +To build zero as the default VM and shark as an additional VM, use + --enable-zero --with-additional-vms=shark The additional VM's are available by calling the java with the option -`-cacao' or `-zero' (for shark as well), or by calling the java tools with -`-J-'. +`-cacao', `-zero' or `-shark', or by calling the java tools with +`-J-'. If the build was configured with '--enable-shark', +use `-Xint' to just use the zero VM. Support for different versions of HotSpot ----------------------------------------- diff -r f61b94ebf46a -r 70ec5cda5f7c Makefile.am --- a/Makefile.am Tue Oct 06 13:42:46 2009 +0100 +++ b/Makefile.am Thu Oct 08 13:08:52 2009 +0200 @@ -1250,6 +1250,9 @@ if ZERO_BUILD if ZERO_BUILD printf -- '-zero ALIASED_TO -server\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg endif +if SHARK_BUILD + printf -- '-shark ALIASED_TO -server\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg +endif if WITH_CACAO printf -- '-cacao ALIASED_TO -server\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg endif @@ -1338,6 +1341,9 @@ endif $(BUILD_OUTPUT_DIR)-debug/j2sdk-image/jre/lib if ZERO_BUILD printf -- '-zero ALIASED_TO -server\n' >> $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg +endif +if SHARK_BUILD + printf -- '-shark ALIASED_TO -server\n' >> $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg endif if WITH_CACAO printf -- '-cacao ALIASED_TO -server\n' >> $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg @@ -1940,12 +1946,20 @@ if ADD_ZERO_BUILD $(ADD_ZERO_EXTRA_BUILD_ENV) \ $(ARCH_PREFIX) $(MAKE) -C zerovm $(ICEDTEA_BUILD_TARGET) +if ZERO_BUILD + mkdir -p $(BUILD_JRE_ARCH_DIR)/shark + cp -a zerovm/openjdk/build/$(OS_DIR)/hotspot/import/jre/lib/$(INSTALL_ARCH_DIR)/server/* \ + $(BUILD_JRE_ARCH_DIR)/shark/ + printf -- '-shark KNOWN\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg +else mkdir -p $(BUILD_JRE_ARCH_DIR)/zero cp -a zerovm/openjdk/build/$(OS_DIR)/hotspot/import/jre/lib/$(INSTALL_ARCH_DIR)/server/* \ $(BUILD_JRE_ARCH_DIR)/zero/ printf -- '-zero KNOWN\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg +endif else printf -- '-zero ERROR\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg + printf -- '-shark ERROR\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg endif touch $@ @@ -1960,12 +1974,20 @@ if ADD_ZERO_BUILD $(ADD_ZERO_EXTRA_BUILD_ENV) \ $(ARCH_PREFIX) $(MAKE) -C zerovm $(ICEDTEA_DEBUG_BUILD_TARGET) +if ZERO_BUILD + mkdir -p $(BUILD_DEBUG_JRE_ARCH_DIR)/shark + cp -a zerovm/openjdk/build/$(OS_DIR)/hotspot/import/jre/lib/$(INSTALL_ARCH_DIR)/server/* \ + $(BUILD_DEBUG_JRE_ARCH_DIR)/shark/ + printf -- '-shark KNOWN\n' >> $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg +else mkdir -p $(BUILD_DEBUG_JRE_ARCH_DIR)/zero cp -a zerovm/openjdk/build/$(OS_DIR)/hotspot/import/jre/lib/$(INSTALL_ARCH_DIR)/server/* \ $(BUILD_DEBUG_JRE_ARCH_DIR)/zero/ printf -- '-zero KNOWN\n' >> $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg +endif else printf -- '-zero ERROR\n' >> $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg + printf -- '-shark ERROR\n' >> $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg endif touch $@ diff -r f61b94ebf46a -r 70ec5cda5f7c README --- a/README Tue Oct 06 13:42:46 2009 +0100 +++ b/README Thu Oct 08 13:08:52 2009 +0200 @@ -153,13 +153,16 @@ machine, addtional VM's can be built wit machine, addtional VM's can be built without building the other components multiple times. -On architectures where hotspot is available, use +On architectures where hotspot is available, use --with-additional-vms=cacao,zero (or shark instead of zero) on architectures where only zero (or shark) is available, use - --with-additional-vms=cacao -to build the additional VM's. It's not possible to build cacao as the + --with-additional-vms=cacao +to build the additional VM's. It's not possible to build cacao as the default VM, and zero as additional VM. +To build zero as the default VM and shark as an additional VM, use + --enable-zero --with-additional-vms=shark -If the build was configured with --with-additional-vms, the additional VM's -are available by calling the java with the option `-cacao' or `-zero' (for -shark as well), or by calling the java tools with `-J-'. +The additional VM's are available by calling the java with the option +`-cacao', `-zero' or `-shark', or by calling the java tools with +`-J-'. If the build was configured with '--enable-shark', +use `-Xint' to just use the zero VM. diff -r f61b94ebf46a -r 70ec5cda5f7c configure.ac --- a/configure.ac Tue Oct 06 13:42:46 2009 +0100 +++ b/configure.ac Thu Oct 08 13:08:52 2009 +0200 @@ -532,7 +532,10 @@ if test "x${WITH_CACAO}" = xyes && test if test "x${WITH_CACAO}" = xyes && test "x${ADD_CACAO_BUILD_TRUE}" = x; then AC_MSG_ERROR([additional vm is the default vm]) fi -if test "x${ZERO_BUILD_TRUE}" = x && test "x${ADD_ZERO_BUILD_TRUE}" = x; then +if test "x${ZERO_BUILD_TRUE}" = x && test "x${ADD_ZERO_BUILD_TRUE}" = x && test "x${ADD_SHARK_BUILD_TRUE}" != x; then + AC_MSG_ERROR([additional vm is the default vm]) +fi +if test "x${SHARK_BUILD_TRUE}" = x && test "x${ADD_SHARK_BUILD_TRUE}" = x; then AC_MSG_ERROR([additional vm is the default vm]) fi if test "x${USE_SYSTEM_CACAO_TRUE}" = x; then From doko at icedtea.classpath.org Thu Oct 8 04:16:04 2009 From: doko at icedtea.classpath.org (doko at icedtea.classpath.org) Date: Thu, 08 Oct 2009 11:16:04 +0000 Subject: /hg/icedtea: 2009-10-08 Matthias Klose Message-ID: changeset 19ad2af4b4e3 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=19ad2af4b4e3 author: doko at ubuntu.com date: Thu Oct 08 13:19:08 2009 +0200 2009-10-08 Matthias Klose * Makefile.am (stamps/icedtea.stamp, stamps/icedtea- debug.stamp): Add shark aliases to jvm.cfg. (stamps /add-zero.stamp): Install as shark if default vm is zero. * acinclude.m4: Allow shark as additional vm when default vm is zero. * INSTALL, README: Document new build options. diffstat: 5 files changed, 48 insertions(+), 9 deletions(-) ChangeLog | 8 ++++++++ INSTALL | 7 +++++-- Makefile.am | 22 ++++++++++++++++++++++ README | 15 +++++++++------ acinclude.m4 | 5 ++++- diffs (137 lines): diff -r 175529fae103 -r 19ad2af4b4e3 ChangeLog --- a/ChangeLog Wed Oct 07 09:48:00 2009 +0100 +++ b/ChangeLog Thu Oct 08 13:19:08 2009 +0200 @@ -1,3 +1,11 @@ 2009-10-08 Andrew John Hughes + + * Makefile.am (stamps/icedtea.stamp, stamps/icedtea-debug.stamp): + Add shark aliases to jvm.cfg. + (stamps/add-zero.stamp): Install as shark if default vm is zero. + * acinclude.m4: Allow shark as additional vm when default vm is zero. + * INSTALL, README: Document new build options. + 2009-10-08 Andrew John Hughes * netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java: diff -r 175529fae103 -r 19ad2af4b4e3 INSTALL --- a/INSTALL Wed Oct 07 09:48:00 2009 +0100 +++ b/INSTALL Thu Oct 08 13:19:08 2009 +0200 @@ -126,7 +126,10 @@ on architectures where only zero (or sha --with-additional-vms=cacao to build the additional VM's. It's not possible to build cacao as the default VM, and zero as additional VM. +To build zero as the default VM and shark as an additional VM, use + --enable-zero --with-additional-vms=shark The additional VM's are available by calling the java with the option -`-cacao' or `-zero' (for shark as well), or by calling the java tools with -`-J-'. +`-cacao', `-zero' or `-shark', or by calling the java tools with +`-J-'. If the build was configured with '--enable-shark', +use `-Xint' to just use the zero VM. diff -r 175529fae103 -r 19ad2af4b4e3 Makefile.am --- a/Makefile.am Wed Oct 07 09:48:00 2009 +0100 +++ b/Makefile.am Thu Oct 08 13:19:08 2009 +0200 @@ -1508,6 +1508,9 @@ if ZERO_BUILD if ZERO_BUILD printf -- '-zero ALIASED_TO -server\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg endif +if SHARK_BUILD + printf -- '-shark ALIASED_TO -server\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg +endif if WITH_CACAO printf -- '-cacao ALIASED_TO -server\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg endif @@ -1576,6 +1579,9 @@ endif endif if ZERO_BUILD printf -- '-zero ALIASED_TO -server\n' >> $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg +endif +if SHARK_BUILD + printf -- '-shark ALIASED_TO -server\n' >> $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg endif if WITH_CACAO printf -- '-cacao ALIASED_TO -server\n' >> $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg @@ -2044,12 +2050,20 @@ if ADD_ZERO_BUILD $(ADD_ZERO_EXTRA_BUILD_ENV) \ $(ARCH_PREFIX) $(MAKE) -C zerovm $(ICEDTEA_BUILD_TARGET) +if ZERO_BUILD + mkdir -p $(BUILD_JRE_ARCH_DIR)/shark + cp -a zerovm/openjdk/build/$(OS_DIR)/hotspot/import/jre/lib/$(INSTALL_ARCH_DIR)/server/* \ + $(BUILD_JRE_ARCH_DIR)/shark/ + printf -- '-shark KNOWN\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg +else mkdir -p $(BUILD_JRE_ARCH_DIR)/zero cp -a zerovm/openjdk/build/$(OS_DIR)/hotspot/import/jre/lib/$(INSTALL_ARCH_DIR)/server/* \ $(BUILD_JRE_ARCH_DIR)/zero/ printf -- '-zero KNOWN\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg +endif else printf -- '-zero ERROR\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg + printf -- '-shark ERROR\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg endif touch $@ @@ -2065,12 +2079,20 @@ if ADD_ZERO_BUILD $(ADD_ZERO_EXTRA_BUILD_ENV) \ $(ARCH_PREFIX) $(MAKE) -C zerovm $(ICEDTEA_DEBUG_BUILD_TARGET) +if ZERO_BUILD + mkdir -p $(BUILD_DEBUG_JRE_ARCH_DIR)/shark + cp -a zerovm/openjdk/build/$(OS_DIR)/hotspot/import/jre/lib/$(INSTALL_ARCH_DIR)/server/* \ + $(BUILD_DEBUG_JRE_ARCH_DIR)/shark/ + printf -- '-shark KNOWN\n' >> $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg +else mkdir -p $(BUILD_DEBUG_JRE_ARCH_DIR)/zero cp -a zerovm/openjdk/build/$(OS_DIR)/hotspot/import/jre/lib/$(INSTALL_ARCH_DIR)/server/* \ $(BUILD_DEBUG_JRE_ARCH_DIR)/zero/ printf -- '-zero KNOWN\n' >> $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg +endif else printf -- '-zero ERROR\n' >> $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg + printf -- '-shark ERROR\n' >> $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg endif touch $@ diff -r 175529fae103 -r 19ad2af4b4e3 README --- a/README Wed Oct 07 09:48:00 2009 +0100 +++ b/README Thu Oct 08 13:19:08 2009 +0200 @@ -144,13 +144,16 @@ machine, addtional VM's can be built wit machine, addtional VM's can be built without building the other components multiple times. -On architectures where hotspot is available, use +On architectures where hotspot is available, use --with-additional-vms=cacao,zero (or shark instead of zero) on architectures where only zero (or shark) is available, use - --with-additional-vms=cacao -to build the additional VM's. It's not possible to build cacao as the + --with-additional-vms=cacao +to build the additional VM's. It's not possible to build cacao as the default VM, and zero as additional VM. +To build zero as the default VM and shark as an additional VM, use + --enable-zero --with-additional-vms=shark -If the build was configured with --with-additional-vms, the additional VM's -are available by calling the java with the option `-cacao' or `-zero' (for -shark as well), or by calling the java tools with `-J-'. +The additional VM's are available by calling the java with the option +`-cacao', `-zero' or `-shark', or by calling the java tools with +`-J-'. If the build was configured with '--enable-shark', +use `-Xint' to just use the zero VM. diff -r 175529fae103 -r 19ad2af4b4e3 acinclude.m4 --- a/acinclude.m4 Wed Oct 07 09:48:00 2009 +0100 +++ b/acinclude.m4 Thu Oct 08 13:19:08 2009 +0200 @@ -1322,7 +1322,10 @@ if test "x${WITH_CACAO}" = xyes && test if test "x${WITH_CACAO}" = xyes && test "x${ADD_CACAO_BUILD_TRUE}" = x; then AC_MSG_ERROR([additional vm is the default vm]) fi -if test "x${ZERO_BUILD_TRUE}" = x && test "x${ADD_ZERO_BUILD_TRUE}" = x; then +if test "x${ZERO_BUILD_TRUE}" = x && test "x${ADD_ZERO_BUILD_TRUE}" = x && test "x${ADD_SHARK_BUILD_TRUE}" != x; then + AC_MSG_ERROR([additional vm is the default vm]) +fi +if test "x${SHARK_BUILD_TRUE}" = x && test "x${ADD_SHARK_BUILD_TRUE}" = x; then AC_MSG_ERROR([additional vm is the default vm]) fi if test "x${USE_SYSTEM_CACAO_TRUE}" = x; then From gnu_andrew at member.fsf.org Thu Oct 8 06:51:14 2009 From: gnu_andrew at member.fsf.org (Andrew John Hughes) Date: Thu, 8 Oct 2009 14:51:14 +0100 Subject: [patch] build shark as an additional vm, if the default vm is zero In-Reply-To: <4ACD19E2.70509@ubuntu.com> References: <4ACD19E2.70509@ubuntu.com> Message-ID: <17c6771e0910080651q15f8b00cx967a51687482aa2b@mail.gmail.com> 2009/10/7 Matthias Klose : > this allows you to configure with --additional-vms=shark, when the default > vm is zero. it's useful if you build packages with shark support which > shouldn't mess around with you default configuration. You can start with > -Xint, but I didn't see anything how to make this the default, and for now > I'd like to give developers the chance to test with shark without > interfering with the default vm. > > ?Matthias > Does this affect the usual --enable-zero option? I'm not sure offhand whether that also uses ZERO_BUILD or not. -- Andrew :-) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint: F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From ed at camswl.com Thu Oct 8 03:27:51 2009 From: ed at camswl.com (Edward Nevill) Date: Thu, 8 Oct 2009 11:27:51 +0100 Subject: ARM interpreter bug fixes Message-ID: <200910081027.n98ARpgo009016@parsley.camswl.com> Hi folks, Two bug fixes here, 1) irem of negative number returns positive. This was introduced in my last checkin. The new dispatch code corrupted the flags inc. the N flags so irem didn't handle -ve nos. 2) icedtea-debug build fails. The ARM assembler still does not build for icedtea-debug, however at least with this patch it will not fall over in the test_gamma, instead it builds a C only vsn. Changelog to follow Regards, Ed. --- CUT HERE ------------------------------------------------------------- diff -ruNE orig/icedtea6/ports/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S new/icedtea6/ports/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S --- orig/icedtea6/ports/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S 2009-10-08 10:49:32.000000000 +0100 +++ new/icedtea6/ports/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S 2009-10-08 11:13:38.000000000 +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 From ed at camswl.com Thu Oct 8 03:31:38 2009 From: ed at camswl.com (Edward Nevill) Date: Thu, 8 Oct 2009 11:31:38 +0100 Subject: [patch] build shark as an additional vm, if the default vm is zero Message-ID: <200910081031.n98AVcwA009065@parsley.camswl.com> >this allows you to configure with --additional-vms=shark, when the default vm is >zero. it's useful if you build packages with shark support which shouldn't mess >around with you default configuration. You can start with -Xint, but I didn't >see anything how to make this the default, and for now I'd like to give >developers the chance to test with shark without interfering with the default vm. Looks good to me. Ed. From aph at redhat.com Thu Oct 8 08:16:03 2009 From: aph at redhat.com (Andrew Haley) Date: Thu, 08 Oct 2009 16:16:03 +0100 Subject: ARM interpreter bug fixes In-Reply-To: <200910081027.n98ARpgo009016@parsley.camswl.com> References: <200910081027.n98ARpgo009016@parsley.camswl.com> Message-ID: <4ACE0233.30602@redhat.com> Edward Nevill wrote: > Hi folks, > > Two bug fixes here, > > 1) irem of negative number returns positive. > > This was introduced in my last checkin. The new dispatch code corrupted the > flags inc. the N flags so irem didn't handle -ve nos. > > 2) icedtea-debug build fails. > > The ARM assembler still does not build for icedtea-debug, however at least > with this patch it will not fall over in the test_gamma, instead it builds > a C only vsn. > > Changelog to follow Great, ta. Andrew. From gnu_andrew at member.fsf.org Thu Oct 8 06:48:17 2009 From: gnu_andrew at member.fsf.org (Andrew John Hughes) Date: Thu, 8 Oct 2009 14:48:17 +0100 Subject: b17 In-Reply-To: <4ACD1A40.8070605@sun.com> References: <17c6771e0909290504u46e7536cjc5b477cd693c2fce@mail.gmail.com> <17c6771e0910020610p14bb8ad0gb532205830108083@mail.gmail.com> <4AC63861.1090400@sun.com> <17c6771e0910021520t7af0582m10830585e1101669@mail.gmail.com> <4ACA6A26.4050003@sun.com> <17c6771e0910061047y46200811yb3b34f850e20bd70@mail.gmail.com> <4ACBDF1E.8060402@sun.com> <17c6771e0910070220u5e8f45d9jec9bf7ab8434be48@mail.gmail.com> <17c6771e0910070224l7d7eb2daifdb7f9b0669068ad@mail.gmail.com> <4ACD1A40.8070605@sun.com> Message-ID: <17c6771e0910080648n31367bfcn8a673ba780c91d23@mail.gmail.com> 2009/10/7 Joe Darcy : > Andrew John Hughes wrote: >> >> 2009/10/7 Andrew John Hughes : >> >>> >>> 2009/10/7 Joe Darcy : >>> >>>> >>>> Andrew John Hughes wrote: >>>> >>>>> >>>>> 2009/10/5 Joseph D. Darcy : >>>>> >>>>> >>>> >>>> [big snip] >>>> >>>>>> >>>>>> Hello. >>>>>> >>>>>> Any results for the jdk/test regression tests? >>>>>> >>>>>> -Joe >>>>>> >>>>>> >>>>>> >>>>> >>>>> JDK: Test results: passed: 3,269; failed: 168; error: 3 >>>>> >>>>> The failed seems high, the number of errors matches our usual JTreg >>>>> runs. ?I'll have to take a closer look but I don't usually do runs on >>>>> this box. ?What were your own results like for OpenJDK6 b17? >>>>> >>>>> >>>> >>>> My results for building OpenJDK 6 on Ubuntu 9.04 x64 and running tests >>>> there >>>> are: >>>> >>>> hotspot/test: >>>> Test results: passed: 24 >>>> >>>> langtools/test: >>>> Test results: passed: 1354 >>>> >>>> jdk/test: >>>> Test results: passed: 3,100; failed: 43; error: 1 >>>> >>>> All test suites were run with "-a -ignore:quiet"; in addition, langtools >>>> was >>>> run with "-s". >>>> >>>> I've uploaded my summary.txt files to: >>>> http://cr.openjdk.java.net/~darcy/OpenJDK6-jtreg-pre-b17/ >>>> >>>> (The jdk tests were run a bit differently than my usual test setup where >>>> I >>>> point the graphical tests into a virtual framefer. ?In this case, I just >>>> ran >>>> the tests without redirecting the graphics.) >>>> >>>> I haven't looked at the IcedTea patch set recently; if the Gervill sound >>>> tests are still being duplicated, I think the IcedTea copies can be >>>> removed >>>> at this point since Karl is keeping the OpenJDK 6 copy of the code and >>>> tests >>>> up-to-date. >>>> >>>> -Joe >>>> >>>> >>> >>> Ok, the majority of JDK failures I'm seeing are not an issue; they are >>> either compile failures from the optional NIO2 backport in IcedTea6 or >>> headless exceptions for the AWT/Swing stuff. ?The former are known to >>> fail, as I just haven't had time to backport the tests. ?This isn't a >>> major issue as most IcedTea6 builds don't enable the backport anyway. >>> The headless exceptions are also expected given the tests were run in >>> screen without any virtual framebuffer. ?Perhaps we should have the >>> check-jdk target use Xvfb by default? >>> >>> Two Gervill tests fail: >>> >>> javax/sound/midi/Gervill/SoftReceiver/GetMidiDevice.java (compile >>> failure) >>> javax/sound/midi/Gervill/SoftChannel/NoteOverFlowTest2.java : >>> IndexOutOfBounds >>> >>> The rest seem to be related to java.beans (can't find java.awt.Color >>> -- possibly a headless issue again) or crypto (having ECC enabled >>> seems to cause additional failures). >>> >>> I don't think there's anything that's a stopper for b17, especially as >>> your results seem pretty good (and the failures seem the same as we've >>> seen). ?We just need to make some decisions on how to resolve the >>> differences between the IcedTea6 and plain OpenJDK6 builds. >>> >>> What do you think? >>> -- >>> Andrew :-) >>> >>> Free Java Software Engineer >>> Red Hat, Inc. (http://www.redhat.com) >>> >>> Support Free Java! >>> Contribute to GNU Classpath and the OpenJDK >>> http://www.gnu.org/software/classpath >>> http://openjdk.java.net >>> >>> PGP Key: 94EFD9D8 (http://subkeys.pgp.net) >>> Fingerprint: F8EF F1EA 401E 2E60 15FA ?7927 142C 2591 94EF D9D8 >>> >>> >> >> My results are being pushed to http://cr.openjdk.java.net/~andrew/jdk/ >> now. ?Should be there shortly. >> > > Hello. > > Below is the jtdiff between my OpenJDK 6 test/jdk regression tests and your > IcedTea test/jdk tests. > > Most of the additional passes are the duplicated Gervill tests and most of > the failures differences are from the awt configuration issue (and the nio2 > backport). > > So I think this looks pretty good. > > -Joe > > 0: 6-open/summary.txt ?pass: 3,100; fail: 43; error: 1 > 1: IcedTea/summary.txt ?pass: 3,269; fail: 168; error: 3 > > 0 ? ? ?1 ? ? ?Test > --- ? ?pass ? closed/tools/pack200/MemoryAllocatorTest.java > fail ? pass ? com/sun/jdi/BadHandshakeTest.java > pass ? fail ? com/sun/jdi/OptionTest.java > pass ? --- ? ?com/sun/jmx/snmp/SnmpOidHashCode.java > pass ? --- ? ?com/sun/jmx/snmp/TimeTicksWrapping.java > --- ? ?pass ? com/sun/media/sound/AudioFloatConverter/GetFormat.java > --- ? ?pass ? com/sun/media/sound/AudioFloatConverter/ToFloatArray.java > --- ? ?pass ? com/sun/media/sound/AudioFloatInputStream/Available.java > --- ? ?pass ? com/sun/media/sound/AudioFloatInputStream/Close.java > --- ? ?pass ? com/sun/media/sound/AudioFloatInputStream/GetFormat.java > --- ? ?pass ? com/sun/media/sound/AudioFloatInputStream/GetFrameLength.java > --- ? ?pass ? com/sun/media/sound/AudioFloatInputStream/MarkSupported.java > --- ? ?pass ? com/sun/media/sound/AudioFloatInputStream/Read.java > --- ? ?pass ? com/sun/media/sound/AudioFloatInputStream/ReadFloatArray.java > --- ? ?pass > com/sun/media/sound/AudioFloatInputStream/ReadFloatArrayIntInt.java > --- ? ?pass ? com/sun/media/sound/AudioFloatInputStream/Reset.java > --- ? ?pass ? com/sun/media/sound/AudioFloatInputStream/Skip.java > --- ? ?pass > com/sun/media/sound/DLSSoundbankReader/TestGetSoundbankFile.java > --- ? ?pass > com/sun/media/sound/DLSSoundbankReader/TestGetSoundbankInputStream.java > --- ? ?pass > com/sun/media/sound/DLSSoundbankReader/TestGetSoundbankInputStream2.java > --- ? ?pass > com/sun/media/sound/DLSSoundbankReader/TestGetSoundbankUrl.java > --- ? ?pass > com/sun/media/sound/EmergencySoundbank/TestCreateSoundbank.java > --- ? ?pass ? com/sun/media/sound/ModelByteBuffer/GetInputStream.java > --- ? ?pass ? com/sun/media/sound/ModelByteBuffer/GetRoot.java > --- ? ?pass ? com/sun/media/sound/ModelByteBuffer/Load.java > --- ? ?pass ? com/sun/media/sound/ModelByteBuffer/LoadAll.java > --- ? ?pass > com/sun/media/sound/ModelByteBuffer/NewModelByteBufferByteArray.java > --- ? ?pass > com/sun/media/sound/ModelByteBuffer/NewModelByteBufferByteArrayIntInt.java > --- ? ?pass > com/sun/media/sound/ModelByteBuffer/NewModelByteBufferFile.java > --- ? ?pass > com/sun/media/sound/ModelByteBuffer/NewModelByteBufferFileLongLong.java > --- ? ?pass > com/sun/media/sound/ModelByteBuffer/RandomFileInputStream/Available.java > --- ? ?pass > com/sun/media/sound/ModelByteBuffer/RandomFileInputStream/Close.java > --- ? ?pass > com/sun/media/sound/ModelByteBuffer/RandomFileInputStream/MarkReset.java > --- ? ?pass > com/sun/media/sound/ModelByteBuffer/RandomFileInputStream/MarkSupported.java > --- ? ?pass > com/sun/media/sound/ModelByteBuffer/RandomFileInputStream/Read.java > --- ? ?pass > com/sun/media/sound/ModelByteBuffer/RandomFileInputStream/ReadByte.java > --- ? ?pass > com/sun/media/sound/ModelByteBuffer/RandomFileInputStream/ReadByteIntInt.java > --- ? ?pass > com/sun/media/sound/ModelByteBuffer/RandomFileInputStream/Skip.java > --- ? ?pass ? com/sun/media/sound/ModelByteBuffer/SubbufferLong.java > --- ? ?pass ? com/sun/media/sound/ModelByteBuffer/SubbufferLongLong.java > --- ? ?pass > com/sun/media/sound/ModelByteBuffer/SubbufferLongLongBoolean.java > --- ? ?pass ? com/sun/media/sound/ModelByteBuffer/Unload.java > --- ? ?pass ? com/sun/media/sound/ModelByteBuffer/WriteTo.java > --- ? ?pass > com/sun/media/sound/ModelByteBufferWavetable/GetAttenuation.java > --- ? ?pass ? com/sun/media/sound/ModelByteBufferWavetable/GetChannels.java > --- ? ?pass > com/sun/media/sound/ModelByteBufferWavetable/GetLoopLength.java > --- ? ?pass ? com/sun/media/sound/ModelByteBufferWavetable/GetLoopStart.java > --- ? ?pass > com/sun/media/sound/ModelByteBufferWavetable/GetPitchCorrection.java > --- ? ?pass > com/sun/media/sound/ModelByteBufferWavetable/NewModelByteBufferWavetableModelByteBuffer.java > --- ? ?pass > com/sun/media/sound/ModelByteBufferWavetable/NewModelByteBufferWavetableModelByteBufferAudioFormat.java > --- ? ?pass > com/sun/media/sound/ModelByteBufferWavetable/NewModelByteBufferWavetableModelByteBufferAudioFormatFloat.java > --- ? ?pass > com/sun/media/sound/ModelByteBufferWavetable/NewModelByteBufferWavetableModelByteBufferFloat.java > --- ? ?pass ? com/sun/media/sound/ModelByteBufferWavetable/Open.java > --- ? ?pass > com/sun/media/sound/ModelByteBufferWavetable/Set8BitExtensionBuffer.java > --- ? ?pass ? com/sun/media/sound/ModelByteBufferWavetable/SetLoopType.java > --- ? ?pass ? com/sun/media/sound/ModelDestination/NewModelDestination.java > --- ? ?pass > com/sun/media/sound/ModelDestination/NewModelDestinationModelIdentifier.java > --- ? ?pass ? com/sun/media/sound/ModelDestination/SetIdentifier.java > --- ? ?pass ? com/sun/media/sound/ModelDestination/SetTransform.java > --- ? ?pass ? com/sun/media/sound/ModelIdentifier/EqualsObject.java > --- ? ?pass > com/sun/media/sound/ModelIdentifier/NewModelIdentifierString.java > --- ? ?pass > com/sun/media/sound/ModelIdentifier/NewModelIdentifierStringInt.java > --- ? ?pass > com/sun/media/sound/ModelIdentifier/NewModelIdentifierStringString.java > --- ? ?pass > com/sun/media/sound/ModelIdentifier/NewModelIdentifierStringStringInt.java > --- ? ?pass ? com/sun/media/sound/ModelIdentifier/SetInstance.java > --- ? ?pass ? com/sun/media/sound/ModelIdentifier/SetObject.java > --- ? ?pass ? com/sun/media/sound/ModelIdentifier/SetVariable.java > --- ? ?pass ? com/sun/media/sound/ModelPerformer/GetOscillators.java > --- ? ?pass ? com/sun/media/sound/ModelPerformer/SetConnectionBlocks.java > --- ? ?pass > com/sun/media/sound/ModelPerformer/SetDefaultConnectionsEnabled.java > --- ? ?pass ? com/sun/media/sound/ModelPerformer/SetExclusiveClass.java > --- ? ?pass ? com/sun/media/sound/ModelPerformer/SetKeyFrom.java > --- ? ?pass ? com/sun/media/sound/ModelPerformer/SetKeyTo.java > --- ? ?pass ? com/sun/media/sound/ModelPerformer/SetName.java > --- ? ?pass ? com/sun/media/sound/ModelPerformer/SetSelfNonExclusive.java > --- ? ?pass ? com/sun/media/sound/ModelPerformer/SetVelFrom.java > --- ? ?pass ? com/sun/media/sound/ModelPerformer/SetVelTo.java > --- ? ?pass ? com/sun/media/sound/ModelSource/NewModelSource.java > --- ? ?pass > com/sun/media/sound/ModelSource/NewModelSourceModelIdentifier.java > --- ? ?pass > com/sun/media/sound/ModelSource/NewModelSourceModelIdentifierBoolean.java > --- ? ?pass > com/sun/media/sound/ModelSource/NewModelSourceModelIdentifierBooleanBoolean.java > --- ? ?pass > com/sun/media/sound/ModelSource/NewModelSourceModelIdentifierBooleanBooleanInt.java > --- ? ?pass > com/sun/media/sound/ModelSource/NewModelSourceModelIdentifierModelTransform.java > --- ? ?pass ? com/sun/media/sound/ModelSource/SetIdentifier.java > --- ? ?pass ? com/sun/media/sound/ModelSource/SetTransform.java > --- ? ?pass > com/sun/media/sound/ModelStandardTransform/NewModelStandardTransform.java > --- ? ?pass > com/sun/media/sound/ModelStandardTransform/NewModelStandardTransformBoolean.java > --- ? ?pass > com/sun/media/sound/ModelStandardTransform/NewModelStandardTransformBooleanBoolean.java > --- ? ?pass > com/sun/media/sound/ModelStandardTransform/NewModelStandardTransformBooleanBooleanInt.java > --- ? ?pass ? com/sun/media/sound/ModelStandardTransform/SetDirection.java > --- ? ?pass ? com/sun/media/sound/ModelStandardTransform/SetPolarity.java > --- ? ?pass ? com/sun/media/sound/ModelStandardTransform/SetTransform.java > --- ? ?pass > com/sun/media/sound/ModelStandardTransform/TransformAbsolute.java > --- ? ?pass > com/sun/media/sound/ModelStandardTransform/TransformConcave.java > --- ? ?pass > com/sun/media/sound/ModelStandardTransform/TransformConvex.java > --- ? ?pass > com/sun/media/sound/ModelStandardTransform/TransformLinear.java > --- ? ?pass > com/sun/media/sound/ModelStandardTransform/TransformSwitch.java > --- ? ?pass ? com/sun/media/sound/RiffReaderWriter/Available.java > --- ? ?pass ? com/sun/media/sound/RiffReaderWriter/Close.java > --- ? ?pass ? com/sun/media/sound/RiffReaderWriter/GetFilePointer.java > --- ? ?pass ? com/sun/media/sound/RiffReaderWriter/GetSize.java > --- ? ?pass ? com/sun/media/sound/RiffReaderWriter/HasNextChunk.java > --- ? ?pass ? com/sun/media/sound/RiffReaderWriter/Read.java > --- ? ?pass ? com/sun/media/sound/RiffReaderWriter/ReadByte.java > --- ? ?pass ? com/sun/media/sound/RiffReaderWriter/ReadByteArrayIntInt.java > --- ? ?pass ? com/sun/media/sound/RiffReaderWriter/ReadInt.java > --- ? ?pass ? com/sun/media/sound/RiffReaderWriter/ReadLong.java > --- ? ?pass ? com/sun/media/sound/RiffReaderWriter/ReadShort.java > --- ? ?pass ? com/sun/media/sound/RiffReaderWriter/ReadString.java > --- ? ?pass ? com/sun/media/sound/RiffReaderWriter/ReadUnsignedByte.java > --- ? ?pass ? com/sun/media/sound/RiffReaderWriter/ReadUnsignedInt.java > --- ? ?pass ? com/sun/media/sound/RiffReaderWriter/ReadUnsignedShort.java > --- ? ?pass ? com/sun/media/sound/RiffReaderWriter/Skip.java > --- ? ?pass ? com/sun/media/sound/RiffReaderWriter/WriteOutputStream.java > --- ? ?pass > com/sun/media/sound/SF2SoundbankReader/TestGetSoundbankFile.java > --- ? ?pass > com/sun/media/sound/SF2SoundbankReader/TestGetSoundbankInputStream.java > --- ? ?pass > com/sun/media/sound/SF2SoundbankReader/TestGetSoundbankInputStream2.java > --- ? ?pass > com/sun/media/sound/SF2SoundbankReader/TestGetSoundbankUrl.java > --- ? ?pass ? com/sun/media/sound/SimpleInstrument/AddModelInstrument.java > --- ? ?pass > com/sun/media/sound/SimpleInstrument/AddModelInstrumentIntInt.java > --- ? ?pass > com/sun/media/sound/SimpleInstrument/AddModelInstrumentIntIntIntInt.java > --- ? ?pass > com/sun/media/sound/SimpleInstrument/AddModelInstrumentIntIntIntIntInt.java > --- ? ?pass ? com/sun/media/sound/SimpleInstrument/AddModelPerformer.java > --- ? ?pass > com/sun/media/sound/SimpleInstrument/AddModelPerformerArray.java > --- ? ?pass > com/sun/media/sound/SimpleInstrument/AddModelPerformerArrayIntInt.java > --- ? ?pass > com/sun/media/sound/SimpleInstrument/AddModelPerformerArrayIntIntIntInt.java > --- ? ?pass > com/sun/media/sound/SimpleInstrument/AddModelPerformerArrayIntIntIntIntInt.java > --- ? ?pass > com/sun/media/sound/SimpleInstrument/AddModelPerformerIntInt.java > --- ? ?pass > com/sun/media/sound/SimpleInstrument/AddModelPerformerIntIntIntInt.java > --- ? ?pass > com/sun/media/sound/SimpleInstrument/AddModelPerformerIntIntIntIntInt.java > --- ? ?pass ? com/sun/media/sound/SimpleInstrument/Clear.java > --- ? ?pass ? com/sun/media/sound/SimpleInstrument/SetName.java > --- ? ?pass ? com/sun/media/sound/SimpleInstrument/SetPatch.java > --- ? ?pass ? com/sun/media/sound/SimpleSoundbank/AddInstrument.java > --- ? ?pass ? com/sun/media/sound/SimpleSoundbank/AddResource.java > --- ? ?pass ? com/sun/media/sound/SimpleSoundbank/GetInstrument.java > --- ? ?pass ? com/sun/media/sound/SimpleSoundbank/RemoveInstrument.java > --- ? ?pass ? com/sun/media/sound/SimpleSoundbank/SetDescription.java > --- ? ?pass ? com/sun/media/sound/SimpleSoundbank/SetName.java > --- ? ?pass ? com/sun/media/sound/SimpleSoundbank/SetVendor.java > --- ? ?pass ? com/sun/media/sound/SimpleSoundbank/SetVersion.java > --- ? ?pass ? com/sun/media/sound/SoftAudioBuffer/Array.java > --- ? ?pass ? com/sun/media/sound/SoftAudioBuffer/Clear.java > --- ? ?pass ? com/sun/media/sound/SoftAudioBuffer/Get.java > --- ? ?pass ? com/sun/media/sound/SoftAudioBuffer/NewSoftAudioBuffer.java > --- ? ?pass ? com/sun/media/sound/SoftAudioSynthesizer/GetFormat.java > --- ? ?pass ? com/sun/media/sound/SoftAudioSynthesizer/GetPropertyInfo.java > --- ? ?pass ? com/sun/media/sound/SoftAudioSynthesizer/Open.java > --- ? ?pass ? com/sun/media/sound/SoftAudioSynthesizer/OpenStream.java > --- ? ?pass ? com/sun/media/sound/SoftChannel/AllNotesOff.java > --- ? ?pass ? com/sun/media/sound/SoftChannel/AllSoundOff.java > --- ? ?pass ? com/sun/media/sound/SoftChannel/ChannelPressure.java > --- ? ?pass ? com/sun/media/sound/SoftChannel/Controller.java > --- ? ?pass ? com/sun/media/sound/SoftChannel/LocalControl.java > --- ? ?pass ? com/sun/media/sound/SoftChannel/Mono.java > --- ? ?pass ? com/sun/media/sound/SoftChannel/Mute.java > --- ? ?pass ? com/sun/media/sound/SoftChannel/NoteOff.java > --- ? ?pass ? com/sun/media/sound/SoftChannel/NoteOff2.java > --- ? ?pass ? com/sun/media/sound/SoftChannel/NoteOn.java > --- ? ?pass ? com/sun/media/sound/SoftChannel/Omni.java > --- ? ?pass ? com/sun/media/sound/SoftChannel/PitchBend.java > --- ? ?pass ? com/sun/media/sound/SoftChannel/PolyPressure.java > --- ? ?pass ? com/sun/media/sound/SoftChannel/ProgramChange.java > --- ? ?pass ? com/sun/media/sound/SoftChannel/ResetAllControllers.java > --- ? ?pass ? com/sun/media/sound/SoftChannel/Solo.java > --- ? ?pass ? com/sun/media/sound/SoftCubicResampler/Interpolate.java > --- ? ?pass ? com/sun/media/sound/SoftFilter/TestProcessAudio.java > --- ? ?pass ? com/sun/media/sound/SoftLanczosResampler/Interpolate.java > --- ? ?pass ? com/sun/media/sound/SoftLimiter/ProcessAudio_replace_mix.java > --- ? ?pass > com/sun/media/sound/SoftLimiter/ProcessAudio_replace_mix_mono.java > --- ? ?pass > com/sun/media/sound/SoftLimiter/ProcessAudio_replace_mix_mono_overdrive.java > --- ? ?pass > com/sun/media/sound/SoftLimiter/ProcessAudio_replace_mix_overdrive.java > --- ? ?pass > com/sun/media/sound/SoftLimiter/ProcessAudio_replace_normal.java > --- ? ?pass > com/sun/media/sound/SoftLimiter/ProcessAudio_replace_normal_mono.java > --- ? ?pass > com/sun/media/sound/SoftLimiter/ProcessAudio_replace_overdrive.java > --- ? ?pass > com/sun/media/sound/SoftLimiter/ProcessAudio_replace_overdrive_mono.java > --- ? ?pass ? com/sun/media/sound/SoftLinearResampler/Interpolate.java > --- ? ?pass ? com/sun/media/sound/SoftLinearResampler2/Interpolate.java > --- ? ?pass > com/sun/media/sound/SoftLowFrequencyOscillator/TestProcessControlLogic.java > --- ? ?pass ? com/sun/media/sound/SoftPointResampler/Interpolate.java > --- ? ?pass ? com/sun/media/sound/SoftProvider/GetDevice.java > --- ? ?pass ? com/sun/media/sound/SoftReceiver/Close.java > --- ? ?pass ? com/sun/media/sound/SoftReceiver/Send_ActiveSense.java > --- ? ?pass ? com/sun/media/sound/SoftReceiver/Send_AllNotesOff.java > --- ? ?pass ? com/sun/media/sound/SoftReceiver/Send_AllSoundOff.java > --- ? ?pass ? com/sun/media/sound/SoftReceiver/Send_ChannelPressure.java > --- ? ?pass ? com/sun/media/sound/SoftReceiver/Send_Controller.java > --- ? ?pass ? com/sun/media/sound/SoftReceiver/Send_Mono.java > --- ? ?pass ? com/sun/media/sound/SoftReceiver/Send_NoteOff.java > --- ? ?pass ? com/sun/media/sound/SoftReceiver/Send_NoteOn.java > --- ? ?pass ? com/sun/media/sound/SoftReceiver/Send_NoteOn_AllChannels.java > --- ? ?pass ? com/sun/media/sound/SoftReceiver/Send_NoteOn_Delayed.java > --- ? ?pass ? com/sun/media/sound/SoftReceiver/Send_NoteOn_Multiple.java > --- ? ?pass ? com/sun/media/sound/SoftReceiver/Send_Omni.java > --- ? ?pass ? com/sun/media/sound/SoftReceiver/Send_PitchBend.java > --- ? ?pass ? com/sun/media/sound/SoftReceiver/Send_PolyPressure.java > --- ? ?pass ? com/sun/media/sound/SoftReceiver/Send_ProgramChange.java > --- ? ?pass ? com/sun/media/sound/SoftReceiver/Send_ResetAllControllers.java > --- ? ?pass ? com/sun/media/sound/SoftSincResampler/Interpolate.java > --- ? ?pass ? com/sun/media/sound/SoftSynthesizer/Close.java > --- ? ?pass > com/sun/media/sound/SoftSynthesizer/GetAvailableInstruments.java > --- ? ?pass ? com/sun/media/sound/SoftSynthesizer/GetChannels.java > --- ? ?pass ? com/sun/media/sound/SoftSynthesizer/GetDefaultSoundbank.java > --- ? ?pass ? com/sun/media/sound/SoftSynthesizer/GetDeviceInfo.java > --- ? ?pass ? com/sun/media/sound/SoftSynthesizer/GetLatency.java > --- ? ?pass ? com/sun/media/sound/SoftSynthesizer/GetLoadedInstruments.java > --- ? ?pass ? com/sun/media/sound/SoftSynthesizer/GetMaxPolyphony.java > --- ? ?pass ? com/sun/media/sound/SoftSynthesizer/GetMaxReceivers.java > --- ? ?pass ? com/sun/media/sound/SoftSynthesizer/GetMaxTransmitters.java > --- ? ?pass > com/sun/media/sound/SoftSynthesizer/GetMicrosecondPosition.java > --- ? ?pass ? com/sun/media/sound/SoftSynthesizer/GetReceiver.java > --- ? ?pass ? com/sun/media/sound/SoftSynthesizer/GetReceiver2.java > --- ? ?pass ? com/sun/media/sound/SoftSynthesizer/GetReceivers.java > --- ? ?pass ? com/sun/media/sound/SoftSynthesizer/GetTransmitter.java > --- ? ?pass ? com/sun/media/sound/SoftSynthesizer/GetTransmitters.java > --- ? ?pass ? com/sun/media/sound/SoftSynthesizer/GetVoiceStatus.java > --- ? ?pass ? com/sun/media/sound/SoftSynthesizer/ImplicitOpenClose.java > --- ? ?pass ? com/sun/media/sound/SoftSynthesizer/IsOpen.java > --- ? ?pass ? com/sun/media/sound/SoftSynthesizer/IsSoundbankSupported.java > --- ? ?pass ? com/sun/media/sound/SoftSynthesizer/LoadAllInstruments.java > --- ? ?pass ? com/sun/media/sound/SoftSynthesizer/LoadInstrument.java > --- ? ?pass ? com/sun/media/sound/SoftSynthesizer/LoadInstruments.java > --- ? ?pass ? com/sun/media/sound/SoftSynthesizer/Open.java > --- ? ?pass ? com/sun/media/sound/SoftSynthesizer/OpenStream.java > --- ? ?pass ? com/sun/media/sound/SoftSynthesizer/RemapInstrument.java > --- ? ?pass ? com/sun/media/sound/SoftSynthesizer/TestRender1.java > --- ? ?pass ? com/sun/media/sound/SoftSynthesizer/UnloadAllInstruments.java > --- ? ?pass ? com/sun/media/sound/SoftSynthesizer/UnloadInstrument.java > --- ? ?pass ? com/sun/media/sound/SoftSynthesizer/UnloadInstruments.java > --- ? ?pass ? com/sun/media/sound/SoftTuning/GetName.java > --- ? ?pass ? com/sun/media/sound/SoftTuning/GetTuning.java > --- ? ?pass ? com/sun/media/sound/SoftTuning/GetTuningInt.java > --- ? ?pass ? com/sun/media/sound/SoftTuning/Load1.java > --- ? ?pass ? com/sun/media/sound/SoftTuning/Load2.java > --- ? ?pass ? com/sun/media/sound/SoftTuning/Load4.java > --- ? ?pass ? com/sun/media/sound/SoftTuning/Load5.java > --- ? ?pass ? com/sun/media/sound/SoftTuning/Load6.java > --- ? ?pass ? com/sun/media/sound/SoftTuning/Load7.java > --- ? ?pass ? com/sun/media/sound/SoftTuning/Load8.java > --- ? ?pass ? com/sun/media/sound/SoftTuning/Load9.java > --- ? ?pass ? com/sun/media/sound/SoftTuning/NewSoftTuning.java > --- ? ?pass ? com/sun/media/sound/SoftTuning/NewSoftTuningByteArray.java > --- ? ?pass ? com/sun/media/sound/SoftTuning/NewSoftTuningPatch.java > --- ? ?pass > com/sun/media/sound/SoftTuning/NewSoftTuningPatchByteArray.java > pass ? error ?com/sun/net/httpserver/Test12.java > fail ? pass ? com/sun/net/httpserver/bugs/B6361557.java > --- ? ?pass > com/sun/org/apache/xml/internal/serializer/XMLStackOverflowBug.java > fail ? pass ? com/sun/org/apache/xml/internal/ws/server/Test.java > pass ? fail ? demo/jvmti/mtrace/TraceJFrame.java > --- ? ?fail ? demo/nio/ZipFileSystem/sanity.sh > pass ? fail > java/awt/Choice/ChoiceKeyEventReaction/ChoiceKeyEventReaction.html > pass ? fail ? java/awt/Choice/UnfocusableToplevel/UnfocusableToplevel.java > pass ? fail ? java/awt/Component/F10TopToplevel/F10TopToplevel.html > pass ? fail > java/awt/Dialog/DialogOverflowSizeTest/DialogSizeOverflowTest.java > pass ? fail > java/awt/Dialog/NonResizableDialogSysMenuResize/NonResizableDialogSysMenuResize.java > pass ? fail ? java/awt/FileDialog/FilenameFilterTest/FilenameFilterTest.html > pass ? fail > java/awt/Focus/DeiconifiedFrameLoosesFocus/DeiconifiedFrameLoosesFocus.html > pass ? fail > java/awt/Focus/FocusEmbeddedFrameTest/FocusEmbeddedFrameTest.java > pass ? fail ? java/awt/Focus/FrameMinimizeTest/FrameMinimizeTest.java > pass ? fail ? java/awt/Focus/InputVerifierTest3/InputVerifierTest3.java > pass ? fail > java/awt/Focus/ModalBlockedStealsFocusTest/ModalBlockedStealsFocusTest.html > pass ? fail > java/awt/Focus/RequestFocusAndHideTest/RequestFocusAndHideTest.java > pass ? fail > java/awt/Focus/RequestOnCompWithNullParent/RequestOnCompWithNullParent1.java > pass ? fail > java/awt/Focus/RestoreFocusOnDisabledComponentTest/RestoreFocusOnDisabledComponentTest.java > pass ? fail > java/awt/Focus/WindowInitialFocusTest/WindowInitialFocusTest.html > pass ? fail ? java/awt/FontClass/CreateFont/BigFont.java > pass ? fail ? java/awt/Frame/DynamicLayout/DynamicLayout.java > --- ? ?fail ? java/awt/Frame/FrameSize/TestFrameSize.java > pass ? fail ? java/awt/Frame/LayoutOnMaximizeTest/LayoutOnMaximizeTest.java > pass ? fail ? java/awt/Frame/MaximizedToIconified/MaximizedToIconified.java > pass ? fail > java/awt/Frame/ShownOffScreenOnWin98/ShownOffScreenOnWin98Test.java > pass ? fail > java/awt/Frame/UnfocusableMaximizedFrameResizablity/UnfocusableMaximizedFrameResizablity.java > pass ? fail ? java/awt/GridLayout/LayoutExtraGaps/LayoutExtraGaps.java > pass ? fail ? java/awt/Insets/CombinedTestApp1.java > pass ? fail > java/awt/KeyboardFocusmanager/TypeAhead/ButtonActionKeyTest/ButtonActionKeyTest.html > pass ? fail > java/awt/KeyboardFocusmanager/TypeAhead/MenuItemActivatedTest/MenuItemActivatedTest.html > pass ? fail ? java/awt/List/ActionAfterRemove/ActionAfterRemove.java > pass ? fail ? java/awt/List/SingleModeDeselect/SingleModeDeselect.java > pass ? fail ? java/awt/Mixing/setComponentZOrder.java > pass ? fail ? java/awt/Modal/LWModalTest/LWModalTest.java > pass ? fail ? java/awt/Modal/NpeOnClose/NpeOnCloseTest.java > pass ? fail ? java/awt/Modal/SupportedTest/SupportedTest.java > pass ? fail ? java/awt/Mouse/TitleBarDoubleClick/TitleBarDoubleClick.html > pass ? fail ? java/awt/Multiscreen/UpdateGCTest/UpdateGCTest.java > pass ? fail ? java/awt/Multiscreen/WPanelPeerPerf/WPanelPeerPerf.java > pass ? fail > java/awt/Multiscreen/WindowGCChangeTest/WindowGCChangeTest.html > pass ? fail ? java/awt/PrintJob/MultipleEnd/MultipleEnd.java > pass ? fail ? java/awt/PrintJob/PrintArcTest/PrintArcTest.java > pass ? fail > java/awt/PrintJob/QuoteAndBackslashTest/QuoteAndBackslashTest.java > pass ? fail ? java/awt/PrintJob/RoundedRectTest/RoundedRectTest.java > pass ? fail ? java/awt/Toolkit/AutoShutdown/ShowExitTest/ShowExitTest.sh > pass ? fail ? java/awt/Toolkit/RealSync/RealSyncOnEDT.java > pass ? fail ? java/awt/Toolkit/ScreenInsetsTest/ScreenInsetsTest.java > pass ? fail > java/awt/TrayIcon/ProtectedModeCrashTest/ProtectedModeCrashTest.java > pass ? fail ? java/awt/Window/AlwaysOnTop/AlwaysOnTopEvenOfWindow.java > pass ? fail > java/awt/Window/PropertyChangeListenerLockSerialization/PropertyChangeListenerLockSerialization.java > pass ? fail ? java/awt/event/KeyEvent/KeyTyped/CtrlASCII.html > pass ? fail > java/awt/event/MouseEvent/EventTimeInFuture/EventTimeInFuture.java > pass ? fail > java/awt/event/MouseEvent/FrameMouseEventAbsoluteCoordsTest/FrameMouseEventAbsoluteCoordsTest.html > pass ? fail > java/awt/event/MouseEvent/MenuDragMouseEventAbsoluteCoordsTest/MenuDragMouseEventAbsoluteCoordsTest.html > pass ? fail > java/awt/event/MouseEvent/MouseWheelEventAbsoluteCoordsTest/MouseWheelEventAbsoluteCoordsTest.html > pass ? fail ? java/beans/PropertyEditor/TestColorClass.java > pass ? fail ? java/beans/PropertyEditor/TestColorClassJava.java > pass ? fail ? java/beans/PropertyEditor/TestColorClassNull.java > pass ? fail ? java/beans/PropertyEditor/TestColorClassValue.java > pass ? fail ? java/beans/PropertyEditor/TestFontClass.java > pass ? fail ? java/beans/PropertyEditor/TestFontClassJava.java > pass ? fail ? java/beans/PropertyEditor/TestFontClassNull.java > pass ? fail ? java/beans/PropertyEditor/TestFontClassValue.java > pass ? fail ? java/beans/XMLEncoder/java_awt_ScrollPane.java > pass ? fail ? java/io/File/isDirectory/Applet.java > pass ? fail ? java/io/Serializable/resolveClass/deserializeButton/run.sh > --- ? ?pass > java/lang/annotation/AnnotationTypeMismatchException/FoundType.java > --- ? ?pass ? java/lang/annotation/Missing/MissingTest.java > --- ? ?pass ? java/lang/annotation/RecursiveAnnotation.java > --- ? ?pass ? java/lang/annotation/UnitTest.java > --- ? ?pass ? java/lang/annotation/loaderLeak/Main.java > --- ? ?pass ? java/lang/annotation/package-info.java > pass ? fail ? java/net/Socket/TrafficClass.java > fail ? pass ? java/net/ipv6tests/TcpTest.java > pass ? --- ? ?java/nio/channels/DatagramChannel/AdaptDatagramSocket.java > pass ? error ?java/nio/channels/Selector/Connect.java > pass ? fail ? java/nio/channels/Selector/OpRead.java > pass ? fail ? java/nio/channels/SocketChannel/AdaptSocket.java > pass ? fail ? java/security/KeyPairGenerator/Failover.java > --- ? ?pass ? java/text/Bidi/BidiBug.java > --- ? ?pass ? java/text/Bidi/BidiEmbeddingTest.java > --- ? ?pass ? java/text/Bidi/BidiSurrogateTest.java > pass ? fail ? java/util/ResourceBundle/RestrictedBundleTest.java > --- ? ?pass ? java/util/TimeZone/TimeZoneDatePermissionCheck.sh > fail ? --- ? ?javax/print/attribute/PSCopiesFlavorTest.java > pass ? fail ? javax/sound/midi/Gervill/SoftChannel/NoteOverFlowTest2.java > pass ? fail ? javax/sound/midi/Gervill/SoftReceiver/GetMidiDevice.java > pass ? fail > javax/sound/midi/Gervill/SoftSynthesizer/TestPreciseTimestampRendering.java > pass ? fail ? javax/swing/JTextArea/Test6593649.java > --- ? ?fail ? org/classpath/icedtea/java/io/Inputs/Basic.java > --- ? ?fail > org/classpath/icedtea/java/nio/channels/AsynchronousChannelGroup/Basic.java > --- ? ?fail > org/classpath/icedtea/java/nio/channels/AsynchronousChannelGroup/GroupOfOne.java > --- ? ?fail > org/classpath/icedtea/java/nio/channels/AsynchronousChannelGroup/Identity.java > --- ? ?fail > org/classpath/icedtea/java/nio/channels/AsynchronousChannelGroup/Restart.java > --- ? ?fail > org/classpath/icedtea/java/nio/channels/AsynchronousChannelGroup/Unbounded.java > --- ? ?pass > org/classpath/icedtea/java/nio/channels/AsynchronousChannelGroup/run_any_task.sh > --- ? ?fail > org/classpath/icedtea/java/nio/channels/AsynchronousDatagramChannel/Basic.java > --- ? ?fail > org/classpath/icedtea/java/nio/channels/AsynchronousFileChannel/Basic.java > --- ? ?fail > org/classpath/icedtea/java/nio/channels/AsynchronousFileChannel/CustomThreadPool.java > --- ? ?fail > org/classpath/icedtea/java/nio/channels/AsynchronousFileChannel/Lock.java > --- ? ?fail > org/classpath/icedtea/java/nio/channels/AsynchronousServerSocketChannel/Basic.java > --- ? ?fail > org/classpath/icedtea/java/nio/channels/AsynchronousServerSocketChannel/WithSecurityManager.java > --- ? ?fail > org/classpath/icedtea/java/nio/channels/AsynchronousSocketChannel/Basic.java > --- ? ?fail > org/classpath/icedtea/java/nio/channels/AsynchronousSocketChannel/Leaky.java > --- ? ?fail ? org/classpath/icedtea/java/nio/channels/Channels/Basic2.java > --- ? ?fail > org/classpath/icedtea/java/nio/channels/spi/AsynchronousChannelProvider/custom_provider.sh > --- ? ?fail ? org/classpath/icedtea/java/nio/file/DirectoryStream/Basic.java > --- ? ?fail > org/classpath/icedtea/java/nio/file/DirectoryStream/Filters.java > --- ? ?fail > org/classpath/icedtea/java/nio/file/DirectoryStream/SecureDS.java > --- ? ?fail ? org/classpath/icedtea/java/nio/file/FileStore/Basic.java > --- ? ?fail ? org/classpath/icedtea/java/nio/file/FileSystem/Basic.java > --- ? ?fail ? org/classpath/icedtea/java/nio/file/Files/ForceLoad.java > --- ? ?fail ? org/classpath/icedtea/java/nio/file/Files/Misc.java > --- ? ?fail ? org/classpath/icedtea/java/nio/file/Files/content_type.sh > --- ? ?fail ? org/classpath/icedtea/java/nio/file/Files/walk_file_tree.sh > --- ? ?fail ? org/classpath/icedtea/java/nio/file/Path/CopyAndMove.java > --- ? ?fail ? org/classpath/icedtea/java/nio/file/Path/InterruptCopy.java > --- ? ?fail ? org/classpath/icedtea/java/nio/file/Path/Links.java > --- ? ?fail ? org/classpath/icedtea/java/nio/file/Path/Misc.java > --- ? ?fail ? org/classpath/icedtea/java/nio/file/Path/PathOps.java > --- ? ?fail ? org/classpath/icedtea/java/nio/file/Path/SBC.java > --- ? ?fail ? org/classpath/icedtea/java/nio/file/Path/UriImportExport.java > --- ? ?fail ? org/classpath/icedtea/java/nio/file/Path/delete_on_close.sh > --- ? ?fail ? org/classpath/icedtea/java/nio/file/Path/temporary_files.sh > --- ? ?fail ? org/classpath/icedtea/java/nio/file/PathMatcher/Basic.java > --- ? ?fail ? org/classpath/icedtea/java/nio/file/WatchService/Basic.java > --- ? ?fail > org/classpath/icedtea/java/nio/file/WatchService/FileTreeModifier.java > --- ? ?fail > org/classpath/icedtea/java/nio/file/WatchService/WithSecurityManager.java > --- ? ?fail > org/classpath/icedtea/java/nio/file/attribute/AclFileAttributeView/Basic.java > --- ? ?fail > org/classpath/icedtea/java/nio/file/attribute/Attributes/Basic.java > --- ? ?fail > org/classpath/icedtea/java/nio/file/attribute/BasicFileAttributeView/Basic.java > --- ? ?fail > org/classpath/icedtea/java/nio/file/attribute/DosFileAttributeView/Basic.java > --- ? ?fail > org/classpath/icedtea/java/nio/file/attribute/FileStoreAttributeView/Basic.java > --- ? ?fail > org/classpath/icedtea/java/nio/file/attribute/NamedAttributeView/Basic.java > --- ? ?fail > org/classpath/icedtea/java/nio/file/attribute/PosixFileAttributeView/Basic.java > --- ? ?fail > org/classpath/icedtea/java/nio/file/spi/SetDefaultProvider.java > error ?fail ? sun/java2d/OpenGL/GradientPaints.java > pass ? error > ?sun/java2d/cmm/ColorConvertOp/ConstructorsNullTest/ConstructorsNullTest.html > pass ? --- ? ?sun/net/idn/TestStringPrep.java > --- ? ?pass ? sun/pisces/MiterInternalCloseJointTest.java > --- ? ?pass ? sun/pisces/MiterInternalJointTest.java > fail ? pass ? sun/rmi/transport/proxy/EagerHttpFallback.java > pass ? fail ? sun/security/pkcs11/ec/ReadCertificates.java > pass ? fail ? sun/security/pkcs11/ec/ReadPKCS12.java > pass ? fail ? sun/security/pkcs11/ec/TestCurves.java > pass ? fail ? sun/security/pkcs11/ec/TestECDH.java > pass ? fail ? sun/security/pkcs11/ec/TestECDSA.java > pass ? fail ? sun/security/pkcs11/ec/TestECGenSpec.java > pass ? fail ? sun/security/pkcs11/ec/TestKeyFactory.java > pass ? fail ? sun/security/pkcs11/sslecc/ClientJSSEServerJSSE.java > pass ? fail ? sun/security/pkcs11/tls/TestPRF.java > pass ? fail > sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/TestAllSuites.java > pass ? fail ? sun/security/ssl/sanity/ciphersuites/CheckCipherSuites.java > pass ? fail ? sun/security/ssl/sanity/interop/ClientJSSEServerJSSE.java > fail ? pass ? sun/tools/jhat/HatHeapDump1Test.java > --- ? ?pass ? sun/tools/jrunscript/Testjrunscript.java > pass ? --- ? ?sun/tools/jrunscript/jrunscriptTest.sh > fail ? pass ? sun/tools/native2ascii/NativeErrors.java > pass ? --- ? ?tools/pack200/MemoryAllocatorTest.java > > 405 differences > > Ah I see the Gervill tests have moved to javax/sound/midi/Gervill. I think we should just drop the IcedTea6 duplicate now. Mosts of the tests do seem to be related to the NIO2 backport or enabling NSS (I assume you don't turn on the later either). There are some interesting passes on IcedTea that I assume we patch locally still. I presume you also have the proprietary SNMP plugs which we obviously don't use. In general, looks good to me too. Let's ship b17. -- Andrew :-) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint: F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From Joe.Darcy at Sun.COM Thu Oct 8 13:38:58 2009 From: Joe.Darcy at Sun.COM (Joseph D. Darcy) Date: Thu, 08 Oct 2009 13:38:58 -0700 Subject: b17 In-Reply-To: <17c6771e0910080648n31367bfcn8a673ba780c91d23@mail.gmail.com> References: <17c6771e0909290504u46e7536cjc5b477cd693c2fce@mail.gmail.com> <17c6771e0910020610p14bb8ad0gb532205830108083@mail.gmail.com> <4AC63861.1090400@sun.com> <17c6771e0910021520t7af0582m10830585e1101669@mail.gmail.com> <4ACA6A26.4050003@sun.com> <17c6771e0910061047y46200811yb3b34f850e20bd70@mail.gmail.com> <4ACBDF1E.8060402@sun.com> <17c6771e0910070220u5e8f45d9jec9bf7ab8434be48@mail.gmail.com> <17c6771e0910070224l7d7eb2daifdb7f9b0669068ad@mail.gmail.com> <4ACD1A40.8070605@sun.com> <17c6771e0910080648n31367bfcn8a673ba780c91d23@mail.gmail.com> Message-ID: <4ACE4DE2.1010808@sun.com> Andrew John Hughes wrote: > 2009/10/7 Joe Darcy : > >> Andrew John Hughes wrote: >> >>> 2009/10/7 Andrew John Hughes : >>> >>> >>>> 2009/10/7 Joe Darcy : >>>> >>>> >>>>> Andrew John Hughes wrote: >>>>> >>>>> >>>>>> 2009/10/5 Joseph D. Darcy : >>>>>> >>>>>> >>>>>> >>>>> [big snip] >>>>> >>>>> >>>>>>> Hello. >>>>>>> >>>>>>> Any results for the jdk/test regression tests? >>>>>>> >>>>>>> -Joe >>>>>>> >>>>>>> >>>>>>> >>>>>>> >>>>>> JDK: Test results: passed: 3,269; failed: 168; error: 3 >>>>>> >>>>>> The failed seems high, the number of errors matches our usual JTreg >>>>>> runs. I'll have to take a closer look but I don't usually do runs on >>>>>> this box. What were your own results like for OpenJDK6 b17? >>>>>> >>>>>> >>>>>> >>>>> My results for building OpenJDK 6 on Ubuntu 9.04 x64 and running tests >>>>> there >>>>> are: >>>>> >>>>> hotspot/test: >>>>> Test results: passed: 24 >>>>> >>>>> langtools/test: >>>>> Test results: passed: 1354 >>>>> >>>>> jdk/test: >>>>> Test results: passed: 3,100; failed: 43; error: 1 >>>>> >>>>> All test suites were run with "-a -ignore:quiet"; in addition, langtools >>>>> was >>>>> run with "-s". >>>>> >>>>> I've uploaded my summary.txt files to: >>>>> http://cr.openjdk.java.net/~darcy/OpenJDK6-jtreg-pre-b17/ >>>>> >>>>> (The jdk tests were run a bit differently than my usual test setup where >>>>> I >>>>> point the graphical tests into a virtual framefer. In this case, I just >>>>> ran >>>>> the tests without redirecting the graphics.) >>>>> >>>>> I haven't looked at the IcedTea patch set recently; if the Gervill sound >>>>> tests are still being duplicated, I think the IcedTea copies can be >>>>> removed >>>>> at this point since Karl is keeping the OpenJDK 6 copy of the code and >>>>> tests >>>>> up-to-date. >>>>> >>>>> -Joe >>>>> >>>>> >>>>> >>>> Ok, the majority of JDK failures I'm seeing are not an issue; they are >>>> either compile failures from the optional NIO2 backport in IcedTea6 or >>>> headless exceptions for the AWT/Swing stuff. The former are known to >>>> fail, as I just haven't had time to backport the tests. This isn't a >>>> major issue as most IcedTea6 builds don't enable the backport anyway. >>>> The headless exceptions are also expected given the tests were run in >>>> screen without any virtual framebuffer. Perhaps we should have the >>>> check-jdk target use Xvfb by default? >>>> >>>> Two Gervill tests fail: >>>> >>>> javax/sound/midi/Gervill/SoftReceiver/GetMidiDevice.java (compile >>>> failure) >>>> javax/sound/midi/Gervill/SoftChannel/NoteOverFlowTest2.java : >>>> IndexOutOfBounds >>>> >>>> The rest seem to be related to java.beans (can't find java.awt.Color >>>> -- possibly a headless issue again) or crypto (having ECC enabled >>>> seems to cause additional failures). >>>> >>>> I don't think there's anything that's a stopper for b17, especially as >>>> your results seem pretty good (and the failures seem the same as we've >>>> seen). We just need to make some decisions on how to resolve the >>>> differences between the IcedTea6 and plain OpenJDK6 builds. >>>> >>>> What do you think? >>>> -- >>>> Andrew :-) >>>> >>>> Free Java Software Engineer >>>> Red Hat, Inc. (http://www.redhat.com) >>>> >>>> Support Free Java! >>>> Contribute to GNU Classpath and the OpenJDK >>>> http://www.gnu.org/software/classpath >>>> http://openjdk.java.net >>>> >>>> PGP Key: 94EFD9D8 (http://subkeys.pgp.net) >>>> Fingerprint: F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 >>>> >>>> >>>> >>> My results are being pushed to http://cr.openjdk.java.net/~andrew/jdk/ >>> now. Should be there shortly. >>> >>> >> Hello. >> >> Below is the jtdiff between my OpenJDK 6 test/jdk regression tests and your >> IcedTea test/jdk tests. >> >> Most of the additional passes are the duplicated Gervill tests and most of >> the failures differences are from the awt configuration issue (and the nio2 >> backport). >> >> So I think this looks pretty good. >> >> -Joe >> >> 0: 6-open/summary.txt pass: 3,100; fail: 43; error: 1 >> 1: IcedTea/summary.txt pass: 3,269; fail: 168; error: 3 >> [snip] >> 405 differences >> >> >> > > Ah I see the Gervill tests have moved to javax/sound/midi/Gervill. I > think we should just drop the IcedTea6 duplicate now. > > Mosts of the tests do seem to be related to the NIO2 backport or > enabling NSS (I assume you don't turn on the later either). > There are some interesting passes on IcedTea that I assume we patch > locally still. I presume you also have the proprietary SNMP plugs > which we obviously don't use. > No, OpenJDK 6 is all-open all the time; no proprietary anything :-) > In general, looks good to me too. Let's ship b17. > Agreed; time to ship! -Joe From bugzilla-daemon at icedtea.classpath.org Thu Oct 8 13:55:27 2009 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 08 Oct 2009 20:55:27 +0000 Subject: [Bug 389] New: Iced Tea 1.11, openjdk7 compilation issue in Suse Linux Enterprise Server 11 Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=389 Summary: Iced Tea 1.11, openjdk7 compilation issue in Suse Linux Enterprise Server 11 Product: IcedTea Version: unspecified Platform: Other OS/Version: Linux Status: NEW Severity: major Priority: P2 Component: IcedTea AssignedTo: unassigned at icedtea.classpath.org ReportedBy: balajiraman at ge.com Summary: During compilation of iced tea open jdk 7 in Suse Linux 64 bit machine, two errors consistently happen. One is related to generics in java file on tracing package and the other is related to open gl definitions in .h file apparently missing. Workarounds exist to go ahead with the build, but has to be performed manually, which is tedious. The ./configure command used is as follows: ./configure --build=x86_64 --with-ant-home=/home/user/openjdk7/apache-ant-1.7.1 --with-jdk-home=/usr/java/jdk1.6.0_10 --with-xalan2-jar=/home/user/openjdk7/xalan-j_2_7_1/xalan.jar --with-xalan2-serializer-jar=/home/user/openjdk7/xalan-j_2_7_1/serializer.jar --with-xerces2-jar=/home/user/openjdk7/xalan-j_2_7_1/xercesImpl.jar --with-rhino=/home/user/openjdk7/rhino1_7R2/js.jar --disable-plugin OS: SuSE Linux, x86_64 Iced Tea version 1.11 Built java version "1.7.0_0-icedtea" OpenJDK Runtime Environment (IcedTea7 1.11) (build 1.7.0_0-icedtea-b66) OpenJDK 64-Bit Server VM (build 16.0-b06, mixed mode) Two errors found during compilation of open jdk 7. Error 1: Compilation error in the following java files. /export/home/sdc/openjdk7/secondrun/icedtea-1.11/bootstrap/jdk1.6.0/bin/javac -J-XX:ThreadStackSize=1536 -J-XX:-PrintVMOptions -J-XX:+UnlockDiagnosticVMOptions -J-XX:-LogVMOutput -J-Xmx896m -J-Xms128m -J-XX:PermSize=32m -J-XX:MaxPermSize=160m -g -source 5 -target 5 -encoding ascii -classpath /usr/java/jdk1.6.0_10/jre/lib/rt.jar -Xbootclasspath:/export/home/sdc/openjdk7/secondrun/icedtea-1.11/openjdk-ecj/build/linux-amd64/classes -sourcepath /export/home/sdc/openjdk7/secondrun/icedtea-1.11/generated:../../../src/solaris/classes:../../../src/share/classes -bootclasspath /export/home/sdc/openjdk7/secondrun/icedtea-1.11/bootstrap/jdk1.7.0/jre/lib/rt-closed.jar::/export/home/sdc/openjdk7/secondrun/icedtea-1.11/openjdk-ecj/build/linux-amd64/classes -d /export/home/sdc/openjdk7/secondrun/icedtea-1.11/openjdk-ecj/build/linux-amd64/classes @/export/home/sdc/openjdk7/secondrun/icedtea-1.11/openjdk-ecj/build/linux-amd64/tmp/sun/sun.tracing/.classes.list ../../../src/share/classes/sun/tracing/NullProviderFactory.java:63: type parameters of T cannot be determined; no unique maximal instance exists for type variable T with upper bounds T,com.sun.tracing.Provider return provider.newProxyInstance(); ^ ../../../src/share/classes/sun/tracing/MultiplexProviderFactory.java:75: type parameters of T cannot be determined; no unique maximal instance exists for type variable T with upper bounds T,com.sun.tracing.Provider return provider.newProxyInstance(); ^ ../../../src/share/classes/sun/tracing/dtrace/DTraceProviderFactory.java:81: type parameters of T cannot be determined; no unique maximal instance exists for type variable T with upper bounds T,com.sun.tracing.Provider T proxy = jsdt.newProxyInstance(); ^ ../../../src/share/classes/sun/tracing/PrintStreamProviderFactory.java:64: type parameters of T cannot be determined; no unique maximal instance exists for type variable T with upper bounds T,com.sun.tracing.Provider return provider.newProxyInstance(); WORKAROUND: Need to remove the generics syntax to compile. Error 2: Definition not found in .h files ../../../src/share/native/sun/java2d/opengl/OGLContext.c: In function 'OGLContext_GetExtensionInfo': ../../../src/share/native/sun/java2d/opengl/OGLContext.c:872: error: 'sun_java2d_opengl_OGLContext_00024OGLContextCaps_CAPS_EXT_TEXRECT' undeclared (first use in this function) ../../../src/share/native/sun/java2d/opengl/OGLContext.c:872: error: (Each undeclared identifier is reported only once ../../../src/share/native/sun/java2d/opengl/OGLContext.c:872: error: for each function it appears in.) ../../../src/share/native/sun/java2d/opengl/OGLContext.c:875: error: 'sun_java2d_opengl_OGLContext_00024OGLContextCaps_CAPS_EXT_FBOBJECT' undeclared (first use in this function) ../../../src/share/native/sun/java2d/opengl/OGLContext.c:878: error: 'sun_java2d_opengl_OGLContext_00024OGLContextCaps_CAPS_EXT_LCD_SHADER' undeclared (first use in this function) ../../../src/share/native/sun/java2d/opengl/OGLContext.c:881: error: 'sun_java2d_opengl_OGLContext_00024OGLContextCaps_CAPS_EXT_BIOP_SHADER' undeclared (first use in this function) ../../../src/share/native/sun/java2d/opengl/OGLContext.c:884: error: 'sun_java2d_opengl_OGLContext_00024OGLContextCaps_CAPS_EXT_GRAD_SHADER' undeclared (first use in this function) ../../../src/share/native/sun/java2d/opengl/OGLContext.c: In function 'Java_sun_java2d_opengl_OGLContext_getOGLIdString': ../../../src/share/native/sun/java2d/opengl/OGLContext.c:1051: warning: implicit declaration of function 'jio_snprintf' make[6]: *** [/export/home/sdc/openjdk7/secondrun/icedtea-1.11/openjdk-ecj/build/linux-amd64/tmp/sun/sun.awt.X11/xawt/obj64/OGLContext.o] WORKAROUND: Need to manually edit the .h files to resolve the compilation issues. REPRODUCIBLE: YES -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From bugzilla-daemon at icedtea.classpath.org Thu Oct 8 16:39:41 2009 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 08 Oct 2009 23:39:41 +0000 Subject: [Bug 389] Iced Tea 1.11, openjdk7 compilation issue in Suse Linux Enterprise Server 11 Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=389 gnu_andrew at member.fsf.org changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED Resolution| |INVALID ------- Comment #1 from gnu_andrew at member.fsf.org 2009-10-08 23:39 ------- What is /usr/java/jdk1.6.0_10? Is this the proprietary Sun JDK? We don't support building with this JDK. You should be using either GCJ or IcedTea. As documented in the NEWS file of IcedTea7 1.11, you should use the --disable-bootstrap mode of operation when building with IcedTea as there are still some issues that need to be resolved with using it to bootstrap. I suspect that the OpenGL header issues may be one of these problems as they are currently patched unconditionally to match the output from gjavah as supplied with GCJ. I've never seen the tracing issue before and can't really suggest anything as we don't know what is in the proprietary JDK. Please use a supported JDK and see if the same errors occur. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From gnu_andrew at member.fsf.org Thu Oct 8 16:45:20 2009 From: gnu_andrew at member.fsf.org (Andrew John Hughes) Date: Fri, 9 Oct 2009 00:45:20 +0100 Subject: b17 In-Reply-To: <4ACE4DE2.1010808@sun.com> References: <17c6771e0909290504u46e7536cjc5b477cd693c2fce@mail.gmail.com> <17c6771e0910021520t7af0582m10830585e1101669@mail.gmail.com> <4ACA6A26.4050003@sun.com> <17c6771e0910061047y46200811yb3b34f850e20bd70@mail.gmail.com> <4ACBDF1E.8060402@sun.com> <17c6771e0910070220u5e8f45d9jec9bf7ab8434be48@mail.gmail.com> <17c6771e0910070224l7d7eb2daifdb7f9b0669068ad@mail.gmail.com> <4ACD1A40.8070605@sun.com> <17c6771e0910080648n31367bfcn8a673ba780c91d23@mail.gmail.com> <4ACE4DE2.1010808@sun.com> Message-ID: <17c6771e0910081645j82bade1paac3ff21cbe56156@mail.gmail.com> 2009/10/8 Joseph D. Darcy : > Andrew John Hughes wrote: >> >> 2009/10/7 Joe Darcy : >> >>> >>> Andrew John Hughes wrote: >>> >>>> >>>> 2009/10/7 Andrew John Hughes : >>>> >>>> >>>>> >>>>> 2009/10/7 Joe Darcy : >>>>> >>>>> >>>>>> >>>>>> Andrew John Hughes wrote: >>>>>> >>>>>> >>>>>>> >>>>>>> 2009/10/5 Joseph D. Darcy : >>>>>>> >>>>>>> >>>>>>> >>>>>> >>>>>> [big snip] >>>>>> >>>>>> >>>>>>>> >>>>>>>> Hello. >>>>>>>> >>>>>>>> Any results for the jdk/test regression tests? >>>>>>>> >>>>>>>> -Joe >>>>>>>> >>>>>>>> >>>>>>>> >>>>>>>> >>>>>>> >>>>>>> JDK: Test results: passed: 3,269; failed: 168; error: 3 >>>>>>> >>>>>>> The failed seems high, the number of errors matches our usual JTreg >>>>>>> runs. ?I'll have to take a closer look but I don't usually do runs on >>>>>>> this box. ?What were your own results like for OpenJDK6 b17? >>>>>>> >>>>>>> >>>>>>> >>>>>> >>>>>> My results for building OpenJDK 6 on Ubuntu 9.04 x64 and running tests >>>>>> there >>>>>> are: >>>>>> >>>>>> hotspot/test: >>>>>> Test results: passed: 24 >>>>>> >>>>>> langtools/test: >>>>>> Test results: passed: 1354 >>>>>> >>>>>> jdk/test: >>>>>> Test results: passed: 3,100; failed: 43; error: 1 >>>>>> >>>>>> All test suites were run with "-a -ignore:quiet"; in addition, >>>>>> langtools >>>>>> was >>>>>> run with "-s". >>>>>> >>>>>> I've uploaded my summary.txt files to: >>>>>> http://cr.openjdk.java.net/~darcy/OpenJDK6-jtreg-pre-b17/ >>>>>> >>>>>> (The jdk tests were run a bit differently than my usual test setup >>>>>> where >>>>>> I >>>>>> point the graphical tests into a virtual framefer. ?In this case, I >>>>>> just >>>>>> ran >>>>>> the tests without redirecting the graphics.) >>>>>> >>>>>> I haven't looked at the IcedTea patch set recently; if the Gervill >>>>>> sound >>>>>> tests are still being duplicated, I think the IcedTea copies can be >>>>>> removed >>>>>> at this point since Karl is keeping the OpenJDK 6 copy of the code and >>>>>> tests >>>>>> up-to-date. >>>>>> >>>>>> -Joe >>>>>> >>>>>> >>>>>> >>>>> >>>>> Ok, the majority of JDK failures I'm seeing are not an issue; they are >>>>> either compile failures from the optional NIO2 backport in IcedTea6 or >>>>> headless exceptions for the AWT/Swing stuff. ?The former are known to >>>>> fail, as I just haven't had time to backport the tests. ?This isn't a >>>>> major issue as most IcedTea6 builds don't enable the backport anyway. >>>>> The headless exceptions are also expected given the tests were run in >>>>> screen without any virtual framebuffer. ?Perhaps we should have the >>>>> check-jdk target use Xvfb by default? >>>>> >>>>> Two Gervill tests fail: >>>>> >>>>> javax/sound/midi/Gervill/SoftReceiver/GetMidiDevice.java (compile >>>>> failure) >>>>> javax/sound/midi/Gervill/SoftChannel/NoteOverFlowTest2.java : >>>>> IndexOutOfBounds >>>>> >>>>> The rest seem to be related to java.beans (can't find java.awt.Color >>>>> -- possibly a headless issue again) or crypto (having ECC enabled >>>>> seems to cause additional failures). >>>>> >>>>> I don't think there's anything that's a stopper for b17, especially as >>>>> your results seem pretty good (and the failures seem the same as we've >>>>> seen). ?We just need to make some decisions on how to resolve the >>>>> differences between the IcedTea6 and plain OpenJDK6 builds. >>>>> >>>>> What do you think? >>>>> -- >>>>> Andrew :-) >>>>> >>>>> Free Java Software Engineer >>>>> Red Hat, Inc. (http://www.redhat.com) >>>>> >>>>> Support Free Java! >>>>> Contribute to GNU Classpath and the OpenJDK >>>>> http://www.gnu.org/software/classpath >>>>> http://openjdk.java.net >>>>> >>>>> PGP Key: 94EFD9D8 (http://subkeys.pgp.net) >>>>> Fingerprint: F8EF F1EA 401E 2E60 15FA ?7927 142C 2591 94EF D9D8 >>>>> >>>>> >>>>> >>>> >>>> My results are being pushed to http://cr.openjdk.java.net/~andrew/jdk/ >>>> now. ?Should be there shortly. >>>> >>>> >>> >>> Hello. >>> >>> Below is the jtdiff between my OpenJDK 6 test/jdk regression tests and >>> your >>> IcedTea test/jdk tests. >>> >>> Most of the additional passes are the duplicated Gervill tests and most >>> of >>> the failures differences are from the awt configuration issue (and the >>> nio2 >>> backport). >>> >>> So I think this looks pretty good. >>> >>> -Joe >>> >>> 0: 6-open/summary.txt ?pass: 3,100; fail: 43; error: 1 >>> 1: IcedTea/summary.txt ?pass: 3,269; fail: 168; error: 3 >>> > > [snip] > >>> 405 differences >>> >>> >>> >> >> Ah I see the Gervill tests have moved to javax/sound/midi/Gervill. ?I >> think we should just drop the IcedTea6 duplicate now. >> >> Mosts of the tests do seem to be related to the NIO2 backport or >> enabling NSS (I assume you don't turn on the later either). >> There are some interesting passes on IcedTea that I assume we patch >> locally still. ?I presume you also have the proprietary SNMP plugs >> which we obviously don't use. >> > > No, OpenJDK 6 is all-open all the time; no proprietary anything :-) > Your tests pass on the following tests: pass --- com/sun/jmx/snmp/SnmpOidHashCode.java pass --- com/sun/jmx/snmp/TimeTicksWrapping.java which would suggest that the binary plugs are being used to provide the optional SNMP provider which is still proprietary. >> In general, looks good to me too. ?Let's ship b17. >> > > Agreed; time to ship! Great! :) > > -Joe > > -- Andrew :-) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint: F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From Joe.Darcy at Sun.COM Thu Oct 8 17:36:53 2009 From: Joe.Darcy at Sun.COM (Joe Darcy) Date: Thu, 08 Oct 2009 17:36:53 -0700 Subject: b17 In-Reply-To: <17c6771e0910081645j82bade1paac3ff21cbe56156@mail.gmail.com> References: <17c6771e0909290504u46e7536cjc5b477cd693c2fce@mail.gmail.com> <17c6771e0910021520t7af0582m10830585e1101669@mail.gmail.com> <4ACA6A26.4050003@sun.com> <17c6771e0910061047y46200811yb3b34f850e20bd70@mail.gmail.com> <4ACBDF1E.8060402@sun.com> <17c6771e0910070220u5e8f45d9jec9bf7ab8434be48@mail.gmail.com> <17c6771e0910070224l7d7eb2daifdb7f9b0669068ad@mail.gmail.com> <4ACD1A40.8070605@sun.com> <17c6771e0910080648n31367bfcn8a673ba780c91d23@mail.gmail.com> <4ACE4DE2.1010808@sun.com> <17c6771e0910081645j82bade1paac3ff21cbe56156@mail.gmail.com> Message-ID: <4ACE85A5.7020100@sun.com> Andrew John Hughes wrote: > 2009/10/8 Joseph D. Darcy : > >> Andrew John Hughes wrote: >> >>> 2009/10/7 Joe Darcy : >>> >>> >>>> Andrew John Hughes wrote: >>>> >>>> >>>>> 2009/10/7 Andrew John Hughes : >>>>> >>>>> >>>>> >>>>>> 2009/10/7 Joe Darcy : >>>>>> >>>>>> >>>>>> >>>>>>> Andrew John Hughes wrote: >>>>>>> >>>>>>> >>>>>>> >>>>>>>> 2009/10/5 Joseph D. Darcy : >>>>>>>> >>>>>>>> >>>>>>>> >>>>>>>> >>>>>>> [big snip] >>>>>>> >>>>>>> >>>>>>> >>>>>>>>> Hello. >>>>>>>>> >>>>>>>>> Any results for the jdk/test regression tests? >>>>>>>>> >>>>>>>>> -Joe >>>>>>>>> >>>>>>>>> >>>>>>>>> >>>>>>>>> >>>>>>>>> >>>>>>>> JDK: Test results: passed: 3,269; failed: 168; error: 3 >>>>>>>> >>>>>>>> The failed seems high, the number of errors matches our usual JTreg >>>>>>>> runs. I'll have to take a closer look but I don't usually do runs on >>>>>>>> this box. What were your own results like for OpenJDK6 b17? >>>>>>>> >>>>>>>> >>>>>>>> >>>>>>>> >>>>>>> My results for building OpenJDK 6 on Ubuntu 9.04 x64 and running tests >>>>>>> there >>>>>>> are: >>>>>>> >>>>>>> hotspot/test: >>>>>>> Test results: passed: 24 >>>>>>> >>>>>>> langtools/test: >>>>>>> Test results: passed: 1354 >>>>>>> >>>>>>> jdk/test: >>>>>>> Test results: passed: 3,100; failed: 43; error: 1 >>>>>>> >>>>>>> All test suites were run with "-a -ignore:quiet"; in addition, >>>>>>> langtools >>>>>>> was >>>>>>> run with "-s". >>>>>>> >>>>>>> I've uploaded my summary.txt files to: >>>>>>> http://cr.openjdk.java.net/~darcy/OpenJDK6-jtreg-pre-b17/ >>>>>>> >>>>>>> (The jdk tests were run a bit differently than my usual test setup >>>>>>> where >>>>>>> I >>>>>>> point the graphical tests into a virtual framefer. In this case, I >>>>>>> just >>>>>>> ran >>>>>>> the tests without redirecting the graphics.) >>>>>>> >>>>>>> I haven't looked at the IcedTea patch set recently; if the Gervill >>>>>>> sound >>>>>>> tests are still being duplicated, I think the IcedTea copies can be >>>>>>> removed >>>>>>> at this point since Karl is keeping the OpenJDK 6 copy of the code and >>>>>>> tests >>>>>>> up-to-date. >>>>>>> >>>>>>> -Joe >>>>>>> >>>>>>> >>>>>>> >>>>>>> >>>>>> Ok, the majority of JDK failures I'm seeing are not an issue; they are >>>>>> either compile failures from the optional NIO2 backport in IcedTea6 or >>>>>> headless exceptions for the AWT/Swing stuff. The former are known to >>>>>> fail, as I just haven't had time to backport the tests. This isn't a >>>>>> major issue as most IcedTea6 builds don't enable the backport anyway. >>>>>> The headless exceptions are also expected given the tests were run in >>>>>> screen without any virtual framebuffer. Perhaps we should have the >>>>>> check-jdk target use Xvfb by default? >>>>>> >>>>>> Two Gervill tests fail: >>>>>> >>>>>> javax/sound/midi/Gervill/SoftReceiver/GetMidiDevice.java (compile >>>>>> failure) >>>>>> javax/sound/midi/Gervill/SoftChannel/NoteOverFlowTest2.java : >>>>>> IndexOutOfBounds >>>>>> >>>>>> The rest seem to be related to java.beans (can't find java.awt.Color >>>>>> -- possibly a headless issue again) or crypto (having ECC enabled >>>>>> seems to cause additional failures). >>>>>> >>>>>> I don't think there's anything that's a stopper for b17, especially as >>>>>> your results seem pretty good (and the failures seem the same as we've >>>>>> seen). We just need to make some decisions on how to resolve the >>>>>> differences between the IcedTea6 and plain OpenJDK6 builds. >>>>>> >>>>>> What do you think? >>>>>> -- >>>>>> Andrew :-) >>>>>> >>>>>> Free Java Software Engineer >>>>>> Red Hat, Inc. (http://www.redhat.com) >>>>>> >>>>>> Support Free Java! >>>>>> Contribute to GNU Classpath and the OpenJDK >>>>>> http://www.gnu.org/software/classpath >>>>>> http://openjdk.java.net >>>>>> >>>>>> PGP Key: 94EFD9D8 (http://subkeys.pgp.net) >>>>>> Fingerprint: F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 >>>>>> >>>>>> >>>>>> >>>>>> >>>>> My results are being pushed to http://cr.openjdk.java.net/~andrew/jdk/ >>>>> now. Should be there shortly. >>>>> >>>>> >>>>> >>>> Hello. >>>> >>>> Below is the jtdiff between my OpenJDK 6 test/jdk regression tests and >>>> your >>>> IcedTea test/jdk tests. >>>> >>>> Most of the additional passes are the duplicated Gervill tests and most >>>> of >>>> the failures differences are from the awt configuration issue (and the >>>> nio2 >>>> backport). >>>> >>>> So I think this looks pretty good. >>>> >>>> -Joe >>>> >>>> 0: 6-open/summary.txt pass: 3,100; fail: 43; error: 1 >>>> 1: IcedTea/summary.txt pass: 3,269; fail: 168; error: 3 >>>> >>>> >> [snip] >> >> >>>> 405 differences >>>> >>>> >>>> >>>> >>> Ah I see the Gervill tests have moved to javax/sound/midi/Gervill. I >>> think we should just drop the IcedTea6 duplicate now. >>> >>> Mosts of the tests do seem to be related to the NIO2 backport or >>> enabling NSS (I assume you don't turn on the later either). >>> There are some interesting passes on IcedTea that I assume we patch >>> locally still. I presume you also have the proprietary SNMP plugs >>> which we obviously don't use. >>> >>> >> No, OpenJDK 6 is all-open all the time; no proprietary anything :-) >> >> > > Your tests pass on the following tests: > > pass --- com/sun/jmx/snmp/SnmpOidHashCode.java > pass --- com/sun/jmx/snmp/TimeTicksWrapping.java > > which would suggest that the binary plugs are being used to provide > the optional SNMP provider which is still proprietary. > > If the SNMP implementation is not present, the tests detect this and vacuously pass, printing a warning. From http://hg.openjdk.java.net/jdk6/jdk6/jdk/file/b394cbe9501e/test/com/sun/jmx/snmp/SnmpOidHashCode.java 116 public static void main(String args[]) { 117 if (!SnmpOidBuilder.isSnmpPresent()) { 118 System.err.println("WARNING: "+ 119 SnmpOidBuilder.SNMP_OID_CLASS_NAME+" not present."); 120 System.err.println(SnmpOidHashCode.class.getName()+ 121 ": test skipped."); 122 return; 123 } and borne out in the jtr file for my test run: [...] ----------messages:(3/117)---------- command: main SnmpOidHashCode reason: User specified action: run main SnmpOidHashCode elapsed time (seconds): 0.205 ----------System.out:(1/46)---------- SnmpOidHashCode: Testing for SNMP Packages... ----------System.err:(4/138)---------- WARNING: can't load com.sun.jmx.snmp.SnmpOid WARNING: com.sun.jmx.snmp.SnmpOid not present. SnmpOidHashCode: test skipped. STATUS:Passed. result: Passed. Execution successful -Joe From gnu_andrew at member.fsf.org Thu Oct 8 18:13:21 2009 From: gnu_andrew at member.fsf.org (Andrew John Hughes) Date: Fri, 9 Oct 2009 02:13:21 +0100 Subject: b17 In-Reply-To: <4ACE85A5.7020100@sun.com> References: <17c6771e0909290504u46e7536cjc5b477cd693c2fce@mail.gmail.com> <17c6771e0910061047y46200811yb3b34f850e20bd70@mail.gmail.com> <4ACBDF1E.8060402@sun.com> <17c6771e0910070220u5e8f45d9jec9bf7ab8434be48@mail.gmail.com> <17c6771e0910070224l7d7eb2daifdb7f9b0669068ad@mail.gmail.com> <4ACD1A40.8070605@sun.com> <17c6771e0910080648n31367bfcn8a673ba780c91d23@mail.gmail.com> <4ACE4DE2.1010808@sun.com> <17c6771e0910081645j82bade1paac3ff21cbe56156@mail.gmail.com> <4ACE85A5.7020100@sun.com> Message-ID: <17c6771e0910081813y5c9bd9c3k3566e9ede3f5e6e7@mail.gmail.com> 2009/10/9 Joe Darcy : > Andrew John Hughes wrote: >> >> 2009/10/8 Joseph D. Darcy : >> >>> >>> Andrew John Hughes wrote: >>> >>>> >>>> 2009/10/7 Joe Darcy : >>>> >>>> >>>>> >>>>> Andrew John Hughes wrote: >>>>> >>>>> >>>>>> >>>>>> 2009/10/7 Andrew John Hughes : >>>>>> >>>>>> >>>>>> >>>>>>> >>>>>>> 2009/10/7 Joe Darcy : >>>>>>> >>>>>>> >>>>>>> >>>>>>>> >>>>>>>> Andrew John Hughes wrote: >>>>>>>> >>>>>>>> >>>>>>>> >>>>>>>>> >>>>>>>>> 2009/10/5 Joseph D. Darcy : >>>>>>>>> >>>>>>>>> >>>>>>>>> >>>>>>>>> >>>>>>>> >>>>>>>> [big snip] >>>>>>>> >>>>>>>> >>>>>>>> >>>>>>>>>> >>>>>>>>>> Hello. >>>>>>>>>> >>>>>>>>>> Any results for the jdk/test regression tests? >>>>>>>>>> >>>>>>>>>> -Joe >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> >>>>>>>>> >>>>>>>>> JDK: Test results: passed: 3,269; failed: 168; error: 3 >>>>>>>>> >>>>>>>>> The failed seems high, the number of errors matches our usual JTreg >>>>>>>>> runs. ?I'll have to take a closer look but I don't usually do runs >>>>>>>>> on >>>>>>>>> this box. ?What were your own results like for OpenJDK6 b17? >>>>>>>>> >>>>>>>>> >>>>>>>>> >>>>>>>>> >>>>>>>> >>>>>>>> My results for building OpenJDK 6 on Ubuntu 9.04 x64 and running >>>>>>>> tests >>>>>>>> there >>>>>>>> are: >>>>>>>> >>>>>>>> hotspot/test: >>>>>>>> Test results: passed: 24 >>>>>>>> >>>>>>>> langtools/test: >>>>>>>> Test results: passed: 1354 >>>>>>>> >>>>>>>> jdk/test: >>>>>>>> Test results: passed: 3,100; failed: 43; error: 1 >>>>>>>> >>>>>>>> All test suites were run with "-a -ignore:quiet"; in addition, >>>>>>>> langtools >>>>>>>> was >>>>>>>> run with "-s". >>>>>>>> >>>>>>>> I've uploaded my summary.txt files to: >>>>>>>> http://cr.openjdk.java.net/~darcy/OpenJDK6-jtreg-pre-b17/ >>>>>>>> >>>>>>>> (The jdk tests were run a bit differently than my usual test setup >>>>>>>> where >>>>>>>> I >>>>>>>> point the graphical tests into a virtual framefer. ?In this case, I >>>>>>>> just >>>>>>>> ran >>>>>>>> the tests without redirecting the graphics.) >>>>>>>> >>>>>>>> I haven't looked at the IcedTea patch set recently; if the Gervill >>>>>>>> sound >>>>>>>> tests are still being duplicated, I think the IcedTea copies can be >>>>>>>> removed >>>>>>>> at this point since Karl is keeping the OpenJDK 6 copy of the code >>>>>>>> and >>>>>>>> tests >>>>>>>> up-to-date. >>>>>>>> >>>>>>>> -Joe >>>>>>>> >>>>>>>> >>>>>>>> >>>>>>>> >>>>>>> >>>>>>> Ok, the majority of JDK failures I'm seeing are not an issue; they >>>>>>> are >>>>>>> either compile failures from the optional NIO2 backport in IcedTea6 >>>>>>> or >>>>>>> headless exceptions for the AWT/Swing stuff. ?The former are known to >>>>>>> fail, as I just haven't had time to backport the tests. ?This isn't a >>>>>>> major issue as most IcedTea6 builds don't enable the backport anyway. >>>>>>> The headless exceptions are also expected given the tests were run in >>>>>>> screen without any virtual framebuffer. ?Perhaps we should have the >>>>>>> check-jdk target use Xvfb by default? >>>>>>> >>>>>>> Two Gervill tests fail: >>>>>>> >>>>>>> javax/sound/midi/Gervill/SoftReceiver/GetMidiDevice.java (compile >>>>>>> failure) >>>>>>> javax/sound/midi/Gervill/SoftChannel/NoteOverFlowTest2.java : >>>>>>> IndexOutOfBounds >>>>>>> >>>>>>> The rest seem to be related to java.beans (can't find java.awt.Color >>>>>>> -- possibly a headless issue again) or crypto (having ECC enabled >>>>>>> seems to cause additional failures). >>>>>>> >>>>>>> I don't think there's anything that's a stopper for b17, especially >>>>>>> as >>>>>>> your results seem pretty good (and the failures seem the same as >>>>>>> we've >>>>>>> seen). ?We just need to make some decisions on how to resolve the >>>>>>> differences between the IcedTea6 and plain OpenJDK6 builds. >>>>>>> >>>>>>> What do you think? >>>>>>> -- >>>>>>> Andrew :-) >>>>>>> >>>>>>> Free Java Software Engineer >>>>>>> Red Hat, Inc. (http://www.redhat.com) >>>>>>> >>>>>>> Support Free Java! >>>>>>> Contribute to GNU Classpath and the OpenJDK >>>>>>> http://www.gnu.org/software/classpath >>>>>>> http://openjdk.java.net >>>>>>> >>>>>>> PGP Key: 94EFD9D8 (http://subkeys.pgp.net) >>>>>>> Fingerprint: F8EF F1EA 401E 2E60 15FA ?7927 142C 2591 94EF D9D8 >>>>>>> >>>>>>> >>>>>>> >>>>>>> >>>>>> >>>>>> My results are being pushed to http://cr.openjdk.java.net/~andrew/jdk/ >>>>>> now. ?Should be there shortly. >>>>>> >>>>>> >>>>>> >>>>> >>>>> Hello. >>>>> >>>>> Below is the jtdiff between my OpenJDK 6 test/jdk regression tests and >>>>> your >>>>> IcedTea test/jdk tests. >>>>> >>>>> Most of the additional passes are the duplicated Gervill tests and most >>>>> of >>>>> the failures differences are from the awt configuration issue (and the >>>>> nio2 >>>>> backport). >>>>> >>>>> So I think this looks pretty good. >>>>> >>>>> -Joe >>>>> >>>>> 0: 6-open/summary.txt ?pass: 3,100; fail: 43; error: 1 >>>>> 1: IcedTea/summary.txt ?pass: 3,269; fail: 168; error: 3 >>>>> >>>>> >>> >>> [snip] >>> >>> >>>>> >>>>> 405 differences >>>>> >>>>> >>>>> >>>>> >>>> >>>> Ah I see the Gervill tests have moved to javax/sound/midi/Gervill. ?I >>>> think we should just drop the IcedTea6 duplicate now. >>>> >>>> Mosts of the tests do seem to be related to the NIO2 backport or >>>> enabling NSS (I assume you don't turn on the later either). >>>> There are some interesting passes on IcedTea that I assume we patch >>>> locally still. ?I presume you also have the proprietary SNMP plugs >>>> which we obviously don't use. >>>> >>>> >>> >>> No, OpenJDK 6 is all-open all the time; no proprietary anything :-) >>> >>> >> >> Your tests pass on the following tests: >> >> pass ? --- ? ?com/sun/jmx/snmp/SnmpOidHashCode.java >> pass ? --- ? ?com/sun/jmx/snmp/TimeTicksWrapping.java >> >> which would suggest that the binary plugs are being used to provide >> the optional SNMP provider which is still proprietary. >> >> > > If the SNMP implementation is not present, the tests detect this and > vacuously pass, printing a warning. > > From > http://hg.openjdk.java.net/jdk6/jdk6/jdk/file/b394cbe9501e/test/com/sun/jmx/snmp/SnmpOidHashCode.java > ? ? 116 ? ? public static void main(String args[]) { > ? ? 117 ? ? ? ? if (!SnmpOidBuilder.isSnmpPresent()) { > ? ? 118 ? ? ? ? ? ? System.err.println("WARNING: "+ > ? ? 119 ? ? ? ? ? ? ? ? ? ? SnmpOidBuilder.SNMP_OID_CLASS_NAME+" not > present."); > ? ? 120 ? ? ? ? ? ? System.err.println(SnmpOidHashCode.class.getName()+ > ? ? 121 ? ? ? ? ? ? ? ? ? ? ": test skipped."); > ? ? 122 ? ? ? ? ? ? return; > ? ? 123 ? ? ? ? } > > and borne out in the jtr file for my test run: > > [...] > ----------messages:(3/117)---------- > command: main SnmpOidHashCode > reason: User specified action: run main SnmpOidHashCode > elapsed time (seconds): 0.205 > ----------System.out:(1/46)---------- > SnmpOidHashCode: Testing for SNMP Packages... > ----------System.err:(4/138)---------- > WARNING: can't load com.sun.jmx.snmp.SnmpOid > WARNING: com.sun.jmx.snmp.SnmpOid not present. > SnmpOidHashCode: test skipped. > STATUS:Passed. > result: Passed. Execution successful > > -Joe > > Ah nice, I didn't realise this. IcedTea has the tests disabled by an exclusion file, so I assumed they were failing. I guess they were because stubs are still being installed for these classes at present. These are on my list to remove/clean up. Interestingly, there are a number of differences in the build READMEs between 6 and 7 regarding binary plugs (- is 7, + is 6): - Install the + Optionally install the - This is a temporary situation and these binary plugs will be - replaced with fully open source replacements as soon as possible. - So currently, in order to build a complete OpenJDK image, + This is a temporary situation and most of these binary plugs have + been replaced with fully open source replacements, except for SNMP. + You don't to download and use binary plugs in order to build a + complete OpenJDK image, and you don't need them to create a JDK 6 + implementation. If you insist on using the binary plugs, The 6 documentation is much more tailored to avoiding the binary plugs where possible, while the 7 documentation is outdated and suggests they are still needed. Clearly some updates are missing on the 7 copy, namely: changeset: 36:073cdf699427 user: robilad date: Tue May 19 02:30:49 2009 +0200 summary: 6641691: 6-open: Bring build readme's up-to-date http://hg.openjdk.java.net/jdk6/jdk6/rev/073cdf699427 I'll look at forwardporting this to 7, unless Dalibor wants to. -- Andrew :-) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint: F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From enevill at icedtea.classpath.org Fri Oct 9 05:07:14 2009 From: enevill at icedtea.classpath.org (enevill at icedtea.classpath.org) Date: Fri, 09 Oct 2009 12:07:14 +0000 Subject: /hg/icedtea6: Edward Nevill Message-ID: 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 + + * Bug fix to irem + * Stop icedtea-debug build falling over in test_gamma + 2009-10-08 Matthias Klose * 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 From ed at camswl.com Fri Oct 9 06:55:43 2009 From: ed at camswl.com (Edward Nevill) Date: Fri, 9 Oct 2009 14:55:43 +0100 Subject: Request to push changes to make ARM asm and Shark work Message-ID: <200910091355.n99Dtho2016468@parsley.camswl.com> Hi Folks, The following changes will make the ARM assembler work with Shark. It doesn't work with OSR yet, also it needs to be tuned correctly. Gary: I have had to add a change to the top level Makefile.am to allow different building of arm_bytecodes.s from arm_bytecodes.def for SHARK and non SHARK builds. I dont think the top level makefile is the right place for this rule as I will probably need to make more changes. Any objections if I move this rule down into zero.make. The rules to build 'mkbc' itself and the source of mkbc can remain in the top level. ChangeLog to follow Regards, Ed. --- CUT HERE ----------------------------------------------------------------------------- diff -ruNE orig/icedtea6/Makefile.am new/icedtea6/Makefile.am --- orig/icedtea6/Makefile.am 2009-10-09 13:05:43.000000000 +0100 +++ new/icedtea6/Makefile.am 2009-10-09 14:41:28.000000000 +0100 @@ -504,8 +504,14 @@ # These options are provided mainly to assist debugging by returning the bytecode interpreter # to a 'vanilla' interpreter. # +if SHARK_BUILD +${ZERO_ASM_BC_ASM}: ${ZERO_ASM_BC_DEF} $(abs_top_srcdir)/mkbc + gcc -E -DDISABLE_NOTICE_SAFEPOINTS - < $< | $(abs_top_srcdir)/mkbc - $@ +else ${ZERO_ASM_BC_ASM}: ${ZERO_ASM_BC_DEF} $(abs_top_srcdir)/mkbc gcc -E - < $< | $(abs_top_srcdir)/mkbc - $@ +endif + # Link ports sources into tree stamps/ports.stamp: stamps/replace-hotspot.stamp diff -ruNE orig/icedtea6/ports/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S new/icedtea6/ports/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S --- orig/icedtea6/ports/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S 2009-10-09 13:08:16.000000000 +0100 +++ new/icedtea6/ports/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S 2009-10-09 14:35:10.000000000 +0100 @@ -17,6 +17,10 @@ #ifdef HOTSPOT_ASM +#ifdef SHARK +#define USE_COMPILER +#endif + #define ARMv4 #ifndef DISABLE_NOTICE_SAFEPOINTS @@ -3989,12 +3993,34 @@ add dispatch, r1, r0 ldr r0, [istate, #ISTATE_METHOD] CACHE_STACK + USEC ldr r2, [r0, #METHOD_INVOCATIONCOUNTER] + USEC ldr lr, [dispatch, #InterpreterInvocationLimit_Address-XXX] + USEC add r2, r2, #INVOCATIONCOUNTER_COUNTINCREMENT + USEC ldr lr, [lr] + USEC str r2, [r0, #METHOD_INVOCATIONCOUNTER] + USEC cmp r2, lr + ldr r3, [r0, #METHOD_ACCESSFLAGS] + USEC bcs sync_method_entry_freq_count_overflow + CACHE_LOCALS + tst r3, #JVM_ACC_SYNCHRONIZED + CACHE_CP + bne normal_do_synchronization + DISPATCH 0 + +#ifdef USE_COMPILER +sync_method_entry_freq_count_overflow: + mov r1, #0 + mov r0, tmp1 + bl _ZN18InterpreterRuntime26frequency_counter_overflowEP10JavaThreadPh + ldr r0, [istate, #ISTATE_METHOD] + CACHE_JPC ldr r3, [r0, #METHOD_ACCESSFLAGS] CACHE_LOCALS tst r3, #JVM_ACC_SYNCHRONIZED CACHE_CP bne normal_do_synchronization DISPATCH 0 +#endif do_execute_java_bytecodes_restore_locals_and_jpc: CACHE_JPC @@ -4547,11 +4573,18 @@ DISPATCH_START 48 ldr constpool, [constpool, #CONSTANTPOOL_CACHE] str ip, [tmp1, #THREAD_TOP_ZERO_FRAME] + USEC ldr r3, [r10, #METHOD_INVOCATIONCOUNTER] str ip, [tmp1, #THREAD_LAST_JAVA_SP] DISPATCH_NEXT + USEC ldr lr, [dispatch, #InterpreterInvocationLimit_Address-XXX] + USEC add r3, r3, #INVOCATIONCOUNTER_COUNTINCREMENT str tmp1, [istate, #ISTATE_THREAD] + USEC ldr lr, [lr] + USEC str r3, [tmp2, #METHOD_INVOCATIONCOUNTER] str locals, [istate, #ISTATE_LOCALS] + USEC cmp r3, lr str constpool, [istate, #ISTATE_CONSTANTS] + USEC bcs method_entry_freq_count_overflow DISPATCH_NEXT DISPATCH_NEXT DISPATCH_NEXT @@ -4560,6 +4593,18 @@ @ str lr, [istate, #ISTATE_PREV_LINK] @ str lr, [istate, #ISTATE_CALLEE] DISPATCH_FINISH +#ifdef USE_COMPILER +method_entry_freq_count_overflow: + DECACHE_JPC + str r10, [istate, #ISTATE_METHOD] + mov r1, #0 + mov r0, tmp1 + bl _ZN18InterpreterRuntime26frequency_counter_overflowEP10JavaThreadPh + CACHE_JPC + CACHE_CP + DISPATCH 0 +#endif + handle_return: @ CHECK_CONSTPOOL @@ -6302,6 +6347,7 @@ .word PrintCommandLineFlags(GOT) .word _ZN11JvmtiExport28_can_post_interpreter_eventsE(GOT) .word UseCompiler(GOT) + .word _ZN17InvocationCounter26InterpreterInvocationLimitE(GOT) .word 0 ALIGN_DATA @@ -6581,10 +6627,10 @@ CodeTrace_Buffer_Base: .space CODETRACE_BUFFER_SIZE #endif - .word 0 DispatchBreakPoint: .word 0 VFP_Flag: .word 0 CodeTrace_Idx: .word 0 +InterpreterInvocationLimit_Address: .word 0 UseCompiler_Address: .word 0 can_post_interpreter_events: .word 0 PrintCommandLineFlags_Address: .word 0 From gbenson at redhat.com Fri Oct 9 06:59:03 2009 From: gbenson at redhat.com (Gary Benson) Date: Fri, 9 Oct 2009 14:59:03 +0100 Subject: Request to push changes to make ARM asm and Shark work In-Reply-To: <200910091355.n99Dtho2016468@parsley.camswl.com> References: <200910091355.n99Dtho2016468@parsley.camswl.com> Message-ID: <20091009135903.GD3506@redhat.com> Edward Nevill wrote: > The following changes will make the ARM assembler work with Shark. Looks good. > I have had to add a change to the top level Makefile.am to allow > different building of arm_bytecodes.s from arm_bytecodes.def for > SHARK and non SHARK builds. I dont think the top level makefile is > the right place for this rule as I will probably need to make more > changes. Any objections if I move this rule down into zero.make. The > rules to build 'mkbc' itself and the source of mkbc can remain in > the top level. Please commit. Cheers, Gary -- http://gbenson.net/ From enevill at icedtea.classpath.org Fri Oct 9 09:17:56 2009 From: enevill at icedtea.classpath.org (enevill at icedtea.classpath.org) Date: Fri, 09 Oct 2009 16:17:56 +0000 Subject: /hg/icedtea6: 2 new changesets Message-ID: changeset c1f0b5da7bc3 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=c1f0b5da7bc3 author: "Edward Nevill (ed at camswl.com)" date: Fri Oct 09 17:20:24 2009 +0100 Edward Nevill changeset 594e47c327ad in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=594e47c327ad author: "Edward Nevill (ed at camswl.com)" date: Fri Oct 09 17:21:41 2009 +0100 Edward Nevill diffstat: 4 files changed, 58 insertions(+), 2 deletions(-) ChangeLog | 4 + Makefile.am | 6 ++ configure.ac | 2 ports/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S | 48 +++++++++++++++++++- diffs (148 lines): diff -r ca84eeb0fcf1 -r 594e47c327ad ChangeLog --- a/ChangeLog Fri Oct 09 13:10:46 2009 +0100 +++ b/ChangeLog Fri Oct 09 17:21:41 2009 +0100 @@ -1,3 +1,7 @@ 2009-10-09 Edward Nevill + + * Added initial support for Shark + ARM asm + 2009-10-09 Edward Nevill * Bug fix to irem diff -r ca84eeb0fcf1 -r 594e47c327ad Makefile.am --- a/Makefile.am Fri Oct 09 13:10:46 2009 +0100 +++ b/Makefile.am Fri Oct 09 17:21:41 2009 +0100 @@ -504,8 +504,14 @@ ZERO_ASM_BC_ASM_COND = $(shell test -f $ # These options are provided mainly to assist debugging by returning the bytecode interpreter # to a 'vanilla' interpreter. # +if SHARK_BUILD +${ZERO_ASM_BC_ASM}: ${ZERO_ASM_BC_DEF} $(abs_top_srcdir)/mkbc + gcc -E -DDISABLE_NOTICE_SAFEPOINTS - < $< | $(abs_top_srcdir)/mkbc - $@ +else ${ZERO_ASM_BC_ASM}: ${ZERO_ASM_BC_DEF} $(abs_top_srcdir)/mkbc gcc -E - < $< | $(abs_top_srcdir)/mkbc - $@ +endif + # Link ports sources into tree stamps/ports.stamp: stamps/replace-hotspot.stamp diff -r ca84eeb0fcf1 -r 594e47c327ad configure.ac --- a/configure.ac Fri Oct 09 13:10:46 2009 +0100 +++ b/configure.ac Fri Oct 09 17:21:41 2009 +0100 @@ -565,7 +565,7 @@ AC_SUBST(LIBFFI_LIBS) if test "x${SHARK_BUILD_TRUE}" = x || test "x${ADD_SHARK_BUILD_TRUE}" = x; then FIND_TOOL([LLVM_CONFIG], [llvm-config]) - llvm_components="engine nativecodegen" + llvm_components="jit engine nativecodegen" LLVM_CFLAGS=`$LLVM_CONFIG --cxxflags $llvm_components | \ sed -e 's/-O.//g' | sed -e 's/-fomit-frame-pointer//g' | \ sed -e 's/-D_DEBUG//g'` diff -r ca84eeb0fcf1 -r 594e47c327ad ports/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S --- a/ports/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S Fri Oct 09 13:10:46 2009 +0100 +++ b/ports/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S Fri Oct 09 17:21:41 2009 +0100 @@ -16,6 +16,10 @@ @ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. #ifdef HOTSPOT_ASM + +#ifdef SHARK +#define USE_COMPILER +#endif #define ARMv4 @@ -3989,12 +3993,34 @@ normal_entry_synchronized: add dispatch, r1, r0 ldr r0, [istate, #ISTATE_METHOD] CACHE_STACK + USEC ldr r2, [r0, #METHOD_INVOCATIONCOUNTER] + USEC ldr lr, [dispatch, #InterpreterInvocationLimit_Address-XXX] + USEC add r2, r2, #INVOCATIONCOUNTER_COUNTINCREMENT + USEC ldr lr, [lr] + USEC str r2, [r0, #METHOD_INVOCATIONCOUNTER] + USEC cmp r2, lr + ldr r3, [r0, #METHOD_ACCESSFLAGS] + USEC bcs sync_method_entry_freq_count_overflow + CACHE_LOCALS + tst r3, #JVM_ACC_SYNCHRONIZED + CACHE_CP + bne normal_do_synchronization + DISPATCH 0 + +#ifdef USE_COMPILER +sync_method_entry_freq_count_overflow: + mov r1, #0 + mov r0, tmp1 + bl _ZN18InterpreterRuntime26frequency_counter_overflowEP10JavaThreadPh + ldr r0, [istate, #ISTATE_METHOD] + CACHE_JPC ldr r3, [r0, #METHOD_ACCESSFLAGS] CACHE_LOCALS tst r3, #JVM_ACC_SYNCHRONIZED CACHE_CP bne normal_do_synchronization DISPATCH 0 +#endif do_execute_java_bytecodes_restore_locals_and_jpc: CACHE_JPC @@ -4547,11 +4573,18 @@ 3: DISPATCH_START 48 ldr constpool, [constpool, #CONSTANTPOOL_CACHE] str ip, [tmp1, #THREAD_TOP_ZERO_FRAME] + USEC ldr r3, [r10, #METHOD_INVOCATIONCOUNTER] str ip, [tmp1, #THREAD_LAST_JAVA_SP] DISPATCH_NEXT + USEC ldr lr, [dispatch, #InterpreterInvocationLimit_Address-XXX] + USEC add r3, r3, #INVOCATIONCOUNTER_COUNTINCREMENT str tmp1, [istate, #ISTATE_THREAD] + USEC ldr lr, [lr] + USEC str r3, [tmp2, #METHOD_INVOCATIONCOUNTER] str locals, [istate, #ISTATE_LOCALS] + USEC cmp r3, lr str constpool, [istate, #ISTATE_CONSTANTS] + USEC bcs method_entry_freq_count_overflow DISPATCH_NEXT DISPATCH_NEXT DISPATCH_NEXT @@ -4560,6 +4593,18 @@ 3: @ str lr, [istate, #ISTATE_PREV_LINK] @ str lr, [istate, #ISTATE_CALLEE] DISPATCH_FINISH +#ifdef USE_COMPILER +method_entry_freq_count_overflow: + DECACHE_JPC + str r10, [istate, #ISTATE_METHOD] + mov r1, #0 + mov r0, tmp1 + bl _ZN18InterpreterRuntime26frequency_counter_overflowEP10JavaThreadPh + CACHE_JPC + CACHE_CP + DISPATCH 0 +#endif + handle_return: @ CHECK_CONSTPOOL @@ -6302,6 +6347,7 @@ adcon_init_table: .word PrintCommandLineFlags(GOT) .word _ZN11JvmtiExport28_can_post_interpreter_eventsE(GOT) .word UseCompiler(GOT) + .word _ZN17InvocationCounter26InterpreterInvocationLimitE(GOT) .word 0 ALIGN_DATA @@ -6581,10 +6627,10 @@ CodeTrace_Buffer_Base: CodeTrace_Buffer_Base: .space CODETRACE_BUFFER_SIZE #endif - .word 0 DispatchBreakPoint: .word 0 VFP_Flag: .word 0 CodeTrace_Idx: .word 0 +InterpreterInvocationLimit_Address: .word 0 UseCompiler_Address: .word 0 can_post_interpreter_events: .word 0 PrintCommandLineFlags_Address: .word 0 From bugzilla-daemon at icedtea.classpath.org Sun Oct 11 14:15:39 2009 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Sun, 11 Oct 2009 21:15:39 +0000 Subject: [Bug 390] New: ContestAppletProd.jnlp (Topcoder Arena Applet) crashes after launch Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=390 Summary: ContestAppletProd.jnlp (Topcoder Arena Applet) crashes after launch Product: IcedTea Version: unspecified Platform: PC OS/Version: Linux Status: NEW Severity: major Priority: P2 Component: IcedTea AssignedTo: unassigned at icedtea.classpath.org ReportedBy: abyss.7 at gmail.com Steps to reproduce: 1. javaws ContestAppletProd.jnlp 2. First time it downloads smth and asks about trusting the publisher. 3. Crash with a error message: # # A fatal error has been detected by the Java Runtime Environment: # # SIGSEGV (0xb) at pc=0x00007f6883b76c04, pid=18282, tid=140086399297808 # # JRE version: 6.0-b16 # Java VM: OpenJDK 64-Bit Server VM (14.0-b16 mixed mode linux-amd64 ) # Distribution: Custom build (Wed Oct 7 15:37:07 MSD 2009) # Problematic frame: # C [ld-linux-x86-64.so.2+0x12c04] # # An error report file with more information is saved as: # /home/abyss/hs_err_pid18282.log # # If you would like to submit a bug report, please include # instructions how to reproduce the bug and visit: # http://icedtea.classpath.org/bugzilla # The crash happened outside the Java Virtual Machine in native code. # See problematic frame for where to report the bug. # I can't find how to make file attachment, so I post it here. cat hs_err_pid18282.log # # A fatal error has been detected by the Java Runtime Environment: # # SIGSEGV (0xb) at pc=0x00007f6883b76c04, pid=18282, tid=140086399297808 # # JRE version: 6.0-b16 # Java VM: OpenJDK 64-Bit Server VM (14.0-b16 mixed mode linux-amd64 ) # Distribution: Custom build (Wed Oct 7 15:37:07 MSD 2009) # Problematic frame: # C [ld-linux-x86-64.so.2+0x12c04] # # If you would like to submit a bug report, please include # instructions how to reproduce the bug and visit: # http://icedtea.classpath.org/bugzilla # The crash happened outside the Java Virtual Machine in native code. # See problematic frame for where to report the bug. # --------------- T H R E A D --------------- Current thread (0x00000000017a5000): JavaThread "Image Fetcher 0" daemon [_thread_in_native, id=18304, stack(0x00007f6868016000,0x00007f6868117000)] siginfo:si_signo=SIGSEGV: si_errno=0, si_code=1 (SEGV_MAPERR), si_addr=0x00000000000003d4 Registers: RAX=0x00007f6883b76c00, RBX=0x0000000000000000, RCX=0x00007f688332cfb0, RDX=0x00007f6868116908 RSP=0x00007f68681150e0, RBP=0x00007f688332cfb0, RSI=0x0000000000000000, RDI=0x0000000000000000 R8 =0x0000000000000000, R9 =0x00007f688332d080, R10=0x0000000000000000, R11=0x00007f688332cfc0 R12=0x0000000000000000, R13=0x00007f68681152e8, R14=0x0000000000000000, R15=0x00000000017a5000 RIP=0x00007f6883b76c04, EFL=0x0000000000010246, CSGSFS=0x6c6f000000000033, ERR=0x0000000000000004 TRAPNO=0x000000000000000e Top of Stack: (sp=0x00007f68681150e0) 0x00007f68681150e0: 0000000000000000 00007f6883b70f66 0x00007f68681150f0: 00007f6868116908 00000000015162b0 0x00007f6868115100: 00000000015162b8 00000000015162a8 0x00007f6868115110: 00007f688332cfb0 0000000000000000 0x00007f6868115120: 00007f68681152e8 0000000000000000 0x00007f6868115130: 00000000017a5000 00000000015162a0 0x00007f6868115140: 6b8cf7133efcbb1f 0000000000000000 0x00007f6868115150: 00007f68681152e8 0000000000000000 0x00007f6868115160: 00000000017a5000 6b8d2154007cbb1f 0x00007f6868115170: 6b8cf618bf0abb1f 000000000b2a36f5 0x00007f6868115180: 00007f6868115330 00007f6863bf1000 0x00007f6868115190: 00007f68681152d8 00007f68681152e8 0x00007f68681151a0: 0000000000000000 00000000017a5000 0x00007f68681151b0: 0000000000208830 00007f6883b70dac 0x00007f68681151c0: 00007f6800000005 0000000000000000 0x00007f68681151d0: 00000000017a5000 00007f6883327e60 0x00007f68681151e0: 00007f688332cfb0 0000000000000000 0x00007f68681151f0: 00007f68681152e8 0000000000000000 0x00007f6868115200: 00000000017a5000 0000000000000000 0x00007f6868115210: 00000000015162a0 00007f688332d2bc 0x00007f6868115220: 00000000017a51b8 00007f6868115270 0x00007f6868115230: 00007f68681152d8 00007f688332cfdf 0x00007f6868115240: 0000000000000006 00007f6863bf74e8 0x00007f6868115250: 00007f686ccf33a8 00000000017a5000 0x00007f6868115260: 00007f686ccf33a8 00007f68681152e8 0x00007f6868115270: 00007f68681152c8 00007f687e476f50 0x00007f6868115280: 00000000017a5000 00007f6868115288 0x00007f6868115290: 00007f686ccf33a8 00007f68681152e8 0x00007f68681152a0: 00007f686ccf4120 0000000000000000 0x00007f68681152b0: 00007f686ccf33a8 0000000000000000 0x00007f68681152c0: 00007f68681152e8 00007f6868115330 0x00007f68681152d0: 00007f687e46b7fa 00007f686ccf4068 Instructions: (pc=0x00007f6883b76c04) 0x00007f6883b76bf4: 66 66 66 2e 0f 1f 84 00 00 00 00 00 53 48 89 fb 0x00007f6883b76c04: f6 87 d4 03 00 00 08 75 32 44 8b 8f 10 03 00 00 Stack: [0x00007f6868016000,0x00007f6868117000], sp=0x00007f68681150e0, free space=1020k Native frames: (J=compiled Java code, j=interpreted, Vv=VM code, C=native code) C [ld-linux-x86-64.so.2+0x12c04] Java frames: (J=compiled Java code, j=interpreted, Vv=VM code) j sun.awt.image.JPEGImageDecoder.initIDs(Ljava/lang/Class;)V+0 j sun.awt.image.JPEGImageDecoder.()V+22 v ~StubRoutines::call_stub j sun.awt.image.InputStreamImageSource.getDecoder(Ljava/io/InputStream;)Lsun/awt/image/ImageDecoder;+135 j sun.awt.image.URLImageSource.getDecoder()Lsun/awt/image/ImageDecoder;+183 j sun.awt.image.InputStreamImageSource.doFetch()V+30 j sun.awt.image.ImageFetcher.fetchloop()V+33 j sun.awt.image.ImageFetcher.run()V+5 v ~StubRoutines::call_stub --------------- P R O C E S S --------------- Java Threads: ( => current thread ) =>0x00000000017a5000 JavaThread "Image Fetcher 0" daemon [_thread_in_native, id=18304, stack(0x00007f6868016000,0x00007f6868117000)] 0x00000000014a2000 JavaThread "TimerQueue" daemon [_thread_blocked, id=18303, stack(0x00007f6868748000,0x00007f6868849000)] 0x00007f68640d4800 JavaThread "Competition Arena" [_thread_blocked, id=18301, stack(0x00007f6868849000,0x00007f686894a000)] 0x00007f68643f6000 JavaThread "Image Fetcher 0" daemon [_thread_blocked, id=18299, stack(0x00007f686894a000,0x00007f6868a4b000)] 0x00007f68643f0800 JavaThread "AWT-XAWT" daemon [_thread_in_native, id=18298, stack(0x00007f6868d5b000,0x00007f6868e5c000)] 0x00007f68641e5000 JavaThread "Java2D Disposer" daemon [_thread_blocked, id=18297, stack(0x00007f6869118000,0x00007f6869219000)] 0x00007f6864006800 JavaThread "Low Memory Detector" daemon [_thread_blocked, id=18295, stack(0x00007f686aead000,0x00007f686afae000)] 0x00007f6864003000 JavaThread "CompilerThread1" daemon [_thread_blocked, id=18294, stack(0x00007f686afae000,0x00007f686b0af000)] 0x00007f6864001000 JavaThread "CompilerThread0" daemon [_thread_in_native, id=18293, stack(0x00007f686b0af000,0x00007f686b1b0000)] 0x0000000001350000 JavaThread "Signal Dispatcher" daemon [_thread_blocked, id=18292, stack(0x00007f686b1b0000,0x00007f686b2b1000)] 0x0000000001331000 JavaThread "Finalizer" daemon [_thread_blocked, id=18291, stack(0x00007f686b3f6000,0x00007f686b4f7000)] 0x0000000001329800 JavaThread "Reference Handler" daemon [_thread_blocked, id=18290, stack(0x00007f686b4f7000,0x00007f686b5f8000)] 0x00000000012c1000 JavaThread "main" [_thread_blocked, id=18283, stack(0x00007f6883c64000,0x00007f6883d65000)] Other Threads: 0x0000000001324800 VMThread [stack: 0x00007f686b5f8000,0x00007f686b6f9000] [id=18288] 0x00007f6864009800 WatcherThread [stack: 0x00007f686adac000,0x00007f686aead000] [id=18296] VM state:not at safepoint (normal execution) VM Mutex/Monitor currently owned by a thread: None Heap PSYoungGen total 15616K, used 8363K [0x00007f687b9c0000, 0x00007f687d7d0000, 0x00007f687e460000) eden space 11072K, 34% used [0x00007f687b9c0000,0x00007f687bd7c1e0,0x00007f687c490000) from space 4544K, 99% used [0x00007f687c490000,0x00007f687c8fed30,0x00007f687c900000) to space 6272K, 0% used [0x00007f687d1b0000,0x00007f687d1b0000,0x00007f687d7d0000) PSOldGen total 12672K, used 8333K [0x00007f6876460000, 0x00007f68770c0000, 0x00007f687b9c0000) object space 12672K, 65% used [0x00007f6876460000,0x00007f6876c835d8,0x00007f68770c0000) PSPermGen total 28416K, used 16977K [0x00007f686bc60000, 0x00007f686d820000, 0x00007f6876460000) object space 28416K, 59% used [0x00007f686bc60000,0x00007f686ccf44e8,0x00007f686d820000) Dynamic libraries: 00400000-00409000 r-xp 00000000 08:06 1182986 /usr/lib64/icedtea6/jre/bin/javaws 00608000-00609000 rw-p 00008000 08:06 1182986 /usr/lib64/icedtea6/jre/bin/javaws 012b9000-0189e000 rw-p 00000000 00:00 0 [heap] 7f6863bf1000-7f6863bfa000 r-xp 00000000 08:06 1292655 /usr/lib64/icedtea6/jre/lib/amd64/libjpeg.so 7f6863bfa000-7f6863df9000 ---p 00009000 08:06 1292655 /usr/lib64/icedtea6/jre/lib/amd64/libjpeg.so 7f6863df9000-7f6863dfa000 rw-p 00008000 08:06 1292655 /usr/lib64/icedtea6/jre/lib/amd64/libjpeg.so 7f6863dfa000-7f6863e00000 r-xp 00000000 08:06 1292664 /usr/lib64/icedtea6/jre/lib/amd64/libmanagement.so 7f6863e00000-7f6863fff000 ---p 00006000 08:06 1292664 /usr/lib64/icedtea6/jre/lib/amd64/libmanagement.so 7f6863fff000-7f6864000000 rw-p 00005000 08:06 1292664 /usr/lib64/icedtea6/jre/lib/amd64/libmanagement.so 7f6864000000-7f6865061000 rw-p 00000000 00:00 0 7f6865061000-7f6868000000 ---p 00000000 00:00 0 7f6868016000-7f6868019000 ---p 00000000 00:00 0 7f6868019000-7f6868117000 rwxp 00000000 00:00 0 7f6868117000-7f686812a000 r-xp 00000000 08:06 1300210 /lib64/libresolv-2.10.1.so 7f686812a000-7f6868329000 ---p 00013000 08:06 1300210 /lib64/libresolv-2.10.1.so 7f6868329000-7f686832a000 r--p 00012000 08:06 1300210 /lib64/libresolv-2.10.1.so 7f686832a000-7f686832b000 rw-p 00013000 08:06 1300210 /lib64/libresolv-2.10.1.so 7f686832b000-7f686832d000 rw-p 00000000 00:00 0 7f686832d000-7f6868332000 r-xp 00000000 08:06 1300211 /lib64/libnss_dns-2.10.1.so 7f6868332000-7f6868531000 ---p 00005000 08:06 1300211 /lib64/libnss_dns-2.10.1.so 7f6868531000-7f6868532000 r--p 00004000 08:06 1300211 /lib64/libnss_dns-2.10.1.so 7f6868532000-7f6868533000 rw-p 00005000 08:06 1300211 /lib64/libnss_dns-2.10.1.so 7f6868533000-7f6868547000 r-xp 00000000 08:06 1292528 /usr/lib64/icedtea6/jre/lib/amd64/libnet.so 7f6868547000-7f6868747000 ---p 00014000 08:06 1292528 /usr/lib64/icedtea6/jre/lib/amd64/libnet.so 7f6868747000-7f6868748000 rw-p 00014000 08:06 1292528 /usr/lib64/icedtea6/jre/lib/amd64/libnet.so 7f6868748000-7f686874b000 ---p 00000000 00:00 0 7f686874b000-7f6868849000 rwxp 00000000 00:00 0 7f6868849000-7f686884c000 ---p 00000000 00:00 0 7f686884c000-7f686894a000 rwxp 00000000 00:00 0 7f686894a000-7f686894d000 ---p 00000000 00:00 0 7f686894d000-7f6868a4b000 rwxp 00000000 00:00 0 7f6868a4b000-7f6868a50000 r-xp 00000000 08:06 406593 /usr/lib64/libXfixes.so.3.1.0 7f6868a50000-7f6868c4f000 ---p 00005000 08:06 406593 /usr/lib64/libXfixes.so.3.1.0 7f6868c4f000-7f6868c50000 rw-p 00004000 08:06 406593 /usr/lib64/libXfixes.so.3.1.0 7f6868c50000-7f6868c62000 r--s 00000000 08:07 13082 /var/cache/fontconfig/765114c77d97acf1cbec110390427be1-x86-64.cache-2 7f6868c62000-7f6868c8f000 r--s 00000000 08:07 13075 /var/cache/fontconfig/7352b80f0956975663ffc7fcd2fd226c-x86-64.cache-2 7f6868c8f000-7f6868cbc000 r--s 00000000 08:07 13074 /var/cache/fontconfig/74f36e770a965d1fd3034b3222e9d25e-x86-64.cache-2 7f6868d31000-7f6868d5b000 r--s 001b3000 08:03 2453873 /home/abyss/.netx/cache/http/www.topcoder.com/contest/classes/ContestApplet.jar 7f6868d5b000-7f6868d5e000 ---p 00000000 00:00 0 7f6868d5e000-7f6868e5c000 rwxp 00000000 00:00 0 7f6868e5c000-7f6868e75000 r--s 00000000 08:07 13077 /var/cache/fontconfig/3dac453e468bf8f9a616e4e686f19596-x86-64.cache-2 7f6868e75000-7f6868ea2000 r--s 00000000 08:07 13075 /var/cache/fontconfig/7352b80f0956975663ffc7fcd2fd226c-x86-64.cache-2 7f6868ea2000-7f6868ecf000 r--s 00000000 08:07 13074 /var/cache/fontconfig/74f36e770a965d1fd3034b3222e9d25e-x86-64.cache-2 7f6868ee8000-7f6868ef1000 r-xp 00000000 08:06 90444 /usr/lib64/libXcursor.so.1.0.2 7f6868ef1000-7f68690f0000 ---p 00009000 08:06 90444 /usr/lib64/libXcursor.so.1.0.2 7f68690f0000-7f68690f1000 rw-p 00008000 08:06 90444 /usr/lib64/libXcursor.so.1.0.2 7f6869106000-7f6869118000 r--s 00000000 08:07 13082 /var/cache/fontconfig/765114c77d97acf1cbec110390427be1-x86-64.cache-2 7f6869118000-7f686911b000 ---p 00000000 00:00 0 7f686911b000-7f6869219000 rwxp 00000000 00:00 0 7f6869219000-7f686922e000 r-xp 00000000 08:06 660577 /usr/lib64/libgcc_s-4.4.so.1 7f686922e000-7f686942e000 ---p 00015000 08:06 660577 /usr/lib64/libgcc_s-4.4.so.1 7f686942e000-7f686942f000 rw-p 00015000 08:06 660577 /usr/lib64/libgcc_s-4.4.so.1 7f686942f000-7f68694ae000 r-xp 00000000 08:06 406590 /usr/lib64/libfreetype.so.6.3.21 7f68694ae000-7f68696ad000 ---p 0007f000 08:06 406590 /usr/lib64/libfreetype.so.6.3.21 7f68696ad000-7f68696b3000 rw-p 0007e000 08:06 406590 /usr/lib64/libfreetype.so.6.3.21 7f68696b3000-7f68696f9000 r-xp 00000000 08:06 1292536 /usr/lib64/icedtea6/jre/lib/amd64/libfontmanager.so 7f68696f9000-7f68698f8000 ---p 00046000 08:06 1292536 /usr/lib64/icedtea6/jre/lib/amd64/libfontmanager.so 7f68698f8000-7f68698fc000 rw-p 00045000 08:06 1292536 /usr/lib64/icedtea6/jre/lib/amd64/libfontmanager.so 7f68698fc000-7f686990e000 rw-p 00000000 00:00 0 7f686990e000-7f6869910000 r-xp 00000000 08:06 83769 /usr/lib64/libXau.so.6.0.0 7f6869910000-7f6869b0f000 ---p 00002000 08:06 83769 /usr/lib64/libXau.so.6.0.0 7f6869b0f000-7f6869b10000 rw-p 00001000 08:06 83769 /usr/lib64/libXau.so.6.0.0 7f6869b10000-7f6869b15000 r-xp 00000000 08:06 9542 /usr/lib64/libXdmcp.so.6.0.0 7f6869b15000-7f6869d14000 ---p 00005000 08:06 9542 /usr/lib64/libXdmcp.so.6.0.0 7f6869d14000-7f6869d15000 rw-p 00004000 08:06 9542 /usr/lib64/libXdmcp.so.6.0.0 7f6869d15000-7f6869d1e000 r-xp 00000000 08:06 90441 /usr/lib64/libXi.so.6.0.0 7f6869d1e000-7f6869f1e000 ---p 00009000 08:06 90441 /usr/lib64/libXi.so.6.0.0 7f6869f1e000-7f6869f1f000 rw-p 00009000 08:06 90441 /usr/lib64/libXi.so.6.0.0 7f6869f1f000-7f6869f24000 r-xp 00000000 08:06 92368 /usr/lib64/libXtst.so.6.1.0 7f6869f24000-7f686a124000 ---p 00005000 08:06 92368 /usr/lib64/libXtst.so.6.1.0 7f686a124000-7f686a125000 rw-p 00005000 08:06 92368 /usr/lib64/libXtst.so.6.1.0 7f686a125000-7f686a12e000 r-xp 00000000 08:06 6663 /usr/lib64/libXrender.so.1.3.0 7f686a12e000-7f686a32d000 ---p 00009000 08:06 6663 /usr/lib64/libXrender.so.1.3.0 7f686a32d000-7f686a32e000 rw-p 00008000 08:06 6663 /usr/lib64/libXrender.so.1.3.0 7f686a32e000-7f686a466000 r-xp 00000000 08:06 101685 /usr/lib64/libX11.so.6.3.0 7f686a466000-7f686a666000 ---p 00138000 08:06 101685 /usr/lib64/libX11.so.6.3.0 7f686a666000-7f686a66c000 rw-p 00138000 08:06 101685 /usr/lib64/libX11.so.6.3.0 7f686a66c000-7f686a66d000 rw-p 00000000 00:00 0 7f686a66d000-7f686a67e000 r-xp 00000000 08:06 90292 /usr/lib64/libXext.so.6.4.0 7f686a67e000-7f686a87e000 ---p 00011000 08:06 90292 /usr/lib64/libXext.so.6.4.0 7f686a87e000-7f686a87f000 rw-p 00011000 08:06 90292 /usr/lib64/libXext.so.6.4.0 7f686a87f000-7f686a8ca000 r-xp 00000000 08:06 1292526 /usr/lib64/icedtea6/jre/lib/amd64/xawt/libmawt.so 7f686a8ca000-7f686aac9000 ---p 0004b000 08:06 1292526 /usr/lib64/icedtea6/jre/lib/amd64/xawt/libmawt.so 7f686aac9000-7f686aacc000 rw-p 0004a000 08:06 1292526 /usr/lib64/icedtea6/jre/lib/amd64/xawt/libmawt.so 7f686aacc000-7f686aace000 rw-p 00000000 00:00 0 7f686aace000-7f686ab6e000 r-xp 00000000 08:06 1292662 /usr/lib64/icedtea6/jre/lib/amd64/libawt.so 7f686ab6e000-7f686ad6d000 ---p 000a0000 08:06 1292662 /usr/lib64/icedtea6/jre/lib/amd64/libawt.so 7f686ad6d000-7f686ad79000 rw-p 0009f000 08:06 1292662 /usr/lib64/icedtea6/jre/lib/amd64/libawt.so 7f686ad79000-7f686ad9d000 rw-p 00000000 00:00 0 7f686ad9d000-7f686ada1000 r--s 00079000 08:06 1292674 /usr/lib64/icedtea6/jre/lib/jsse.jar 7f686ada1000-7f686ada8000 r--s 000fe000 08:06 1293107 /usr/lib64/icedtea6/jre/lib/resources.jar 7f686ada8000-7f686adac000 r--s 0018d000 08:06 1292517 /usr/lib64/icedtea6/jre/lib/ext/pulse-java.jar 7f686adac000-7f686adad000 ---p 00000000 00:00 0 7f686adad000-7f686aead000 rwxp 00000000 00:00 0 7f686aead000-7f686aeb0000 ---p 00000000 00:00 0 7f686aeb0000-7f686afae000 rwxp 00000000 00:00 0 7f686afae000-7f686afb1000 ---p 00000000 00:00 0 7f686afb1000-7f686b0af000 rwxp 00000000 00:00 0 7f686b0af000-7f686b0b2000 ---p 00000000 00:00 0 7f686b0b2000-7f686b1b0000 rwxp 00000000 00:00 0 7f686b1b0000-7f686b1b3000 ---p 00000000 00:00 0 7f686b1b3000-7f686b2b1000 rwxp 00000000 00:00 0 7f686b2b1000-7f686b3f6000 r--p 00000000 08:06 72536 /usr/lib64/locale/locale-archive 7f686b3f6000-7f686b3f9000 ---p 00000000 00:00 0 7f686b3f9000-7f686b4f7000 rwxp 00000000 00:00 0 7f686b4f7000-7f686b4fa000 ---p 00000000 00:00 0 7f686b4fa000-7f686b5f8000 rwxp 00000000 00:00 0 7f686b5f8000-7f686b5f9000 ---p 00000000 00:00 0 7f686b5f9000-7f686b6f9000 rwxp 00000000 00:00 0 7f686b6f9000-7f686b78f000 rw-p 00000000 00:00 0 7f686b78f000-7f686b922000 r--s 038aa000 08:06 1293115 /usr/lib64/icedtea6/jre/lib/rt.jar 7f686b922000-7f686b94a000 rw-p 00000000 00:00 0 7f686b94a000-7f686b94b000 ---p 00000000 00:00 0 7f686b94b000-7f686ba4b000 rwxp 00000000 00:00 0 7f686ba4b000-7f686ba4c000 ---p 00000000 00:00 0 7f686ba4c000-7f686bb5a000 rwxp 00000000 00:00 0 7f686bb5a000-7f686bba0000 rwxp 00000000 00:00 0 7f686bba0000-7f686bba7000 rwxp 00000000 00:00 0 7f686bba7000-7f686bbcb000 rwxp 00000000 00:00 0 7f686bbcb000-7f686bbd9000 rwxp 00000000 00:00 0 7f686bbd9000-7f686bc1f000 rwxp 00000000 00:00 0 7f686bc1f000-7f686bc26000 rwxp 00000000 00:00 0 7f686bc26000-7f686bc49000 rwxp 00000000 00:00 0 7f686bc49000-7f686bc59000 rwxp 00000000 00:00 0 7f686bc59000-7f686bc5f000 rwxp 00000000 00:00 0 7f686bc5f000-7f686d820000 rwxp 00000000 00:00 0 7f686d820000-7f6876460000 rwxp 00000000 00:00 0 7f6876460000-7f68770c0000 rwxp 00000000 00:00 0 7f68770c0000-7f687b9c0000 rwxp 00000000 00:00 0 7f687b9c0000-7f687d7d0000 rwxp 00000000 00:00 0 7f687d7d0000-7f687e460000 rwxp 00000000 00:00 0 7f687e466000-7f687e6d6000 rwxp 00000000 00:00 0 7f687e6d6000-7f6881466000 rwxp 00000000 00:00 0 7f6881466000-7f688146d000 r-xp 00000000 08:06 1292636 /usr/lib64/icedtea6/jre/lib/amd64/libzip.so 7f688146d000-7f688166c000 ---p 00007000 08:06 1292636 /usr/lib64/icedtea6/jre/lib/amd64/libzip.so 7f688166c000-7f688166d000 rw-p 00006000 08:06 1292636 /usr/lib64/icedtea6/jre/lib/amd64/libzip.so 7f688166d000-7f6881678000 r-xp 00000000 08:06 1300213 /lib64/libnss_files-2.10.1.so 7f6881678000-7f6881877000 ---p 0000b000 08:06 1300213 /lib64/libnss_files-2.10.1.so 7f6881877000-7f6881878000 r--p 0000a000 08:06 1300213 /lib64/libnss_files-2.10.1.so 7f6881878000-7f6881879000 rw-p 0000b000 08:06 1300213 /lib64/libnss_files-2.10.1.so 7f6881879000-7f6881881000 r-xp 00000000 08:06 1292638 /usr/lib64/icedtea6/jre/lib/amd64/native_threads/libhpi.so 7f6881881000-7f6881a80000 ---p 00008000 08:06 1292638 /usr/lib64/icedtea6/jre/lib/amd64/native_threads/libhpi.so 7f6881a80000-7f6881a82000 rw-p 00007000 08:06 1292638 /usr/lib64/icedtea6/jre/lib/amd64/native_threads/libhpi.so 7f6881a82000-7f6881a97000 r-xp 00000000 08:06 79201 /lib64/libnsl-2.10.1.so 7f6881a97000-7f6881c96000 ---p 00015000 08:06 79201 /lib64/libnsl-2.10.1.so 7f6881c96000-7f6881c97000 r--p 00014000 08:06 79201 /lib64/libnsl-2.10.1.so 7f6881c97000-7f6881c98000 rw-p 00015000 08:06 79201 /lib64/libnsl-2.10.1.so 7f6881c98000-7f6881c9a000 rw-p 00000000 00:00 0 7f6881c9a000-7f6881cc6000 r-xp 00000000 08:06 1292646 /usr/lib64/icedtea6/jre/lib/amd64/libjava.so 7f6881cc6000-7f6881ec5000 ---p 0002c000 08:06 1292646 /usr/lib64/icedtea6/jre/lib/amd64/libjava.so 7f6881ec5000-7f6881ec9000 rw-p 0002b000 08:06 1292646 /usr/lib64/icedtea6/jre/lib/amd64/libjava.so 7f6881ec9000-7f6881ed7000 r-xp 00000000 08:06 1292534 /usr/lib64/icedtea6/jre/lib/amd64/libverify.so 7f6881ed7000-7f68820d7000 ---p 0000e000 08:06 1292534 /usr/lib64/icedtea6/jre/lib/amd64/libverify.so 7f68820d7000-7f68820d9000 rw-p 0000e000 08:06 1292534 /usr/lib64/icedtea6/jre/lib/amd64/libverify.so 7f68820d9000-7f68820e0000 r-xp 00000000 08:06 1300214 /lib64/librt-2.10.1.so 7f68820e0000-7f68822df000 ---p 00007000 08:06 1300214 /lib64/librt-2.10.1.so 7f68822df000-7f68822e0000 r--p 00006000 08:06 1300214 /lib64/librt-2.10.1.so 7f68822e0000-7f68822e1000 rw-p 00007000 08:06 1300214 /lib64/librt-2.10.1.so 7f68822e1000-7f6882361000 r-xp 00000000 08:06 1300206 /lib64/libm-2.10.1.so 7f6882361000-7f6882560000 ---p 00080000 08:06 1300206 /lib64/libm-2.10.1.so 7f6882560000-7f6882561000 r--p 0007f000 08:06 1300206 /lib64/libm-2.10.1.so 7f6882561000-7f6882562000 rw-p 00080000 08:06 1300206 /lib64/libm-2.10.1.so 7f6882562000-7f6882d19000 r-xp 00000000 08:06 1292650 /usr/lib64/icedtea6/jre/lib/amd64/server/libjvm.so 7f6882d19000-7f6882f18000 ---p 007b7000 08:06 1292650 /usr/lib64/icedtea6/jre/lib/amd64/server/libjvm.so 7f6882f18000-7f6882f9f000 rw-p 007b6000 08:06 1292650 /usr/lib64/icedtea6/jre/lib/amd64/server/libjvm.so 7f6882f9f000-7f6882fda000 rw-p 00000000 00:00 0 7f6882fda000-7f6883122000 r-xp 00000000 08:06 80809 /lib64/libc-2.10.1.so 7f6883122000-7f6883322000 ---p 00148000 08:06 80809 /lib64/libc-2.10.1.so 7f6883322000-7f6883326000 r--p 00148000 08:06 80809 /lib64/libc-2.10.1.so 7f6883326000-7f6883327000 rw-p 0014c000 08:06 80809 /lib64/libc-2.10.1.so 7f6883327000-7f688332c000 rw-p 00000000 00:00 0 7f688332c000-7f688332e000 r-xp 00000000 08:06 1300207 /lib64/libdl-2.10.1.so 7f688332e000-7f688352e000 ---p 00002000 08:06 1300207 /lib64/libdl-2.10.1.so 7f688352e000-7f688352f000 r--p 00002000 08:06 1300207 /lib64/libdl-2.10.1.so 7f688352f000-7f6883530000 rw-p 00003000 08:06 1300207 /lib64/libdl-2.10.1.so 7f6883530000-7f6883534000 r-xp 00000000 08:06 1292524 /usr/lib64/icedtea6/jre/lib/amd64/jli/libjli.so 7f6883534000-7f6883733000 ---p 00004000 08:06 1292524 /usr/lib64/icedtea6/jre/lib/amd64/jli/libjli.so 7f6883733000-7f6883734000 rw-p 00003000 08:06 1292524 /usr/lib64/icedtea6/jre/lib/amd64/jli/libjli.so 7f6883734000-7f688374a000 r-xp 00000000 08:06 1289577 /lib64/libpthread-2.10.1.so 7f688374a000-7f6883949000 ---p 00016000 08:06 1289577 /lib64/libpthread-2.10.1.so 7f6883949000-7f688394a000 r--p 00015000 08:06 1289577 /lib64/libpthread-2.10.1.so 7f688394a000-7f688394b000 rw-p 00016000 08:06 1289577 /lib64/libpthread-2.10.1.so 7f688394b000-7f688394f000 rw-p 00000000 00:00 0 7f688394f000-7f6883964000 r-xp 00000000 08:06 17522 /usr/lib64/libz.so.1.2.3 7f6883964000-7f6883b63000 ---p 00015000 08:06 17522 /usr/lib64/libz.so.1.2.3 7f6883b63000-7f6883b64000 rw-p 00014000 08:06 17522 /usr/lib64/libz.so.1.2.3 7f6883b64000-7f6883b81000 r-xp 00000000 08:06 79211 /lib64/ld-2.10.1.so 7f6883b82000-7f6883b8b000 r--s 00000000 08:07 13079 /var/cache/fontconfig/61adad38748e6da0c7625aee4dacf9fb-x86-64.cache-2 7f6883b8b000-7f6883ba4000 r--s 00000000 08:07 13077 /var/cache/fontconfig/3dac453e468bf8f9a616e4e686f19596-x86-64.cache-2 7f6883ba4000-7f6883bae000 rwxp 00000000 00:00 0 7f6883bae000-7f6883c64000 rwxp 00000000 00:00 0 7f6883c64000-7f6883c67000 ---p 00000000 00:00 0 7f6883c67000-7f6883d65000 rwxp 00000000 00:00 0 7f6883d65000-7f6883d69000 rw-p 00000000 00:00 0 7f6883d6b000-7f6883d74000 r--s 00000000 08:07 13079 /var/cache/fontconfig/61adad38748e6da0c7625aee4dacf9fb-x86-64.cache-2 7f6883d74000-7f6883d7c000 rw-s 00000000 08:06 1411370 /tmp/hsperfdata_abyss/18282 7f6883d7c000-7f6883d7d000 rw-p 00000000 00:00 0 7f6883d7d000-7f6883d7e000 r--p 00000000 00:00 0 7f6883d7e000-7f6883d80000 rw-p 00000000 00:00 0 7f6883d80000-7f6883d81000 r--p 0001c000 08:06 79211 /lib64/ld-2.10.1.so 7f6883d81000-7f6883d82000 rw-p 0001d000 08:06 79211 /lib64/ld-2.10.1.so 7fff41acf000-7fff41ae2000 rwxp 00000000 00:00 0 [stack] 7fff41ae2000-7fff41ae4000 rw-p 00000000 00:00 0 7fff41bff000-7fff41c00000 r-xp 00000000 00:00 0 [vdso] ffffffffff600000-ffffffffff601000 r-xp 00000000 00:00 0 [vsyscall] VM Arguments: jvm_args: -Dapplication.home=/usr/lib64/icedtea6/jre -Xms8m -Xmx128m java_command: net.sourceforge.jnlp.runtime.Boot -Xnofork -nosecurity ContestAppletProd.jnlp Launcher Type: SUN_STANDARD Environment Variables: PATH=/usr/local/bin:/usr/bin:/bin:/opt/bin USERNAME=abyss LD_LIBRARY_PATH=/usr/lib64/icedtea6/jre/lib/amd64/server:/usr/lib64/icedtea6/jre/lib/amd64:/usr/lib64/icedtea6/jre/../lib/amd64 SHELL=/bin/bash DISPLAY=:0.0 Signal Handlers: SIGSEGV: [libjvm.so+0x668f30], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004 SIGBUS: [libjvm.so+0x668f30], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004 SIGFPE: [libjvm.so+0x540df0], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004 SIGPIPE: [libjvm.so+0x540df0], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004 SIGXFSZ: [libjvm.so+0x540df0], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004 SIGILL: [libjvm.so+0x540df0], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004 SIGUSR1: SIG_DFL, sa_mask[0]=0x00000000, sa_flags=0x00000000 SIGUSR2: [libjvm.so+0x540590], sa_mask[0]=0x00000004, sa_flags=0x10000004 SIGHUP: [libjvm.so+0x542930], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004 SIGINT: [libjvm.so+0x542930], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004 SIGTERM: [libjvm.so+0x542930], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004 SIGQUIT: [libjvm.so+0x542930], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004 --------------- S Y S T E M --------------- OS:Linux uname:Linux 2.6.31.1 #2 SMP PREEMPT Fri Oct 2 01:53:08 MSD 2009 x86_64 libc:glibc 2.10.1 NPTL 2.10.1 rlimit: STACK 8192k, CORE 0k, NPROC 20471, NOFILE 1024, AS infinity load average:0.29 0.23 0.21 CPU:total 2 (2 cores per cpu, 1 threads per core) family 6 model 15 stepping 6, cmov, cx8, fxsr, mmx, sse, sse2, sse3, ssse3 Memory: 4k page, physical 2569156k(65772k free), swap 2618552k(2608296k free) vm_info: OpenJDK 64-Bit Server VM (14.0-b16) for linux-amd64 JRE (1.6.0_0-b16), built on Oct 7 2009 15:56:23 by "root" with gcc 4.4.1 time: Mon Oct 12 01:08:36 2009 elapsed time: 2 seconds -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From gbenson at redhat.com Mon Oct 12 04:11:59 2009 From: gbenson at redhat.com (Gary Benson) Date: Mon, 12 Oct 2009 12:11:59 +0100 Subject: Shark tweak Message-ID: <20091012111159.GA3601@redhat.com> Hi all, This commit removes a bunch of debug options from Shark that duplicate functionality already in HotSpot. If you were using the Shark options then please switch to their HotSpot equivalents: SharkStartAt -- use CIStart or CIStartOSR SharkStopAfter -- use CIEnd or CIEndOSR SharkOnlyCompile -- use CompileOnly Cheers, Gary -- http://gbenson.net/ -------------- next part -------------- diff -r d1d6d20cf4d1 ChangeLog --- a/ChangeLog Mon Oct 12 11:50:57 2009 +0100 +++ b/ChangeLog Mon Oct 12 12:01:20 2009 +0100 @@ -1,3 +1,10 @@ +2009-10-12 Gary Benson + + * ports/hotspot/src/share/vm/shark/shark_globals.hpp: + Removed SharkStartAt, SharkStopAfter and SharkOnlyCompile. + * ports/hotspot/src/share/vm/shark/shark_globals.hpp + (SharkCompiler::compile_method): Likewise. + 2009-10-09 Edward Nevill * Added initial support for Shark + ARM asm diff -r d1d6d20cf4d1 ports/hotspot/src/share/vm/shark/sharkCompiler.cpp --- a/ports/hotspot/src/share/vm/shark/sharkCompiler.cpp Mon Oct 12 11:50:57 2009 +0100 +++ b/ports/hotspot/src/share/vm/shark/sharkCompiler.cpp Mon Oct 12 12:01:20 2009 +0100 @@ -94,27 +94,6 @@ ResourceMark rm; const char *name = methodname(target); -#ifndef PRODUCT - // Skip methods if requested - static uintx methods_seen = 0; - methods_seen++; - if (methods_seen < SharkStartAt) { - env->record_method_not_compilable("methods_seen < SharkStartAt"); - return; - } - else if (methods_seen > SharkStopAfter) { - while (true) - sleep(1); - } -#endif // !PRODUCT - - if (SharkOnlyCompile != NULL) { - if (fnmatch(SharkOnlyCompile, name, 0)) { - env->record_method_not_compilable("does not match SharkOnlyCompile"); - return; - } - } - // Do the typeflow analysis ciTypeFlow *flow; if (entry_bci == InvocationEntryBci) diff -r d1d6d20cf4d1 ports/hotspot/src/share/vm/shark/shark_globals.hpp --- a/ports/hotspot/src/share/vm/shark/shark_globals.hpp Mon Oct 12 11:50:57 2009 +0100 +++ b/ports/hotspot/src/share/vm/shark/shark_globals.hpp Mon Oct 12 12:01:20 2009 +0100 @@ -37,15 +37,6 @@ "Maximum bytecode size of methods to inline when using Shark") \ \ /* compiler debugging */ \ - develop(uintx, SharkStartAt, 0, \ - "First method to consider when using Shark") \ - \ - develop(uintx, SharkStopAfter, max_uintx, \ - "Last method to consider when using Shark") \ - \ - develop(ccstr, SharkOnlyCompile, NULL, \ - "Only compile the specified method") \ - \ develop(ccstr, SharkPrintTypeflowOf, NULL, \ "Print the typeflow of the specified method") \ \ From gbenson at icedtea.classpath.org Mon Oct 12 04:02:23 2009 From: gbenson at icedtea.classpath.org (gbenson at icedtea.classpath.org) Date: Mon, 12 Oct 2009 11:02:23 +0000 Subject: /hg/icedtea6: 2009-10-12 Gary Benson Message-ID: changeset f2b2f87f120a in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=f2b2f87f120a author: Gary Benson date: Mon Oct 12 06:54:47 2009 -0400 2009-10-12 Gary Benson * ports/hotspot/src/share/vm/shark/shark_globals.hpp: Removed SharkStartAt, SharkStopAfter and SharkOnlyCompile. * ports/hotspot/src/share/vm/shark/shark_globals.hpp (SharkCompiler::compile_method): Likewise. diffstat: 3 files changed, 7 insertions(+), 30 deletions(-) ChangeLog | 7 ++++++ ports/hotspot/src/share/vm/shark/sharkCompiler.cpp | 21 -------------------- ports/hotspot/src/share/vm/shark/shark_globals.hpp | 9 -------- diffs (64 lines): diff -r 594e47c327ad -r f2b2f87f120a ChangeLog --- a/ChangeLog Fri Oct 09 17:21:41 2009 +0100 +++ b/ChangeLog Mon Oct 12 06:54:47 2009 -0400 @@ -1,3 +1,10 @@ 2009-10-09 Edward Nevill + + * ports/hotspot/src/share/vm/shark/shark_globals.hpp: + Removed SharkStartAt, SharkStopAfter and SharkOnlyCompile. + * ports/hotspot/src/share/vm/shark/shark_globals.hpp + (SharkCompiler::compile_method): Likewise. + 2009-10-09 Edward Nevill * Added initial support for Shark + ARM asm diff -r 594e47c327ad -r f2b2f87f120a ports/hotspot/src/share/vm/shark/sharkCompiler.cpp --- a/ports/hotspot/src/share/vm/shark/sharkCompiler.cpp Fri Oct 09 17:21:41 2009 +0100 +++ b/ports/hotspot/src/share/vm/shark/sharkCompiler.cpp Mon Oct 12 06:54:47 2009 -0400 @@ -93,27 +93,6 @@ void SharkCompiler::compile_method(ciEnv ResourceMark rm; const char *name = methodname(target); - -#ifndef PRODUCT - // Skip methods if requested - static uintx methods_seen = 0; - methods_seen++; - if (methods_seen < SharkStartAt) { - env->record_method_not_compilable("methods_seen < SharkStartAt"); - return; - } - else if (methods_seen > SharkStopAfter) { - while (true) - sleep(1); - } -#endif // !PRODUCT - - if (SharkOnlyCompile != NULL) { - if (fnmatch(SharkOnlyCompile, name, 0)) { - env->record_method_not_compilable("does not match SharkOnlyCompile"); - return; - } - } // Do the typeflow analysis ciTypeFlow *flow; diff -r 594e47c327ad -r f2b2f87f120a ports/hotspot/src/share/vm/shark/shark_globals.hpp --- a/ports/hotspot/src/share/vm/shark/shark_globals.hpp Fri Oct 09 17:21:41 2009 +0100 +++ b/ports/hotspot/src/share/vm/shark/shark_globals.hpp Mon Oct 12 06:54:47 2009 -0400 @@ -37,15 +37,6 @@ "Maximum bytecode size of methods to inline when using Shark") \ \ /* compiler debugging */ \ - develop(uintx, SharkStartAt, 0, \ - "First method to consider when using Shark") \ - \ - develop(uintx, SharkStopAfter, max_uintx, \ - "Last method to consider when using Shark") \ - \ - develop(ccstr, SharkOnlyCompile, NULL, \ - "Only compile the specified method") \ - \ develop(ccstr, SharkPrintTypeflowOf, NULL, \ "Print the typeflow of the specified method") \ \ From mark at klomp.org Tue Oct 13 02:17:24 2009 From: mark at klomp.org (Mark Wielaard) Date: Tue, 13 Oct 2009 11:17:24 +0200 Subject: FYI: Fix tapset gc_end typo Message-ID: <1255425444.26219.6.camel@springer.wildebeest.org> Hi, There was a typo in the hotspot.stp.in file which made hotspot.gc_end actually match gc__begin. Oops. Fixed as follows: 2009-10-13 Mark Wielaard * tapsets/hotspot.stp.in (hotspot.gc_end): Match gc__end, not begin. Cheers, Mark diff -r f2b2f87f120a tapset/hotspot.stp.in --- a/tapset/hotspot.stp.in Mon Oct 12 06:54:47 2009 -0400 +++ b/tapset/hotspot.stp.in Tue Oct 13 11:09:56 2009 +0200 @@ -51,8 +51,8 @@ Has no arguments. */ probe hotspot.gc_end = - process("@ABS_CLIENT_LIBJVM_SO@").mark("gc__begin"), - process("@ABS_SERVER_LIBJVM_SO@").mark("gc__begin") + process("@ABS_CLIENT_LIBJVM_SO@").mark("gc__end"), + process("@ABS_SERVER_LIBJVM_SO@").mark("gc__end") { name = "gc_end"; probestr = name; From bugzilla-daemon at icedtea.classpath.org Tue Oct 13 07:46:42 2009 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 13 Oct 2009 14:46:42 +0000 Subject: [Bug 386] SEGFAULT when loading applet Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=386 ------- Comment #1 from jon.vanalten at redhat.com 2009-10-13 14:46 ------- Hi, I notice that you get this crash when it is trying to load the libjpeg library. Can I ask what version of libjpeg you have installed? -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From bugzilla-daemon at icedtea.classpath.org Tue Oct 13 07:47:31 2009 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 13 Oct 2009 14:47:31 +0000 Subject: [Bug 390] ContestAppletProd.jnlp (Topcoder Arena Applet) crashes after launch Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=390 ------- Comment #1 from jon.vanalten at redhat.com 2009-10-13 14:47 ------- Hi, I notice that you get this crash when it is trying to load the libjpeg library. Can I ask what version of libjpeg you have installed? -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From mjw at icedtea.classpath.org Tue Oct 13 02:09:47 2009 From: mjw at icedtea.classpath.org (mjw at icedtea.classpath.org) Date: Tue, 13 Oct 2009 09:09:47 +0000 Subject: /hg/icedtea6: tapsets/hotspot.stp.in (hotspot.gc_end): Match gc_... Message-ID: changeset d8a6d7027d06 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=d8a6d7027d06 author: Mark Wielaard date: Tue Oct 13 11:13:46 2009 +0200 tapsets/hotspot.stp.in (hotspot.gc_end): Match gc__end, not begin. diffstat: 2 files changed, 6 insertions(+), 2 deletions(-) ChangeLog | 4 ++++ tapset/hotspot.stp.in | 4 ++-- diffs (25 lines): diff -r f2b2f87f120a -r d8a6d7027d06 ChangeLog --- a/ChangeLog Mon Oct 12 06:54:47 2009 -0400 +++ b/ChangeLog Tue Oct 13 11:13:46 2009 +0200 @@ -1,3 +1,7 @@ 2009-10-12 Gary Benson + + * tapsets/hotspot.stp.in (hotspot.gc_end): Match gc__end, not begin. + 2009-10-12 Gary Benson * ports/hotspot/src/share/vm/shark/shark_globals.hpp: diff -r f2b2f87f120a -r d8a6d7027d06 tapset/hotspot.stp.in --- a/tapset/hotspot.stp.in Mon Oct 12 06:54:47 2009 -0400 +++ b/tapset/hotspot.stp.in Tue Oct 13 11:13:46 2009 +0200 @@ -51,8 +51,8 @@ probe hotspot.gc_begin = Has no arguments. */ probe hotspot.gc_end = - process("@ABS_CLIENT_LIBJVM_SO@").mark("gc__begin"), - process("@ABS_SERVER_LIBJVM_SO@").mark("gc__begin") + process("@ABS_CLIENT_LIBJVM_SO@").mark("gc__end"), + process("@ABS_SERVER_LIBJVM_SO@").mark("gc__end") { name = "gc_end"; probestr = name; From andrew at icedtea.classpath.org Tue Oct 13 18:15:34 2009 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Wed, 14 Oct 2009 01:15:34 +0000 Subject: /hg/icedtea: Bump to b73, support drop zips and use extended rt.... Message-ID: changeset 05e6f20fb7fd in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=05e6f20fb7fd author: Andrew John Hughes date: Wed Oct 14 02:18:26 2009 +0100 Bump to b73, support drop zips and use extended rt.jar for build. 2009-10-08 Andrew John Hughes * ChangeLog: Remove stray tab. * Makefile.am: Bump to b73, move CACAO URLs to top, add support for new JAXP and JAXWS drop zips, remove references to non-existent clean-shared-objects and clean- copy targets, fix broken references to bootstrap-directory- symlink-boot.stamp, update build JDK with rt classes rather than creating a separate rt-closed.jar, add additional copy directories needed by gcj bootstrap. * acinclude.m4: (WITH_JAXP_DROP_ZIP): New options --with-jaxp- drop-zip to specify location of the JAXP drop. (WITH_JAF_DROP_ZIP): Likewise for JAF. (WITH_JAXWS_DROP_ZIP): And JAXWS. * configure.ac: Run new macros for drop zips. * javac.in: Use local extended rt.jar rather than original. * patches/boot/icedtea-jaxp-dependency.patch: Add the JAXP classes to the classpath when building JAXWS (existing build assumes com.sun.org.apache.xerces classes are in the boot JDK). * patches/boot/icedtea.patch, * patches/icedtea-alpha-fixes.patch, * patches/icedtea-ant.patch: Regenerated. diffstat: 9 files changed, 380 insertions(+), 241 deletions(-) ChangeLog | 29 +++ Makefile.am | 177 +++++++++++++++---- acinclude.m4 | 51 +++++ configure.ac | 3 javac.in | 2 patches/boot/icedtea-jaxp-dependency.patch | 26 ++ patches/boot/icedtea.patch | 251 +++++++++++----------------- patches/icedtea-alpha-fixes.patch | 44 +--- patches/icedtea-ant.patch | 38 ++-- diffs (truncated from 1056 to 500 lines): diff -r 19ad2af4b4e3 -r 05e6f20fb7fd ChangeLog --- a/ChangeLog Thu Oct 08 13:19:08 2009 +0200 +++ b/ChangeLog Wed Oct 14 02:18:26 2009 +0100 @@ -1,3 +1,30 @@ 2009-10-08 Matthias Klose + + * ChangeLog: Remove stray tab. + * Makefile.am: Bump to b73, + move CACAO URLs to top, add support + for new JAXP and JAXWS drop zips, remove + references to non-existent clean-shared-objects + and clean-copy targets, fix broken references to + bootstrap-directory-symlink-boot.stamp, update + build JDK with rt classes rather than creating a + separate rt-closed.jar, add additional copy + directories needed by gcj bootstrap. + * acinclude.m4: + (WITH_JAXP_DROP_ZIP): New options --with-jaxp-drop-zip + to specify location of the JAXP drop. + (WITH_JAF_DROP_ZIP): Likewise for JAF. + (WITH_JAXWS_DROP_ZIP): And JAXWS. + * configure.ac: Run new macros for drop zips. + * javac.in: Use local extended rt.jar rather than original. + * patches/boot/icedtea-jaxp-dependency.patch: Add the JAXP + classes to the classpath when building JAXWS (existing build + assumes com.sun.org.apache.xerces classes are in the boot JDK). + * patches/boot/icedtea.patch, + * patches/icedtea-alpha-fixes.patch, + * patches/icedtea-ant.patch: + Regenerated. + 2009-10-08 Matthias Klose * Makefile.am (stamps/icedtea.stamp, stamps/icedtea-debug.stamp): @@ -14204,7 +14231,7 @@ 2008-01-07 Lillian Angel - + Fixes Bug #92 * Makefile.am (gcjwebplugin.so): Added check for ENABLE_PLUGIN. diff -r 19ad2af4b4e3 -r 05e6f20fb7fd Makefile.am --- a/Makefile.am Thu Oct 08 13:19:08 2009 +0200 +++ b/Makefile.am Wed Oct 14 02:18:26 2009 +0100 @@ -1,25 +1,27 @@ # Dependencies -OPENJDK_VERSION = b72 - -CORBA_CHANGESET = 5fdcfb25dbb4 -HOTSPOT_CHANGESET = c8155bc21432 -JAXP_CHANGESET = fe2e7f835dd2 -JAXWS_CHANGESET = 501b8988da30 -JDK_CHANGESET = c2cd86f82ed7 -LANGTOOLS_CHANGESET = 5a36337cc053 -OPENJDK_CHANGESET = 717f2b969919 - -CORBA_MD5SUM = 5a9fef662129c05b2dd05c79a2685178 -HOTSPOT_MD5SUM = e5b21a7e5cc5cae315cd9aa158ee9858 -JAXP_MD5SUM = f4bd08cf016fefe31c4269b9d90edec0 -JAXWS_MD5SUM = 8d0729f5c4ddec47393e636e7d6a4914 -JDK_MD5SUM = 622268153bc097a5b91d76305eb0502d -LANGTOOLS_MD5SUM = eadbaead19df2fbe039fd12593e97197 -OPENJDK_MD5SUM = b5d1f6fad70a2b6af7b011169fbd6da3 +OPENJDK_VERSION = b73 + +CORBA_CHANGESET = bb1f254d2376 +HOTSPOT_CHANGESET = de2100353d9c +JAXP_CHANGESET = ca47845adba8 +JAXWS_CHANGESET = a85341f84531 +JDK_CHANGESET = 93da8a843f32 +LANGTOOLS_CHANGESET = 26651c0cabb7 +OPENJDK_CHANGESET = a580d2beece9 + +CORBA_MD5SUM = 80e4f10ff90ecd80b32a39dbe6f7fa77 +HOTSPOT_MD5SUM = efc9ee49fe1f10f9a6db2ec897e76937 +JAXP_MD5SUM = d2aa8cd7aaeeabfb9116f020921fb7ea +JAXWS_MD5SUM = 0fa8f01a5baa8764106370321fdb3974 +JDK_MD5SUM = f127c5785e84443f869fb1695f786749 +LANGTOOLS_MD5SUM = 3b5f8641e805b22562452924d0bf4ea5 +OPENJDK_MD5SUM = 17bc02e01cfdb06ee06f01026e93b0a2 CACAO_VERSION = 0.99.4 CACAO_MD5SUM = 63220327925ace13756ae334c55a3baa +CACAO_BASE_URL = http://www.complang.tuwien.ac.at +CACAO_URL = $(CACAO_BASE_URL)/cacaojvm/download/cacao-$(CACAO_VERSION)/ NETBEANS_PROFILER_URL = http://icedtea.classpath.org/visualvm/ NETBEANS_PROFILER_SRC_ZIP = netbeans-profiler-visualvm_release65_mod.tar.gz @@ -28,6 +30,14 @@ VISUALVM_URL = https://visualvm.dev.java VISUALVM_URL = https://visualvm.dev.java.net/files/documents/7163/127170/ VISUALVM_SRC_ZIP = visualvm-111-src.tar.gz VISUALVM_MD5SUM = a289739f4a5bcdb9a2c642cfcc1e83fe + +DROP_URL = http://kenai.com/projects/jdk7-drops/downloads/download +JAXWS_DROP_ZIP = jdk7-jaxws-2009_09_28.zip +JAXWS_DROP_MD5SUM = debb949440c5a15ce999cfefbbc56526 +JAF_DROP_ZIP = jdk7-jaf-2009_08_28.zip +JAF_DROP_MD5SUM = eb8cb7a4a7f14e211fbe2354878a2472 +JAXP_DROP_ZIP = jdk7-jaxp-2009_09_28.zip +JAXP_DROP_MD5SUM = 8800970d03bab1fff188dcfafc346f5d OPENJDK_HOTSPOT_URL = http://hg.openjdk.java.net/jdk7/hotspot/hotspot @@ -46,9 +56,6 @@ JDK_URL = $(ICEDTEA_HG_URL)/jdk JDK_URL = $(ICEDTEA_HG_URL)/jdk LANGTOOLS_URL = $(ICEDTEA_HG_URL)/langtools HOTSPOT_URL = $(ICEDTEA_HG_URL)/hotspot - -CACAO_BASE_URL = http://www.complang.tuwien.ac.at -CACAO_URL = $(CACAO_BASE_URL)/cacaojvm/download/cacao-$(CACAO_VERSION)/ JDK_SHARE = openjdk/jdk/src/share/classes JDK_SOLARIS = openjdk/jdk/src/solaris/classes @@ -361,7 +368,8 @@ ICEDTEA_BOOT_PATCHES = patches/boot/iced ICEDTEA_BOOT_PATCHES = patches/boot/icedtea.patch \ patches/boot/icedtea-hotspot-$(HSBUILD).patch \ patches/boot/icedtea-jopt.patch \ - patches/boot/icedtea-dyn.patch + patches/boot/icedtea-dyn.patch \ + patches/boot/icedtea-jaxp-dependency.patch if CP39408_JAVAH ICEDTEA_BOOT_PATCHES += patches/boot/icedtea-pr39408.patch @@ -456,7 +464,8 @@ ICEDTEA_ENV = \ ALT_LIVECONNECT_DIST="$(abs_top_builddir)" \ DEBUG_CLASSFILES="true" \ DEBUG_BINARIES="true" \ - DISABLE_INTREE_EC="true" + DISABLE_INTREE_EC="true" \ + ALT_DROPS_DIR="$(abs_top_builddir)/drops" if WITH_CACAO ICEDTEA_ENV += \ @@ -666,8 +675,10 @@ all-local: icedtea-stage2 check-local: jtregcheck -distclean-local: clean-copy clean-jtreg clean-jtreg-reports clean-pulse-java +distclean-local: clean-jtreg clean-jtreg-reports clean-pulse-java \ + clean-clone clean-clone-boot clean-download rm -rf stamps + rm -rf drops rm -f rt-source-files.txt \ hotspot-tools-source-files.txt \ extra-source-files.txt \ @@ -675,8 +686,6 @@ distclean-local: clean-copy clean-jtreg rm -rf bootstrap rm -rf lib rm -rf extra-lib - rm -rf openjdk-boot - rm -rf openjdk rm -rf hotspot-tools rm -rf rt/netscape rm -rf visualvm @@ -710,8 +719,8 @@ install: clean-bootstrap-directory-symlink-stage2 clean-bootstrap-directory-stage1 \ clean-bootstrap-directory-symlink-stage1 icedtea icedtea-debug \ clean-icedtea icedtea-stage2 clean-icedtea-boot clean-plugs \ - clean-tools-jar clean-shared-objects clean-visualvm clean-nbplatform \ - clean-copy clean-hotspot-tools clean-rt $(ICEDTEAPLUGIN_CLEAN) \ + clean-tools-jar clean-visualvm clean-nbplatform \ + clean-hotspot-tools clean-rt $(ICEDTEAPLUGIN_CLEAN) \ $(ICEDTEANPPLUGIN_CLEAN) hotspot hotspot-helper clean-extra clean-jtreg \ clean-jtreg-reports @@ -741,7 +750,63 @@ dist-openjdk-fsg: stamps/patch-fsg.stamp # Download OpenJDK sources. -stamps/download.stamp: stamps/hgforest.stamp +stamps/download-jaxp-drop.stamp: + mkdir -p drops +if USE_ALT_JAXP_DROP_ZIP + ln -sf $(ALT_JAXP_DROP_ZIP) drops/$(JAXP_DROP_ZIP) +endif + if ! echo "$(JAXP_DROP_MD5SUM) drops/$(JAXP_DROP_ZIP)" \ + | $(MD5SUM) --check ; \ + then \ + if [ -f drops/$(JAXP_DROP_ZIP) ] ; \ + then \ + mv drops/$(JAXP_DROP_ZIP) drops/$(JAXP_DROP_ZIP).old ; \ + fi ; \ + $(WGET) $(DROP_URL)/$(JAXP_DROP_ZIP) -O drops/$(JAXP_DROP_ZIP); \ + fi ; + mkdir -p stamps + touch stamps/download-jaxp-drop.stamp + +stamps/download-jaf-drop.stamp: + mkdir -p drops +if USE_ALT_JAF_DROP_ZIP + ln -sf $(ALT_JAF_DROP_ZIP) drops/$(JAF_DROP_ZIP) +endif + if ! echo "$(JAF_DROP_MD5SUM) drops/$(JAF_DROP_ZIP)" \ + | $(MD5SUM) --check ; \ + then \ + if [ -f drops/$(JAF_DROP_ZIP) ] ; \ + then \ + mv drops/$(JAF_DROP_ZIP) drops/$(JAF_DROP_ZIP).old ; \ + fi ; \ + $(WGET) $(DROP_URL)/$(JAF_DROP_ZIP) -O drops/$(JAF_DROP_ZIP); \ + fi ; + mkdir -p stamps + touch stamps/download-jaf-drop.stamp + +stamps/download-jaxws-drop.stamp: + mkdir -p drops +if USE_ALT_JAXWS_DROP_ZIP + ln -sf $(ALT_JAXWS_DROP_ZIP) drops/$(JAXWS_DROP_ZIP) +endif + if ! echo "$(JAXWS_DROP_MD5SUM) drops/$(JAXWS_DROP_ZIP)" \ + | $(MD5SUM) --check ; \ + then \ + if [ -f drops/$(JAXWS_DROP_ZIP) ] ; \ + then \ + mv drops/$(JAXWS_DROP_ZIP) drops/$(JAXWS_DROP_ZIP).old ; \ + fi ; \ + $(WGET) $(DROP_URL)/$(JAXWS_DROP_ZIP) -O drops/$(JAXWS_DROP_ZIP); \ + fi ; + mkdir -p stamps + touch stamps/download-jaxws-drop.stamp + +stamps/download-drops.stamp: stamps/download-jaxp-drop.stamp \ + stamps/download-jaxws-drop.stamp stamps/download-jaf-drop.stamp + mkdir -p stamps + touch stamps/download-drops.stamp + +stamps/download.stamp: stamps/hgforest.stamp stamps/download-drops.stamp if !OPENJDK_SRC_DIR_FOUND if USE_ALT_OPENJDK_SRC_ZIP else @@ -884,7 +949,23 @@ endif mkdir -p stamps touch stamps/download.stamp -clean-download: +clean-download-jaxp-drop: + rm -f drops/$(JAXP_DROP_ZIP) + rm -f stamps/download-jaxp-drop.stamp + +clean-download-jaf-drop: + rm -f drops/$(JAF_DROP_ZIP) + rm -f stamps/download-jaf-drop.stamp + +clean-download-jaxws-drop: + rm -f drops/$(JAXWS_DROP_ZIP) + rm -f stamps/download-jaxws-drop.stamp + +clean-drops: clean-download-jaxp-drop clean-download-jaf-drop \ + clean-download-jaxws-drop + rm -f stamps/download-drops.stamp + +clean-download: clean-drops rm -f $(OPENJDK_SRC_ZIP) if BUILD_CACAO rm -f $(CACAO_SRC_ZIP) @@ -1377,8 +1458,9 @@ stamps/bootstrap-directory-stage1.stamp: bootstrap/boot/lib/endorsed/xalan-j2-serializer.jar ln -sf $(XERCES2_JAR) bootstrap/boot/lib/endorsed/xerces-j2.jar mkdir -p bootstrap/boot/jre/lib; \ - ln -sf $(SYSTEM_JDK_DIR)/jre/lib/rt.jar \ - bootstrap/boot/jre/lib/rt-system.jar; \ + cp $(SYSTEM_JDK_DIR)/jre/lib/rt.jar \ + bootstrap/boot/jre/lib/rt.jar; \ + chmod u+w bootstrap/boot/jre/lib/rt.jar; \ ln -sf $(SYSTEM_JDK_DIR)/jre/lib/$(JRE_ARCH_DIR) \ bootstrap/boot/jre/lib/; \ if ! test -d bootstrap/boot/jre/lib/$(INSTALL_ARCH_DIR); \ @@ -1433,10 +1515,10 @@ stamps/bootstrap-directory-symlink-stage rm -f bootstrap/jdk1.6.0 ln -sf boot bootstrap/jdk1.6.0 mkdir -p stamps - touch stamps/bootstrap-directory-symlink-boot.stamp + touch stamps/bootstrap-directory-symlink-stage1.stamp clean-bootstrap-directory-symlink-stage1: - rm -f stamps/bootstrap-directory-symlink-boot.stamp + rm -f stamps/bootstrap-directory-symlink-stage1.stamp rm -f bootstrap/jdk1.6.0 # stage 2 symlink. @@ -2201,8 +2283,7 @@ stamps/hotspot-tools.stamp: bootstrap/jd mkdir -p stamps touch stamps/hotspot-tools.stamp -clean-plugs: clean-plugs clean-shared-objects \ - clean-copy clean-rt +clean-plugs: clean-plugs clean-rt rm -f stamps/plugs.stamp rm -f bootstrap/jdk1.7.0/jre/lib/rt-closed.jar @@ -2216,11 +2297,15 @@ ICEDTEA_BOOTSTRAP_DIRS = \ $(JDK_SHARE)/com/sun/tools/jdi \ $(JDK_SHARE)/com/sun/net/httpserver \ $(JDK_SHARE)/java/io \ + $(JDK_SHARE)/java/security/cert \ $(JDK_SHARE)/java/util \ $(JDK_SHARE)/java/rmi \ + $(JDK_SHARE)/javax/net/ssl \ + $(JDK_SHARE)/javax/rmi/ssl \ + $(JDK_SHARE)/javax/script \ + $(JDK_SHARE)/javax/security/auth/kerberos \ + $(JDK_SHARE)/javax/security/sasl \ $(JDK_SHARE)/sun/awt/ \ - $(JDK_SHARE)/javax/net/ssl \ - $(JDK_SHARE)/javax/script \ $(JAXWS)/javax/xml/bind # tools.jar class files. @@ -2316,13 +2401,13 @@ clean-rt: # rt-closed.jar. bootstrap/jdk1.7.0/jre/lib/rt-closed.jar: stamps/rt-class-files.stamp - mkdir -p bootstrap/jdk1.7.0/jre/lib - $(ICEDTEA_BOOT_DIR)/bin/jar cf $@ -C lib/rt com -C lib/rt java \ - -C lib/rt javax -C lib/rt sun ; if test -d bootstrap/boot/jre/lib ; \ then \ - cp bootstrap/jdk1.7.0/jre/lib/rt-closed.jar \ - bootstrap/boot/jre/lib/rt.jar; \ + $(ICEDTEA_BOOT_DIR)/bin/jar uf bootstrap/boot/jre/lib/rt.jar \ + -C lib/rt com -C lib/rt java -C lib/rt javax -C lib/rt sun ; \ + mkdir -p bootstrap/jdk1.7.0/jre/lib ; \ + ln -sf ${abs_top_builddir}/bootstrap/boot/jre/lib/rt.jar \ + bootstrap/jdk1.7.0/jre/lib/rt-closed.jar ; \ fi # Target Aliases @@ -2352,6 +2437,14 @@ nbplatform: stamps/nbplatform.stamp download: stamps/download.stamp +download-drops: stamps/download-drops.stamp + +download-jaf-drop: stamps/download-jaf-drop.stamp + +download-jaxp-drop: stamps/download-jaxp-drop.stamp + +download-jaxws-drop: stamps/download-jaxws-drop.stamp + extract: stamps/extract.stamp extract-cacao: stamps/extract-cacao.stamp diff -r 19ad2af4b4e3 -r 05e6f20fb7fd acinclude.m4 --- a/acinclude.m4 Thu Oct 08 13:19:08 2009 +0200 +++ b/acinclude.m4 Wed Oct 14 02:18:26 2009 +0100 @@ -1100,6 +1100,57 @@ AC_DEFUN([WITH_LANGTOOLS_SRC_ZIP], AC_SUBST(ALT_LANGTOOLS_SRC_ZIP) ]) +AC_DEFUN([WITH_JAXP_DROP_ZIP], +[ + AC_MSG_CHECKING(for a JAXP drop zip) + AC_ARG_WITH([jaxp-drop-zip], + [AS_HELP_STRING(--with-jaxp-drop-zip,specify the location of the JAXP drop zip)], + [ + ALT_JAXP_DROP_ZIP=${withval} + AM_CONDITIONAL(USE_ALT_JAXP_DROP_ZIP, test x = x) + ], + [ + ALT_JAXP_DROP_ZIP="not specified" + AM_CONDITIONAL(USE_ALT_JAXP_DROP_ZIP, test x != x) + ]) + AC_MSG_RESULT(${ALT_JAXP_DROP_ZIP}) + AC_SUBST(ALT_JAXP_DROP_ZIP) +]) + +AC_DEFUN([WITH_JAF_DROP_ZIP], +[ + AC_MSG_CHECKING(for a JAF drop zip) + AC_ARG_WITH([jaf-drop-zip], + [AS_HELP_STRING(--with-jaf-drop-zip,specify the location of the JAF drop zip)], + [ + ALT_JAF_DROP_ZIP=${withval} + AM_CONDITIONAL(USE_ALT_JAF_DROP_ZIP, test x = x) + ], + [ + ALT_JAF_DROP_ZIP="not specified" + AM_CONDITIONAL(USE_ALT_JAF_DROP_ZIP, test x != x) + ]) + AC_MSG_RESULT(${ALT_JAF_DROP_ZIP}) + AC_SUBST(ALT_JAF_DROP_ZIP) +]) + +AC_DEFUN([WITH_JAXWS_DROP_ZIP], +[ + AC_MSG_CHECKING(for a JAXWS drop zip) + AC_ARG_WITH([jaxws-drop-zip], + [AS_HELP_STRING(--with-jaxws-drop-zip,specify the location of the JAXWS drop zip)], + [ + ALT_JAXWS_DROP_ZIP=${withval} + AM_CONDITIONAL(USE_ALT_JAXWS_DROP_ZIP, test x = x) + ], + [ + ALT_JAXWS_DROP_ZIP="not specified" + AM_CONDITIONAL(USE_ALT_JAXWS_DROP_ZIP, test x != x) + ]) + AC_MSG_RESULT(${ALT_JAXWS_DROP_ZIP}) + AC_SUBST(ALT_JAXWS_DROP_ZIP) +]) + AC_DEFUN([AC_CHECK_WITH_HG_REVISION], [ AC_MSG_CHECKING([which Mercurial revision to use]) diff -r 19ad2af4b4e3 -r 05e6f20fb7fd configure.ac --- a/configure.ac Thu Oct 08 13:19:08 2009 +0200 +++ b/configure.ac Wed Oct 14 02:18:26 2009 +0100 @@ -225,6 +225,9 @@ WITH_LANGTOOLS_SRC_ZIP WITH_LANGTOOLS_SRC_ZIP WITH_OPENJDK_SRC_DIR WITH_ALT_JAR_BINARY +WITH_JAXP_DROP_ZIP +WITH_JAF_DROP_ZIP +WITH_JAXWS_DROP_ZIP AC_CHECK_ENABLE_CACAO AC_CHECK_WITH_CACAO_HOME diff -r 19ad2af4b4e3 -r 05e6f20fb7fd javac.in --- a/javac.in Thu Oct 08 13:19:08 2009 +0200 +++ b/javac.in Wed Oct 14 02:18:26 2009 +0100 @@ -17,7 +17,7 @@ else } my @bcoption; -push @bcoption, '-bootclasspath', glob '@SYSTEM_JDK_DIR@/jre/lib/rt.jar' +push @bcoption, '-bootclasspath', glob '@abs_top_builddir@/bootstrap/jdk1.6.0/jre/lib/rt.jar' unless grep {$_ eq '-bootclasspath'} @ARGV; my @ecj_parms = ($ECJ_WARNINGS, @bcoption); diff -r 19ad2af4b4e3 -r 05e6f20fb7fd patches/boot/icedtea-jaxp-dependency.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/boot/icedtea-jaxp-dependency.patch Wed Oct 14 02:18:26 2009 +0100 @@ -0,0 +1,26 @@ +diff -Nru openjdk-boot.orig/jaxws/build.properties openjdk-boot/jaxws/build.properties +--- openjdk-boot.orig/jaxws/build.properties 2009-10-12 15:42:14.000000000 +0100 ++++ openjdk-boot/jaxws/build.properties 2009-10-12 15:45:40.000000000 +0100 +@@ -58,6 +58,9 @@ + build.dir=${output.dir}/build + build.classes.dir=${build.dir}/classes + ++# JAXP built files ++jaxp.classes.dir=${output.dir}/../jaxp/build/classes ++ + # Distributed results + dist.dir=${output.dir}/dist + dist.lib.dir=${dist.dir}/lib +diff -Nru openjdk-boot.orig/jaxws/build.xml openjdk-boot/jaxws/build.xml +--- openjdk-boot.orig/jaxws/build.xml 2009-10-12 15:20:51.000000000 +0100 ++++ openjdk-boot/jaxws/build.xml 2009-10-12 15:19:42.000000000 +0100 +@@ -113,7 +113,8 @@ + source="${javac.source}" + debug="${javac.debug}" + target="${javac.target}" +- executable="${javac.executable}"> ++ executable="${javac.executable}" ++ classpath="${jaxp.classes.dir}:${build.classes.dir}"> + + + diff -r 19ad2af4b4e3 -r 05e6f20fb7fd patches/boot/icedtea.patch --- a/patches/boot/icedtea.patch Thu Oct 08 13:19:08 2009 +0200 +++ b/patches/boot/icedtea.patch Wed Oct 14 02:18:26 2009 +0100 @@ -1,6 +1,6 @@ diff -Nru openjdk-boot.orig/corba/make/c diff -Nru openjdk-boot.orig/corba/make/com/sun/corba/se/Makefile openjdk-boot/corba/make/com/sun/corba/se/Makefile ---- openjdk-boot.orig/corba/make/com/sun/corba/se/Makefile 2009-03-30 17:13:01.000000000 +0100 -+++ openjdk-boot/corba/make/com/sun/corba/se/Makefile 2009-07-14 17:47:13.000000000 +0100 +--- openjdk-boot.orig/corba/make/com/sun/corba/se/Makefile 2009-10-05 02:23:42.764274773 +0100 ++++ openjdk-boot/corba/make/com/sun/corba/se/Makefile 2009-10-07 15:38:47.674613200 +0100 @@ -42,7 +42,7 @@ # the rmic iiop backend needs some classes that are part of the impl/util # package. These classes use log wrappers, so they must be built after @@ -12,7 +12,7 @@ diff -Nru openjdk-boot.orig/corba/make/c diff -Nru openjdk-boot.orig/corba/make/com/sun/corba/se/org/Makefile openjdk-boot/corba/make/com/sun/corba/se/org/Makefile --- openjdk-boot.orig/corba/make/com/sun/corba/se/org/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk-boot/corba/make/com/sun/corba/se/org/Makefile 2009-07-14 17:47:13.000000000 +0100 ++++ openjdk-boot/corba/make/com/sun/corba/se/org/Makefile 2009-10-07 15:38:47.675617951 +0100 @@ -0,0 +1,38 @@ +# +# Copyright 2001-2005 Sun Microsystems, Inc. All Rights Reserved. @@ -53,8 +53,8 @@ diff -Nru openjdk-boot.orig/corba/make/c +# +include $(BUILDDIR)/common/Classes.gmk diff -Nru openjdk-boot.orig/corba/make/common/Defs.gmk openjdk-boot/corba/make/common/Defs.gmk ---- openjdk-boot.orig/corba/make/common/Defs.gmk 2009-03-30 17:13:01.000000000 +0100 -+++ openjdk-boot/corba/make/common/Defs.gmk 2009-07-14 17:47:13.000000000 +0100 +--- openjdk-boot.orig/corba/make/common/Defs.gmk 2009-10-05 02:23:42.789274774 +0100 ++++ openjdk-boot/corba/make/common/Defs.gmk 2009-10-07 15:38:47.675617951 +0100 @@ -53,6 +53,13 @@ _OUTPUTDIR=$(TOPDIR)/build/$(PLATFORM)-$(ARCH) @@ -88,8 +88,8 @@ diff -Nru openjdk-boot.orig/corba/make/c vpath %.java $(VPATH.java) vpath %.class $(CLASSBINDIR) diff -Nru openjdk-boot.orig/corba/make/common/Defs-linux.gmk openjdk-boot/corba/make/common/Defs-linux.gmk ---- openjdk-boot.orig/corba/make/common/Defs-linux.gmk 2009-07-14 17:37:18.000000000 +0100 -+++ openjdk-boot/corba/make/common/Defs-linux.gmk 2009-07-14 17:47:13.000000000 +0100 +--- openjdk-boot.orig/corba/make/common/Defs-linux.gmk 2009-10-07 15:24:05.904817673 +0100 From bugzilla-daemon at icedtea.classpath.org Tue Oct 13 20:29:58 2009 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 14 Oct 2009 03:29:58 +0000 Subject: [Bug 389] Iced Tea 1.11, openjdk7 compilation issue in Suse Linux Enterprise Server 11 Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=389 ------- Comment #2 from balajiraman at ge.com 2009-10-14 03:29 ------- (In reply to comment #1) > What is /usr/java/jdk1.6.0_10? Is this the proprietary Sun JDK? We don't > support building with this JDK. You should be using either GCJ or IcedTea. As > documented in the NEWS file of IcedTea7 1.11, you should use the > --disable-bootstrap mode of operation when building with IcedTea as there are > still some issues that need to be resolved with using it to bootstrap. > > I suspect that the OpenGL header issues may be one of these problems as they > are currently patched unconditionally to match the output from gjavah as > supplied with GCJ. I've never seen the tracing issue before and can't really > suggest anything as we don't know what is in the proprietary JDK. Please use a > supported JDK and see if the same errors occur. > Hi Andrew, I installed gcj4.3 in my system. Since i am not very familiar with gcj, i am not sure what i need to pass to jdk home now in ./configure to get the make file. This is what i gave: ./configure --build=x86_64 --with-javac=/usr/bin/gcj --with-javah=/usr/bin/gcjh --with-ant-home=/export/home/sdc/openjdk7/apache-ant-1.7.1 --with-gcj=/usr/bin --with-xalan2-jar=/export/home/sdc/openjdk7/xalan-j_2_7_1/xalan.jar --with-xalan2-serializer-jar=/export/home/sdc/openjdk7/xalan-j_2_7_1/serializer.jar --with-xerces2-jar=/export/home/sdc/openjdk7/xalan-j_2_7_1/xercesImpl.jar --with-rhino=/export/home/sdc/openjdk7/rhino1_7R2/js.jar --disable-plugin --disable-bootstrap Any help is appreciated. Thanks, Balaji. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From mark at klomp.org Wed Oct 14 06:43:00 2009 From: mark at klomp.org (Mark Wielaard) Date: Wed, 14 Oct 2009 15:43:00 +0200 Subject: Enable systemtap jni tracing Message-ID: <1255527780.3317.37.camel@springer.wildebeest.org> Hi, There were two issues preventing systemtap tracing of JNI methods. The first was an issue with the systemtap sdt.h probe points not working for c++ class constructors/destructors. The second was that some JNI macros were using some dtrace implementation tricks instead of using the standard dtrace macros. This patch first adds a configure check to see that there is a recent enough systemtap sdt.h (0.9.9+ is fine) and a recent enough g++ for compiling the result. I don't exactly know when g++ was fixed, but gcc 4.1 is too old, while gcc 4.4 is fine. For this reason I wrote a feature check that actually compiles and links a little program to make sure everything works as intended. Secondly it cleans up jni.cpp so that the two macros that used dtrace function calls now use DTRACE_PROBE macros instead so it works as is against either dtrace or systemtap. It also enables the last disabled hotspot.monitor_notify probe in the tapset that now always works (given a newer stap and g++). 2009-10-14 Mark Wielaard * configure.ac: When enabling systemtap support check sys/sdt.h and g++ are recent enough to allow probes in class constructors and destructors. * patches/icedtea-systemtap.patch: Enable compiling probes in jni.cpp. Rewrite SetField and SetStaticField macros to use DTRACE_PROBE interface directly instead of generating dtrace implementation calls. Clean up dtrace.hpp. * tapset/hotspot.stp.in: Enable hotspot.monitor_notify. Fix up comments. I'll provide a jni tapset soon for more powerful tracing. But the above will enable you to use "raw" probe process("...path/to/libjvm.so").mark("*") already to see all the JNI interactions your program has. Commited and Pushed, Mark -------------- next part -------------- A non-text attachment was scrubbed... Name: systemtap-jni.patch Type: text/x-patch Size: 7705 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20091014/d5b9dbb1/attachment.bin From mjw at icedtea.classpath.org Wed Oct 14 06:39:06 2009 From: mjw at icedtea.classpath.org (mjw at icedtea.classpath.org) Date: Wed, 14 Oct 2009 13:39:06 +0000 Subject: /hg/icedtea6: Enable systemtap JNI tracing. Message-ID: changeset 80a697e98bff in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=80a697e98bff author: Mark Wielaard date: Wed Oct 14 15:42:32 2009 +0200 Enable systemtap JNI tracing. 2009-10-14 Mark Wielaard * configure.ac: When enabling systemtap support check sys/sdt.h and g++ are recent enough to allow probes in class constructors and destructors. * patches/icedtea-systemtap.patch: Enable compiling probes in jni.cpp. Rewrite SetField and SetStaticField macros to use DTRACE_PROBE interface directly instead of generating dtrace implementation calls. Clean up dtrace.hpp. * tapset/hotspot.stp.in: Enable hotspot.monitor_notify. Fix up comments. diffstat: 4 files changed, 91 insertions(+), 31 deletions(-) ChangeLog | 12 +++++++ configure.ac | 37 +++++++++++++++++++++ patches/icedtea-systemtap.patch | 66 +++++++++++++++++++++++---------------- tapset/hotspot.stp.in | 7 +--- diffs (219 lines): diff -r d8a6d7027d06 -r 80a697e98bff ChangeLog --- a/ChangeLog Tue Oct 13 11:13:46 2009 +0200 +++ b/ChangeLog Wed Oct 14 15:42:32 2009 +0200 @@ -1,3 +1,15 @@ 2009-10-13 Mark Wielaard + + * configure.ac: When enabling systemtap support check sys/sdt.h + and g++ are recent enough to allow probes in class constructors + and destructors. + * patches/icedtea-systemtap.patch: Enable compiling probes in + jni.cpp. Rewrite SetField and SetStaticField macros + to use DTRACE_PROBE interface directly instead of generating + dtrace implementation calls. Clean up dtrace.hpp. + * tapset/hotspot.stp.in: Enable hotspot.monitor_notify. Fix up + comments. + 2009-10-13 Mark Wielaard * tapsets/hotspot.stp.in (hotspot.gc_end): Match gc__end, not begin. diff -r d8a6d7027d06 -r 80a697e98bff configure.ac --- a/configure.ac Tue Oct 13 11:13:46 2009 +0200 +++ b/configure.ac Wed Oct 14 15:42:32 2009 +0200 @@ -335,6 +335,43 @@ AC_CHECK_HEADER([sys/sdt.h], [SDT_H_FOUN [SDT_H_FOUND='no'; AC_MSG_ERROR([systemtap support needs sys/sdt.h header])]) + AC_MSG_CHECKING([working sys/sdt.h and g++ support]) + AC_LANG_SAVE + AC_LANG_CPLUSPLUS + AC_LINK_IFELSE([AC_LANG_PROGRAM([[ +#include +class ProbeClass +{ +private: + int& ref; + const char *name; + +public: + ProbeClass(int& v, const char *n) : ref(v), name(n) + { + DTRACE_PROBE2(_test_, cons, name, ref); + } + + void method(int min) + { + DTRACE_PROBE3(_test_, meth, name, ref, min); + ref -= min; + } + + ~ProbeClass() + { + DTRACE_PROBE2(_test_, dest, name, ref); + } +}; +]], +[[ + int i = 64; + DTRACE_PROBE1(_test_, call, i); + ProbeClass inst = ProbeClass(i, "call"); + inst.method(24); +]])], [AC_MSG_RESULT([yes])], [AC_MSG_ERROR([systemtap sdt.h or g++ too old])]) + AC_LANG_RESTORE + AC_MSG_CHECKING([for absolute java home install dir]) AC_ARG_WITH([abs-install-dir], [AS_HELP_STRING([--with-abs-install-dir], diff -r d8a6d7027d06 -r 80a697e98bff patches/icedtea-systemtap.patch --- a/patches/icedtea-systemtap.patch Tue Oct 13 11:13:46 2009 +0200 +++ b/patches/icedtea-systemtap.patch Wed Oct 14 15:42:32 2009 +0200 @@ -9,22 +9,33 @@ diff -r 945bf7540697 make/linux/makefile +CFLAGS += -DDTRACE_ENABLED + +# It doesn't support HAVE_DTRACE_H though. -diff -r 945bf7540697 src/share/vm/prims/jni.cpp ---- openjdk/hotspot/src/share/vm/prims/jni.cpp Thu Jan 22 14:42:01 2009 -0800 -+++ openjdk/hotspot/src/share/vm/prims/jni.cpp Mon Feb 02 13:47:34 2009 +0100 -@@ -22,6 +22,12 @@ - * - */ - -+#ifdef __GNUC__ -+// Unfortunately the gcc c preprocessor doesn't like some of the -+// FP_SELECT defines below, so for now we make sure to disable them. -+#undef DTRACE_ENABLED -+#endif -+ - # include "incls/_precompiled.incl" - # include "incls/_jni.cpp.incl" - +--- openjdk/hotspot/src/share/vm/prims/jni.cpp 2009-10-13 15:34:52.499809508 +0200 ++++ openjdk/hotspot/src/share/vm/prims/jni.cpp 2009-10-13 15:31:26.117823588 +0200 +@@ -1747,10 +1744,7 @@ + JNI_QUICK_ENTRY(void, jni_Set##Result##Field(JNIEnv *env, jobject obj, jfieldID fieldID, Argument value)) \ + JNIWrapper("Set" XSTR(Result) "Field"); \ + \ +- HS_DTRACE_PROBE_CDECL_N(hotspot_jni, Set##Result##Field__entry, \ +- ( JNIEnv*, jobject, jfieldID FP_SELECT_##Result(COMMA Argument,/*empty*/) ) ); \ +- HS_DTRACE_PROBE_N(hotspot_jni, Set##Result##Field__entry, \ +- ( env, obj, fieldID FP_SELECT_##Result(COMMA value,/*empty*/) ) ); \ ++ FP_SELECT_##Result(DTRACE_PROBE4(hotspot_jni, Set##Result##Field__entry, env, obj, fieldID, value),DTRACE_PROBE3(hotspot_jni, Set##Result##Field__entry, env, obj, fieldID)); \ + \ + oop o = JNIHandles::resolve_non_null(obj); \ + klassOop k = o->klass(); \ +@@ -1924,10 +1918,7 @@ + \ + JNI_ENTRY(void, jni_SetStatic##Result##Field(JNIEnv *env, jclass clazz, jfieldID fieldID, Argument value)) \ + JNIWrapper("SetStatic" XSTR(Result) "Field"); \ +- HS_DTRACE_PROBE_CDECL_N(hotspot_jni, SetStatic##Result##Field__entry,\ +- ( JNIEnv*, jclass, jfieldID FP_SELECT_##Result(COMMA Argument,/*empty*/) ) ); \ +- HS_DTRACE_PROBE_N(hotspot_jni, SetStatic##Result##Field__entry, \ +- ( env, clazz, fieldID FP_SELECT_##Result(COMMA value,/*empty*/) ) ); \ ++ FP_SELECT_##Result(DTRACE_PROBE4(hotspot_jni, SetStatic##Result##Field__entry, env, clazz, fieldID, value),DTRACE_PROBE3(hotspot_jni, SetStatic##Result##Field__entry, env, clazz, fieldID)); \ + \ + JNIid* id = jfieldIDWorkaround::from_static_jfieldID(fieldID); \ + assert(id->is_static_field_id(), "invalid static field id"); \ +- diff -r 945bf7540697 src/share/vm/utilities/dtrace.hpp --- openjdk/hotspot/src/share/vm/utilities/dtrace.hpp Thu Jan 22 14:42:01 2009 -0800 +++ openjdk/hotspot/src/share/vm/utilities/dtrace.hpp Mon Feb 02 13:47:34 2009 +0100 @@ -52,7 +63,7 @@ diff -r 945bf7540697 src/share/vm/utilit #define DTRACE_ONLY(x) #define NOT_DTRACE(x) x -@@ -40,9 +41,15 @@ +@@ -40,9 +41,16 @@ #define DTRACE_PROBE3(a,b,c,d,e) {;} #define DTRACE_PROBE4(a,b,c,d,e,f) {;} #define DTRACE_PROBE5(a,b,c,d,e,f,g) {;} @@ -60,6 +71,7 @@ diff -r 945bf7540697 src/share/vm/utilit +#define DTRACE_PROBE7(a,b,c,d,e,f,g,h,i) {;} +#define DTRACE_PROBE8(a,b,c,d,e,f,g,h,i,j) {;} +#define DTRACE_PROBE9(a,b,c,d,e,f,g,h,i,j,k) {;} ++#define DTRACE_PROBE10(a,b,c,d,e,f,g,h,i,j,k,l) {;} #endif @@ -68,30 +80,28 @@ diff -r 945bf7540697 src/share/vm/utilit #define HS_DTRACE_PROBE_FN(provider,name)\ __dtrace_##provider##___##name -@@ -50,6 +57,13 @@ +@@ -50,6 +58,11 @@ DTRACE_ONLY(extern "C" void HS_DTRACE_PROBE_FN(provider,name) args) #define HS_DTRACE_PROBE_CDECL_N(provider,name,args) \ DTRACE_ONLY(extern void HS_DTRACE_PROBE_FN(provider,name) args) +#else +// Systemtap dtrace compatible probes on GNU/Linux don't. -+#define HS_DTRACE_PROBE_FN(provider,name) -+ +#define HS_DTRACE_PROBE_DECL_N(provider,name,args) +#define HS_DTRACE_PROBE_CDECL_N(provider,name,args) +#endif /* Dtrace probe declarations */ #define HS_DTRACE_PROBE_DECL(provider,name) \ -@@ -91,6 +105,8 @@ +@@ -88,6 +101,8 @@ + uintptr_t,uintptr_t,uintptr_t)) + + /* Dtrace probe definitions */ ++#if defined(SOLARIS) ++// Solaris dtrace uses actual function calls. #define HS_DTRACE_PROBE_N(provider,name, args) \ DTRACE_ONLY(HS_DTRACE_PROBE_FN(provider,name) args) -+#if defined(SOLARIS) -+// Solaris dtrace uses actual function calls. - #define HS_DTRACE_PROBE(provider,name) HS_DTRACE_PROBE0(provider,name) - #define HS_DTRACE_PROBE0(provider,name)\ - HS_DTRACE_PROBE_N(provider,name,()) -@@ -123,3 +139,27 @@ +@@ -123,3 +138,29 @@ HS_DTRACE_PROBE_N(provider,name,((uintptr_t)a0,(uintptr_t)a1,(uintptr_t)a2,\ (uintptr_t)a3,(uintptr_t)a4,(uintptr_t)a5,(uintptr_t)a6,(uintptr_t)a7,\ (uintptr_t)a8,(uintptr_t)a9)) @@ -118,6 +128,8 @@ diff -r 945bf7540697 src/share/vm/utilit + DTRACE_PROBE8(provider,name,a0,a1,a2,a3,a4,a5,a6,a7) +#define HS_DTRACE_PROBE9(provider,name,a0,a1,a2,a3,a4,a5,a6,a7,a8)\ + DTRACE_PROBE9(provider,name,a0,a1,a2,a3,a4,a5,a6,a7,a8) ++#define HS_DTRACE_PROBE10(provider,name,a0,a1,a2,a3,a4,a5,a6,a7,a8)\ ++ DTRACE_PROBE10(provider,name,a0,a1,a2,a3,a4,a5,a6,a7,a8) +#endif --- openjdk/hotspot/src/share/vm/runtime/arguments.cpp 2009-03-04 14:39:43.000000000 +0100 +++ openjdk/hotspot/src/share/vm/runtime/arguments.cpp 2009-03-04 22:11:37.000000000 +0100 diff -r d8a6d7027d06 -r 80a697e98bff tapset/hotspot.stp.in --- a/tapset/hotspot.stp.in Tue Oct 13 11:13:46 2009 +0200 +++ b/tapset/hotspot.stp.in Wed Oct 14 15:42:32 2009 +0200 @@ -311,12 +311,12 @@ probe hotspot.monitor_waited = name, thread_id, id, class); } -/* Doesn't resolve atm. - hotspot.monitor_notify (extended probe) +/* hotspot.monitor_notify (extended probe) Triggers when a thread calls Object.notify(). Sets thread_id to the current java thread, id to the unique id for this monitor and class to the class name of the object. Needs -XX:+ExtendedDTraceProbes. + */ probe hotspot.monitor_notify = process("@ABS_CLIENT_LIBJVM_SO@").mark("monitor__notify"), process("@ABS_SERVER_LIBJVM_SO@").mark("monitor__notify") @@ -328,7 +328,6 @@ probe hotspot.monitor_notify = probestr = sprintf("%s(thread_id=%d,id=0x%x,class='%s')", name, thread_id, id, class); } - */ /* hotspot.monitor_notifyAll (extended probe) Triggers when a thread calls Object.notifyAll(). @@ -369,7 +368,7 @@ probe hotspot.monitor_contended_enter = name, thread_id, id, class); } -/* hotspot.monitor_contended_enter (extended probe) +/* hotspot.monitor_contended_entered (extended probe) Triggers when a thread acquires a contended monotor (after hotspot.monitor_contended_enter has been triggered on this thread, and the other thread triggered a hotspot.monitor_contended_exit). From ed at camswl.com Thu Oct 15 10:15:10 2009 From: ed at camswl.com (Edward Nevill) Date: Thu, 15 Oct 2009 18:15:10 +0100 Subject: Request to commit - ARM + Shark - OSR support Message-ID: <200910151715.n9FHFAuG014886@parsley.camswl.com> Hi Folks, The following patch adds OSR support to ARM + Shark. It also fixes a number of bugs. The most important of these is a change to src/share/vm/interpreter/bytecodeInterpreter.cpp. This change is necessary because the C bytecode interpreter does not support rewritten bytecodes. Instead it just throws a fatal error. Now the Asm Interpreter does in fact rewrite some of the bytecodes. Now with Shark support, the Shark JIT may in fact call the C interpreter with a method which has bytecodes which have been rewritten by the Asm interpreter. In fact, this was a bug all along as the Asm interpreter can back out to the C interpreter in a number of cases, most notably if JVMTI is enabled. What the change does is, in the default case, it looks up the original bytecode. If the current bytecode != the original it uses the original as the opcode instead and tries the bytecode again. Here is the actual diff for bytecodeInterpreter.cpp extracted from the bigger diff below. +@@ -2330,6 +2330,16 @@ + } + + DEFAULT: ++ // ECN: Deal with rewritten bytecodes ++ if ((Bytecodes::Code)opcode < Bytecodes::number_of_codes) { ++ Bytecodes::Code original_opcode = Bytecodes::java_code((Bytecodes::Code)opcode); ++ ++ if ((jubyte)original_opcode != opcode) { ++ opcode = (jubyte)original_opcode; ++ goto opcode_switch; ++ } ++ } ++ + fatal2("\t*** Unimplemented opcode: %d = %s\n", + opcode, Bytecodes::name((Bytecodes::Code)opcode)); + goto finish; So, the new code only affects the case where it was about to throw a fatal error, where it checks to see if the bytecode was rewritten and if so substitutes the new opcode and goes back to execute that. The second change is a change to src/share/vm/shark/sharkCacheDecache.cpp The change is to delete an UnImplemented() statement which I was getting with ARM + Shark OSR. The change was suggested by Gary Benson. The remainder of the changes are to cppInterpreter_arm.S ChangeLog to follow. Regards, Ed ---------- CUT HERE ------------------------------------------------- diff -ruNE original/icedtea6/Makefile.am new/icedtea6/Makefile.am --- original/icedtea6/Makefile.am 2009-10-15 17:18:04.000000000 +0100 +++ new/icedtea6/Makefile.am 2009-10-15 17:48:52.000000000 +0100 @@ -559,6 +559,7 @@ ICEDTEA_FSG_PATCHES = ICEDTEA_PATCHES = \ + patches/icedtea-support-rewrite.patch \ patches/icedtea-notice-safepoints.patch \ patches/hotspot/$(HSBUILD)/icedtea-bytecodeInterpreter.patch \ patches/icedtea-signature-iterator.patch \ diff -ruNE original/icedtea6/patches/icedtea-support-rewrite.patch new/icedtea6/patches/icedtea-support-rewrite.patch --- original/icedtea6/patches/icedtea-support-rewrite.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/icedtea6/patches/icedtea-support-rewrite.patch 2009-10-15 17:46:28.000000000 +0100 @@ -0,0 +1,19 @@ +--- openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp 2009-10-14 10:19:45.000000000 +0100 ++++ openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp 2009-10-15 17:34:12.000000000 +0100 +@@ -2330,6 +2330,16 @@ + } + + DEFAULT: ++ // ECN: Deal with rewritten bytecodes ++ if ((Bytecodes::Code)opcode < Bytecodes::number_of_codes) { ++ Bytecodes::Code original_opcode = Bytecodes::java_code((Bytecodes::Code)opcode); ++ ++ if ((jubyte)original_opcode != opcode) { ++ opcode = (jubyte)original_opcode; ++ goto opcode_switch; ++ } ++ } ++ + fatal2("\t*** Unimplemented opcode: %d = %s\n", + opcode, Bytecodes::name((Bytecodes::Code)opcode)); + goto finish; diff -ruNE original/icedtea6/ports/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S new/icedtea6/ports/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S --- original/icedtea6/ports/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S 2009-10-15 17:18:06.000000000 +0100 +++ new/icedtea6/ports/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S 2009-10-15 17:38:27.000000000 +0100 @@ -17,11 +17,25 @@ #ifdef HOTSPOT_ASM +#define ARMv4 + #ifdef SHARK #define USE_COMPILER #endif -#define ARMv4 +#ifdef USE_COMPILER + +#define MP_COMPILE_THRESHOLD 0x10000 // 65536 - must be a single MOV constant +#define UP_COMPILE_THRESHOLD 0x30000 // 196608 - must be a single MOV constant + +#ifndef DISABLE_ON_STACK_REPLACEMENT +#define ON_STACK_REPLACEMENT +#endif +#ifndef ENABLE_BG_COMP_ON_NON_MP +#define DISABLE_BG_COMP_ON_NON_MP +#endif + +#endif // USE_COMPILER #ifndef DISABLE_NOTICE_SAFEPOINTS #define NOTICE_SAFEPOINTS @@ -237,6 +251,25 @@ #endif .endm + at ------------------------------------------------ +@ On stack replacement macro +@ Usage: +@ OSR + at ------------------------------------------------ + .macro OSR p1, p2, p3, p4 +#ifdef ON_STACK_REPLACEMENT + .ifnes "\p4", "" + \p1 \p2, \p3, \p4 + .else + .ifnes "\p3", "" + \p1 \p2, \p3 + .else + \p1 \p2 + .endif + .endif +#endif + .endm + .macro Opcode label ALIGN_OPCODE do_\label: @@ -2581,42 +2614,39 @@ PUSH tmp2 DISPATCH_FINISH -@ ip = branch offset -@ r0 = 1st bytecode -@ jpc has been updated Opcode goto ldrsb r1, [jpc, #1] ldrb tmp1, [jpc, #2] +branch_taken: orr tmp1, tmp1, r1, lsl #8 DISPATCH_START_REG tmp1 -branch_taken: - ldr r2, [dispatch, #SafePointSynchronize_state_Address-XXX] cmp tmp1, #0 + ble do_backedge + DISPATCH_FINISH + +do_backedge: USEC ldr tmp2, [istate, #ISTATE_METHOD] - ldr r1, [r2] - bgt branch_no_check + OSR ldr lr, [dispatch, #InterpreterInvocationLimit_Address-XXX] + USEC ldr r1, [tmp2, #METHOD_BACKEDGECOUNTER] + USEC ldr ip, [tmp2, #METHOD_INVOCATIONCOUNTER] + USEC add r1, r1, #INVOCATIONCOUNTER_COUNTINCREMENT + OSR ldr lr, [lr] + USEC add ip, ip, #INVOCATIONCOUNTER_COUNTINCREMENT + USEC str r1, [tmp2, #METHOD_BACKEDGECOUNTER] + OSR cmp r1, lr + USEC str ip, [tmp2, #METHOD_INVOCATIONCOUNTER] + OSR bcs do_osr -@ ECN: The C code does... -@ if (UseCompiler && UseLoopCounter) { -@ BACKEDGE_COUNT->increment(); -@ ... -@ } -@ However, I just increment the counter because the check is actually -@ more expensive than the increment. I don't believe this matters -@ semantically, since is UseCompiler or UseLoopCounter is false then -@ we shouldn't even be looking at the backedge counter. -@ -@ ECN: Concerns about counter overflowing -@ - USEC ldr r3, [tmp2, #METHOD_BACKEDGECOUNTER] +osr_continue: + ldr ip, [dispatch, #SafePointSynchronize_state_Address-XXX] + ldr r1, [ip] cmp r1, #1 - USEC add r3, r3, #INVOCATIONCOUNTER_COUNTINCREMENT - USEC str r3, [tmp2, #METHOD_BACKEDGECOUNTER] - - bne branch_no_check + beq do_synchronize + DISPATCH_STATE 1 + DISPATCH_FINISH - sub jpc, jpc, tmp1 @ Point jpc back at the branch!!! +do_synchronize: add r0, istate, #ISTATE_THREAD bl HandleMarkCleanerD ldr r0, [istate, #ISTATE_THREAD] @@ -2631,16 +2661,90 @@ CACHE_JPC cmp r3, #0 bne handle_exception + DISPATCH 0 + +#ifdef ON_STACK_REPLACEMENT +do_osr: + ldr ip, [dispatch, #UseOnStackReplacement_Address-XXX] + ldrb ip, [ip] + cmp ip, #0 + beq osr_continue + + DECACHE_JPC + DECACHE_STACK + ldr r0, [istate, #ISTATE_THREAD] + sub r1, jpc, tmp1 + bl _ZN18InterpreterRuntime26frequency_counter_overflowEP10JavaThreadPh + ldr r3, [istate, #ISTATE_THREAD] + ASSERT_LOCALS_CACHED + ASSERT_STACK_CACHED + CACHE_CP + ldr r1, [r3, #THREAD_PENDING_EXC] + CACHE_JPC + cmp r1, #0 + bne handle_exception + cmp r0, #0 + beq 1f + ldr r1, [r0, #56] + cmn r1, #2 + bne osr_migrate +1: + DISPATCH_START 0 + b osr_continue +#endif + +#ifdef ON_STACK_REPLACEMENT +osr_migrate: + ldr tmp1, [r0, #128] @ osr_method->osr_entry() + ldr tmp2, [istate, #ISTATE_ADVANCE_PC] +@ ldr istate, [istate, #ISTATE_NEXT_FRAME] + mov r0, r3 + bl _ZN13SharedRuntime19OSR_migration_beginEP10JavaThread + mov r1, r0 + ldr r0, [istate, #ISTATE_METHOD] + ldrh lr, [r0, #METHOD_MAXLOCALS] + ldrh ip, [r0, #METHOD_SIZEOFPARAMETERS] + ldr r3, [istate, #ISTATE_THREAD] + sub lr, lr, ip + ldr r2, [r3, #THREAD_TOP_ZERO_FRAME] + add ip, r2, #4 + ldr r2, [r2] + add ip, ip, lr, lsl #2 + str r2, [r3, #THREAD_TOP_ZERO_FRAME] + str ip, [r3, #THREAD_JAVA_SP] + mov r2, tmp1 +@ r0 = method +@ r1 = osr_buf +@ r2 = osr_entry + mov lr, pc + ldr pc, [tmp1] - DISPATCH_START_REG tmp1 @ Refetch opcode and update jpc again -branch_no_check: -@ ECN: There is no protection against INVOCATIONCOUNTER overflowing!!! - USEC ldr r3, [tmp2, #METHOD_INVOCATIONCOUNTER] + cmp tmp2, #0 + ldmeqfd arm_sp!, {regset, pc} + + ldr istate, [istate, #ISTATE_NEXT_FRAME] + ldr lr, [istate, #-ISTATE_NEXT_FRAME+ISTATE_THREAD]! + CACHE_JPC + ldr stack, [lr, #THREAD_JAVA_SP] + ldr r2, [istate, #ISTATE_STACK_LIMIT] + sub stack, stack, #4 + + ldr r1, [lr, #THREAD_TOP_ZERO_FRAME] + add r2, r2, #4 + str r2, [lr, #THREAD_JAVA_SP] + str r1, [lr, #THREAD_LAST_JAVA_SP] + ldr r3, [lr, #THREAD_PENDING_EXC] + DISPATCH_START_REG tmp2 + CACHE_LOCALS DISPATCH_NEXT - USEC add r3, r3, #INVOCATIONCOUNTER_COUNTINCREMENT DISPATCH_NEXT - USEC str r3, [tmp2, #METHOD_INVOCATIONCOUNTER] + cmp r3, #0 + DISPATCH_NEXT + bne return_exception + DISPATCH_NEXT + CACHE_CP DISPATCH_FINISH +#endif Opcode ifeq Opcode ifnull @@ -2648,11 +2752,8 @@ ldrsb r1, [jpc, #1] ldrb tmp1, [jpc, #2] cmp r3, #0 - orreq tmp1, tmp1, r1, lsl #8 - ldreqb r0, [jpc, tmp1]! - ldrneb r0, [jpc, #3]! beq branch_taken - DISPATCH_BYTECODE + DISPATCH 3 Opcode ifne Opcode ifnonnull @@ -2660,55 +2761,40 @@ ldrsb r1, [jpc, #1] ldrb tmp1, [jpc, #2] cmp r3, #0 - orrne tmp1, tmp1, r1, lsl #8 - ldrneb r0, [jpc, tmp1]! - ldreqb r0, [jpc, #3]! bne branch_taken - DISPATCH_BYTECODE + DISPATCH 3 Opcode iflt POP r3 ldrsb r1, [jpc, #1] ldrb tmp1, [jpc, #2] cmp r3, #0 - orrlt tmp1, tmp1, r1, lsl #8 - ldrltb r0, [jpc, tmp1]! - ldrgeb r0, [jpc, #3]! blt branch_taken - DISPATCH_BYTECODE + DISPATCH 3 Opcode ifge POP r3 ldrsb r1, [jpc, #1] ldrb tmp1, [jpc, #2] cmp r3, #0 - orrge tmp1, tmp1, r1, lsl #8 - ldrgeb r0, [jpc, tmp1]! - ldrltb r0, [jpc, #3]! bge branch_taken - DISPATCH_BYTECODE + DISPATCH 3 Opcode ifgt POP r3 ldrsb r1, [jpc, #1] ldrb tmp1, [jpc, #2] cmp r3, #0 - orrgt tmp1, tmp1, r1, lsl #8 - ldrgtb r0, [jpc, tmp1]! - ldrleb r0, [jpc, #3]! bgt branch_taken - DISPATCH_BYTECODE + DISPATCH 3 Opcode ifle POP r3 ldrsb r1, [jpc, #1] ldrb tmp1, [jpc, #2] cmp r3, #0 - orrle tmp1, tmp1, r1, lsl #8 - ldrleb r0, [jpc, tmp1]! - ldrgtb r0, [jpc, #3]! ble branch_taken - DISPATCH_BYTECODE + DISPATCH 3 Opcode if_icmpeq Opcode if_acmpeq @@ -2716,11 +2802,8 @@ ldrsb r1, [jpc, #1] ldrb tmp1, [jpc, #2] cmp r3, r2 - orreq tmp1, tmp1, r1, lsl #8 - ldreqb r0, [jpc, tmp1]! - ldrneb r0, [jpc, #3]! beq branch_taken - DISPATCH_BYTECODE + DISPATCH 3 Opcode if_icmpne Opcode if_acmpne @@ -2728,55 +2811,40 @@ ldrsb r1, [jpc, #1] ldrb tmp1, [jpc, #2] cmp r3, r2 - orrne tmp1, tmp1, r1, lsl #8 - ldrneb r0, [jpc, tmp1]! - ldreqb r0, [jpc, #3]! bne branch_taken - DISPATCH_BYTECODE + DISPATCH 3 Opcode if_icmplt POP r2, r3 ldrsb r1, [jpc, #1] ldrb tmp1, [jpc, #2] cmp r3, r2 - orrlt tmp1, tmp1, r1, lsl #8 - ldrltb r0, [jpc, tmp1]! - ldrgeb r0, [jpc, #3]! blt branch_taken - DISPATCH_BYTECODE + DISPATCH 3 Opcode if_icmpge POP r2, r3 ldrsb r1, [jpc, #1] ldrb tmp1, [jpc, #2] cmp r3, r2 - orrge tmp1, tmp1, r1, lsl #8 - ldrgeb r0, [jpc, tmp1]! - ldrltb r0, [jpc, #3]! bge branch_taken - DISPATCH_BYTECODE + DISPATCH 3 Opcode if_icmpgt POP r2, r3 ldrsb r1, [jpc, #1] ldrb tmp1, [jpc, #2] cmp r3, r2 - orrgt tmp1, tmp1, r1, lsl #8 - ldrgtb r0, [jpc, tmp1]! - ldrleb r0, [jpc, #3]! bgt branch_taken - DISPATCH_BYTECODE + DISPATCH 3 Opcode if_icmple POP r2, r3 ldrsb r1, [jpc, #1] ldrb tmp1, [jpc, #2] cmp r3, r2 - orrle tmp1, tmp1, r1, lsl #8 - ldrleb r0, [jpc, tmp1]! - ldrgtb r0, [jpc, #3]! ble branch_taken - DISPATCH_BYTECODE + DISPATCH 3 Opcode ireturn Opcode freturn @@ -4407,6 +4475,7 @@ rsb r3, r0, r3 rsb r3, r3, arm_sp cmp r3, #32768 + bge fast_normal_entry_with_len b stack_overflow_before_frame @@ -6229,12 +6298,14 @@ ALIGN_CODE bci_init: + stmfd sp!, {r4, lr} + adrl r3, dispatch_init_adcon ldm r3, {r0, r1} add r0, r0, r3 - add r1, r1, r0 + add r4, r1, r0 adrl r2, adcon_init_table - mov r3, r1 + mov r1, r4 1: ldr ip, [r2], #4 cmp ip, #0 @@ -6243,12 +6314,37 @@ bne 1b adrl r2, main_dispatch_table mov r1, #256 + mov r3, r4 2: ldr ip, [r2], #4 str ip, [r3], #4 subs r1, r1, #1 bne 2b +#ifdef USE_COMPILER + +#define NPROCESSORS_CONF 83 + + mov r0, #NPROCESSORS_CONF + bl sysconf + cmp r0, #2 + +#ifdef DISABLE_BG_COMP_ON_NON_MP + movcc r0, #0 + ldrcc r1, [r4, #BackgroundCompilation_Address-XXX] + strccb r0, [r1] +#endif + + movcs r0, #MP_COMPILE_THRESHOLD + movcc r0, #UP_COMPILE_THRESHOLD + ldr r1, [r4, #CompileThreshold_Address-XXX] + str r0, [r1] + + +#endif // USE_COMPILER + + ldmfd sp!, {r4, lr} + #ifdef HW_FP vfp_init: stmfd sp!, {r4, r5, lr} @@ -6348,6 +6444,9 @@ .word _ZN11JvmtiExport28_can_post_interpreter_eventsE(GOT) .word UseCompiler(GOT) .word _ZN17InvocationCounter26InterpreterInvocationLimitE(GOT) + .word CompileThreshold(GOT) + .word BackgroundCompilation(GOT) + .word UseOnStackReplacement(GOT) .word 0 ALIGN_DATA @@ -6627,9 +6726,14 @@ CodeTrace_Buffer_Base: .space CODETRACE_BUFFER_SIZE #endif + .word 0, 0, 0, 0, 0, 0, 0, 0 + .word 0, 0, 0, 0, 0 DispatchBreakPoint: .word 0 VFP_Flag: .word 0 CodeTrace_Idx: .word 0 +UseOnStackReplacement_Address: .word 0 +BackgroundCompilation_Address: .word 0 +CompileThreshold_Address: .word 0 InterpreterInvocationLimit_Address: .word 0 UseCompiler_Address: .word 0 can_post_interpreter_events: .word 0 diff -ruNE original/icedtea6/ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp new/icedtea6/ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp --- original/icedtea6/ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp 2009-10-15 17:18:06.000000000 +0100 +++ new/icedtea6/ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp 2009-10-15 17:39:25.000000000 +0100 @@ -189,9 +189,6 @@ int box_offset, int obj_offset) { - if (max_monitors() > 1) - Unimplemented(); // XXX which order will they be in? - // Copy the monitor from the OSR buffer to the frame int src_offset = max_locals() + index * 2; builder()->CreateStore( From bugzilla-daemon at icedtea.classpath.org Fri Oct 16 12:37:36 2009 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 16 Oct 2009 19:37:36 +0000 Subject: [Bug 391] New: Wrong jaxws drop md5sum in icedtea revision 05e6f20fb7fd Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=391 Summary: Wrong jaxws drop md5sum in icedtea revision 05e6f20fb7fd Product: IcedTea Version: unspecified Platform: PC OS/Version: Linux Status: NEW Severity: normal Priority: P2 Component: IcedTea AssignedTo: unassigned at icedtea.classpath.org ReportedBy: r.c.g at gmx.de The md5sum for jdk7-jaxws-2009_09_28.zip (JAXWS_DROP_MD5SUM) in Makefile.am is not correct. The md5sum for http://kenai.com/projects/jdk7-drops/downloads/download/jdk7-jaxws-2009_09_28.zip is f5010ebf636db9f465a61a7a74944543. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From bugzilla-daemon at icedtea.classpath.org Fri Oct 16 22:11:14 2009 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Sat, 17 Oct 2009 05:11:14 +0000 Subject: [Bug 390] ContestAppletProd.jnlp (Topcoder Arena Applet) crashes after launch Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=390 ------- Comment #2 from abyss.7 at gmail.com 2009-10-17 05:11 ------- I use jpeg-7 (http://www.ijg.org/files/jpegsrc.v7.tar.gz) -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From a.radke at arcor.de Sat Oct 17 06:49:14 2009 From: a.radke at arcor.de (Andreas Radke) Date: Sat, 17 Oct 2009 15:49:14 +0200 Subject: build error with new Xorg/Xextproto in awt_GraphicsEnv.c Message-ID: <20091017154914.293d8516@laptop64.home> After update to Xorg 7.5 the icedtea 1.6.1 build fails here fore ArchLinux: ../../../src/solaris/native/sun/awt/awt_GraphicsEnv.c: In function 'J2DXErrHandler': ../../../src/solaris/native/sun/awt/awt_GraphicsEnv.c:961: error: 'X_ShmAttach' undeclared (first use in this function) ../../../src/solaris/native/sun/awt/awt_GraphicsEnv.c:961: error: (Each undeclared identifier is reported only once ../../../src/solaris/native/sun/awt/awt_GraphicsEnv.c:961: error: for each function it appears in.) make[5]: *** [/tmp/openjdk6/trunk/src/icedtea6-1.6.1/openjdk/build/linux-amd64/tmp/sun/sun.awt.X11/xawt/obj64/awt_GraphicsEnv.o] Error 1 It seems there were changes in xextproto (7.1.1 here). I found http://trac.macports.org/ticket/20696 and http://lists.macosforge.org/pipermail/macports-users/2009-August/016137.html What's the proper solution to fix it? -Andy From mark at klomp.org Sat Oct 17 07:12:31 2009 From: mark at klomp.org (Mark Wielaard) Date: Sat, 17 Oct 2009 16:12:31 +0200 Subject: build error with new Xorg/Xextproto in awt_GraphicsEnv.c In-Reply-To: <20091017154914.293d8516@laptop64.home> References: <20091017154914.293d8516@laptop64.home> Message-ID: <1255788751.2568.12.camel@hermans.wildebeest.org> On Sat, 2009-10-17 at 15:49 +0200, Andreas Radke wrote: > After update to Xorg 7.5 the icedtea 1.6.1 build fails here fore ArchLinux: > > ../../../src/solaris/native/sun/awt/awt_GraphicsEnv.c: In function 'J2DXErrHandler': > ../../../src/solaris/native/sun/awt/awt_GraphicsEnv.c:961: error: 'X_ShmAttach' undeclared (first use in this function) > ../../../src/solaris/native/sun/awt/awt_GraphicsEnv.c:961: error: (Each undeclared identifier is reported only once > ../../../src/solaris/native/sun/awt/awt_GraphicsEnv.c:961: error: for each function it appears in.) > make[5]: *** > [/tmp/openjdk6/trunk/src/icedtea6-1.6.1/openjdk/build/linux-amd64/tmp/sun/sun.awt.X11/xawt/obj64/awt_GraphicsEnv.o] > Error 1 > > > It seems there were changes in xextproto (7.1.1 here). > > I found http://trac.macports.org/ticket/20696 and > http://lists.macosforge.org/pipermail/macports-users/2009-August/016137.html > > What's the proper solution to fix it? It seems fedora has a local patch for this: http://cvs.fedoraproject.org/viewvc/devel/java-1.6.0-openjdk/java-1.6.0-openjdk-x11.patch?view=markup It would be good if we could come up with a configure check for the above and apply it based on that in icedtea. Cheers, Mark From aph at redhat.com Sun Oct 18 05:17:35 2009 From: aph at redhat.com (Andrew Haley) Date: Sun, 18 Oct 2009 13:17:35 +0100 Subject: Request to commit - ARM + Shark - OSR support In-Reply-To: <200910151715.n9FHFAuG014886@parsley.camswl.com> References: <200910151715.n9FHFAuG014886@parsley.camswl.com> Message-ID: <4ADB075F.5090508@redhat.com> Edward Nevill wrote: > The following patch adds OSR support to ARM + Shark. > > It also fixes a number of bugs. The most important of these is a > change to src/share/vm/interpreter/bytecodeInterpreter.cpp. > > This change is necessary because the C bytecode interpreter does not > support rewritten bytecodes. Instead it just throws a fatal error. > Now the Asm Interpreter does in fact rewrite some of the bytecodes. > > Now with Shark support, the Shark JIT may in fact call the C > interpreter with a method which has bytecodes which have been rewritten > by the Asm interpreter. In fact, this was a bug all along as the > Asm interpreter can back out to the C interpreter in a number of > cases, most notably if JVMTI is enabled. > > What the change does is, in the default case, it looks up the original > bytecode. If the current bytecode != the original it uses the original > as the opcode instead and tries the bytecode again. > > Here is the actual diff for bytecodeInterpreter.cpp extracted from the > bigger diff below. It's great to see this working. A couple of things: Please don't add "ECN" to the comments. Is this C++ interp change something that should go upstream? Andrew. From bugzilla-daemon at icedtea.classpath.org Sun Oct 18 08:31:14 2009 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Sun, 18 Oct 2009 15:31:14 +0000 Subject: [Bug 392] New: 3D game shows with a too big scale Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=392 Summary: 3D game shows with a too big scale Product: IcedTea Version: unspecified Platform: PC URL: http://www.superliminal.com/cube/applet.html OS/Version: Linux Status: NEW Severity: normal Priority: P2 Component: IcedTea AssignedTo: unassigned at icedtea.classpath.org ReportedBy: jccyc1965 at gmail.com You can't get to the cubes at the bottom of the playfield. I'll post "bad" and "correct" screenshots shortly. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From gnu_andrew at member.fsf.org Sun Oct 18 13:44:08 2009 From: gnu_andrew at member.fsf.org (Andrew John Hughes) Date: Sun, 18 Oct 2009 21:44:08 +0100 Subject: OpenJDK 6 build 17 source bundle posted In-Reply-To: <4AD8F504.8020602@sun.com> References: <4AD8F504.8020602@sun.com> Message-ID: <17c6771e0910181344q7dd6af1fn3d0eebf0ad1fe7c5@mail.gmail.com> 2009/10/16 Joseph D. Darcy : > Hello. > > The source bundles for OpenJDK 6 b17 are available now from: > > http://download.java.net/openjdk/jdk6/ > > I'll post a list of bugs fixed and other information next week. > > -Joe > Now supported by IcedTea6 @ http://icedtea.classpath.org/people/andrew/icedtea6 -- Andrew :-) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint: F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From gnu_andrew at member.fsf.org Sun Oct 18 13:45:38 2009 From: gnu_andrew at member.fsf.org (Andrew John Hughes) Date: Sun, 18 Oct 2009 21:45:38 +0100 Subject: [PATCH FOR APPROVAL]: Support b17 release of OpenJDK6 Message-ID: <17c6771e0910181345o720bdce0g801d34249988a921@mail.gmail.com> http://icedtea.classpath.org/people/andrew/icedtea6/rev/83619682858e http://icedtea.classpath.org/people/andrew/icedtea6/rev/2673464ac328 Ok for the main tree? -- Andrew :-) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint: F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From doko at ubuntu.com Sun Oct 18 14:48:14 2009 From: doko at ubuntu.com (Matthias Klose) Date: Sun, 18 Oct 2009 23:48:14 +0200 Subject: [PATCH FOR APPROVAL]: Support b17 release of OpenJDK6 In-Reply-To: <17c6771e0910181345o720bdce0g801d34249988a921@mail.gmail.com> References: <17c6771e0910181345o720bdce0g801d34249988a921@mail.gmail.com> Message-ID: <4ADB8D1E.7040801@ubuntu.com> On 18.10.2009 22:45, Andrew John Hughes wrote: > http://icedtea.classpath.org/people/andrew/icedtea6/rev/83619682858e > http://icedtea.classpath.org/people/andrew/icedtea6/rev/2673464ac328 > > Ok for the main tree? please go ahead, there was more than one tester. thanks for preparing this update! Matthias From andrew at icedtea.classpath.org Sun Oct 18 14:47:24 2009 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Sun, 18 Oct 2009 21:47:24 +0000 Subject: /hg/icedtea6: 4 new changesets Message-ID: changeset 83619682858e in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=83619682858e author: Andrew John Hughes date: Fri Oct 02 23:02:17 2009 +0100 Bump to b17 and move back to original HotSpot. 2009-10-02 Andrew John Hughes Bump to b17 and use original HotSpot. * patches/ecj/icedtea-hotspot-default.patch: Moved to icedtea- hotspot-original.patch. * patches/hotspot/default/icedtea-6791168.patch, * patches/hotspot/default/icedtea-bytecodeInterpreter.patch, * patches/hotspot/default/icedtea-core-build.patch, * patches/hotspot/default/icedtea-debuginfo.patch, * patches/hotspot/default/icedtea-format.patch, * patches/hotspot/default/icedtea-gcc-4.3.patch, * patches/hotspot/default/icedtea-gcc-stack-markings.patch, * patches/hotspot/default/icedtea-gcc-suffix.patch, * patches/hotspot/default/icedtea-headers.patch, * patches/hotspot/default/icedtea-ignore-unrecognized-options.patch, * patches/hotspot/default/icedtea-includedb.patch, * patches/hotspot/default/icedtea-memory-limits.patch, * patches/hotspot/default/icedtea-no-precompiled.patch, * patches/hotspot/default/icedtea-params-cast-size_t.patch, * patches/hotspot/default/icedtea-parisc-opt.patch, * patches/hotspot/default/icedtea-shark-build.patch, * patches/hotspot/default/icedtea-shark.patch, * patches/hotspot/default/icedtea-sparc-buildfixes.patch, * patches/hotspot/default/icedtea-sparc-ptracefix.patch, * patches/hotspot/default/icedtea-sparc-trapsfix.patch, * patches/hotspot/default/icedtea-sparc64-linux.patch, * patches/hotspot/default/icedtea-static-libstdc++.patch, * patches/hotspot/default/icedtea-text-relocations.patch, * patches/hotspot/default/icedtea-use-idx_t.patch, * patches/hotspot/default/icedtea-version.patch, * patches/hotspot/default/icedtea-zero-build.patch: Moved to patches/hotspot/original. * patches/icedtea-6700047-loopopts.patch, * patches/icedtea-6712835-ifnode.patch, * patches/icedtea-6728542-epoll.patch, * patches/icedtea-alsa-default-device.patch: Removed, upstream. * patches/icedtea-ant.patch: Moved to ecj subdirectory. * patches/icedtea-debuginfo.patch, * patches/icedtea-float-double-trailing-zeros.patch, * patches/icedtea-format-warnings.patch, * patches/icedtea-fortify-source.patch, * patches/icedtea-graphics.patch, * patches/icedtea-jar-misc.patch, * patches/icedtea-java2d-mitre-join.patch, * patches/icedtea-javac-debuginfo.patch, * patches/icedtea-jtreg-colortest.patch, * patches/icedtea-jtreg-layoutextragap.patch, * patches/icedtea-jtreg-printjob-edgetest-manual.patch, * patches/icedtea-jtreg-printjob-multiple-end.patch, * patches/icedtea-lcms-2.patch, * patches/icedtea-no-bcopy.patch, * patches/icedtea-override-redirect-metacity.patch, * patches/icedtea-signed-types-hot6.patch, * patches/icedtea-simpletimezone-relax.patch, * patches/icedtea-toolkit.patch, * patches/openjdk/6648816.patch: Removed, upstream. * patches/openjdk/oj100103-debugger-socket-overflow.patch: Renamed to include Sun bug ID. * patches/openjdk/rename-execvpe.patch, * patches/security/icedtea-6588003.patch, * patches/security/icedtea-6656586.patch, * patches/security/icedtea-6656610.patch, * patches/security/icedtea-6656625.patch, * patches/security/icedtea-6657133.patch, * patches/security/icedtea-6657619.patch, * patches/security/icedtea-6657625.patch, * patches/security/icedtea-6657695.patch, * patches/security/icedtea-6660049.patch, * patches/security/icedtea-6660539.patch, * patches/security/icedtea-6736293.patch, * patches/security/icedtea-6738524.patch, * patches/security/icedtea-6777448.patch, * patches/security/icedtea-6777487.patch, * patches/security/icedtea-6801071.patch, * patches/security/icedtea-6801497.patch, * patches/security/icedtea-6813167.patch, * patches/security/icedtea-6823373.patch, * patches/security/icedtea-6824440.patch, * patches/security/icedtea-6830335.patch, * patches/security/icedtea-6845701.patch: Removed, upstream. * Makefile.am: Make WITH_ALT_HSBUILD conditionals the default, set ANT rather than ANT, set DEBUG_CLASSFILES and DEBUG_BINARIES to true, remove patches no longer needed in b17. * acinclude.m4: Use original HotSpot, not a download. * patches/ecj/icedtea-ant.patch: Moved from patches, and reduced to just add additional paths for bootstrap. * patches/ecj/icedtea-hotspot-original.patch: Moved from icedtea-hotspot-default, original hotspot-original patch removed. * patches/ecj/icedtea.patch: Recreated. * patches/hotspot/original/icedtea-6791168.patch, * patches/hotspot/original/icedtea-bytecodeInterpreter.patch, * patches/hotspot/original/icedtea-core-build.patch, * patches/hotspot/original/icedtea-gcc-4.3.patch, * patches/hotspot/original/icedtea-gcc-stack-markings.patch, * patches/hotspot/original/icedtea-gcc-suffix.patch, * patches/hotspot/original/icedtea-headers.patch, * patches/hotspot/original/icedtea-includedb.patch, * patches/hotspot/original/icedtea-no-precompiled.patch, * patches/hotspot/original/icedtea-params-cast-size_t.patch, * patches/hotspot/original/icedtea-parisc-opt.patch, * patches/hotspot/original/icedtea-shark-build.patch, * patches/hotspot/original/icedtea-shark.patch, * patches/hotspot/original/icedtea-sparc-buildfixes.patch, * patches/hotspot/original/icedtea-sparc-trapsfix.patch, * patches/hotspot/original/icedtea-sparc64-linux.patch, * patches/hotspot/original/icedtea-static-libstdc++.patch, * patches/hotspot/original/icedtea-text-relocations.patch, * patches/hotspot/original/icedtea-use-idx_t.patch, * patches/hotspot/original/icedtea-version.patch, * patches/hotspot/original/icedtea-zero-build.patch: Moved from patches/hotspot/default. * patches/icedtea-disable-cc-incompatible-sanity-checks.patch, * patches/icedtea-zero-build.patch: Recreated. * patches/openjdk/6432567-debugger-socket-overflow.patch: Renamed from oj100013-debugger-socket-overflow.patch. changeset e09a901109fa in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=e09a901109fa author: Andrew John Hughes date: Wed Oct 07 22:44:35 2009 +0100 Merge changeset b21607ae7b62 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=b21607ae7b62 author: Andrew John Hughes date: Sun Oct 18 21:41:46 2009 +0100 Merge changeset 2673464ac328 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=2673464ac328 author: Andrew John Hughes date: Sun Oct 18 21:42:53 2009 +0100 Update to b17 tarball. 2009-10-16 Andrew John Hughes * Makefile.am: Update to b17 tarball. diffstat: 119 files changed, 2183 insertions(+), 176921 deletions(-) ChangeLog | 180 HACKING | 1 INSTALL | 7 Makefile.am | 134 README | 15 acinclude.m4 | 2 configure.ac | 44 contrib/jck/compile-native-code.sh | 3 patches/ecj/icedtea-ant.patch | 20 patches/ecj/icedtea-hotspot-default.patch | 48 patches/ecj/icedtea-hotspot-original.patch | 27 patches/ecj/icedtea.patch | 234 patches/hotspot/default/icedtea-6791168.patch | 230 patches/hotspot/default/icedtea-bytecodeInterpreter.patch | 11 patches/hotspot/default/icedtea-core-build.patch | 108 patches/hotspot/default/icedtea-debuginfo.patch | 15 patches/hotspot/default/icedtea-format.patch | 48 patches/hotspot/default/icedtea-gcc-4.3.patch | 54 patches/hotspot/default/icedtea-gcc-stack-markings.patch | 14 patches/hotspot/default/icedtea-gcc-suffix.patch | 25 patches/hotspot/default/icedtea-headers.patch | 13 patches/hotspot/default/icedtea-ignore-unrecognized-options.patch | 76 patches/hotspot/default/icedtea-includedb.patch | 107 patches/hotspot/default/icedtea-memory-limits.patch | 23 patches/hotspot/default/icedtea-no-precompiled.patch | 32 patches/hotspot/default/icedtea-params-cast-size_t.patch | 255 patches/hotspot/default/icedtea-parisc-opt.patch | 28 patches/hotspot/default/icedtea-shark-build.patch | 233 patches/hotspot/default/icedtea-shark.patch | 390 patches/hotspot/default/icedtea-sparc-buildfixes.patch | 35 patches/hotspot/default/icedtea-sparc-ptracefix.patch | 34 patches/hotspot/default/icedtea-sparc-trapsfix.patch | 21 patches/hotspot/default/icedtea-sparc64-linux.patch | 42 patches/hotspot/default/icedtea-static-libstdc++.patch | 16 patches/hotspot/default/icedtea-text-relocations.patch | 61 patches/hotspot/default/icedtea-use-idx_t.patch | 101 patches/hotspot/default/icedtea-version.patch | 48 patches/hotspot/default/icedtea-zero-build.patch | 129 patches/hotspot/original/icedtea-6791168.patch | 230 patches/hotspot/original/icedtea-bytecodeInterpreter.patch | 31 patches/hotspot/original/icedtea-core-build.patch | 46 patches/hotspot/original/icedtea-gcc-4.3.patch | 84 patches/hotspot/original/icedtea-gcc-stack-markings.patch | 14 patches/hotspot/original/icedtea-gcc-suffix.patch | 4 patches/hotspot/original/icedtea-headers.patch | 7 patches/hotspot/original/icedtea-includedb.patch | 107 patches/hotspot/original/icedtea-no-precompiled.patch | 32 patches/hotspot/original/icedtea-params-cast-size_t.patch | 250 patches/hotspot/original/icedtea-parisc-opt.patch | 8 patches/hotspot/original/icedtea-shark-build.patch | 296 patches/hotspot/original/icedtea-shark.patch | 210 patches/hotspot/original/icedtea-sparc-buildfixes.patch | 35 patches/hotspot/original/icedtea-sparc-trapsfix.patch | 10 patches/hotspot/original/icedtea-sparc64-linux.patch | 6 patches/hotspot/original/icedtea-static-libstdc++.patch | 6 patches/hotspot/original/icedtea-text-relocations.patch | 58 patches/hotspot/original/icedtea-use-idx_t.patch | 293 patches/hotspot/original/icedtea-version.patch | 62 patches/hotspot/original/icedtea-zero-build.patch | 112 patches/icedtea-6700047-loopopts.patch | 34 patches/icedtea-6712835-ifnode.patch | 25 patches/icedtea-6728542-epoll.patch | 90 patches/icedtea-alsa-default-device.patch | 17 patches/icedtea-ant.patch | 106 patches/icedtea-debuginfo.patch | 64 patches/icedtea-disable-cc-incompatible-sanity-checks.patch | 139 patches/icedtea-float-double-trailing-zeros.patch | 29 patches/icedtea-format-warnings.patch | 30 patches/icedtea-fortify-source.patch | 60 patches/icedtea-graphics.patch | 42 patches/icedtea-jar-misc.patch | 1126 patches/icedtea-java2d-mitre-join.patch | 64 patches/icedtea-javac-debuginfo.patch | 102 patches/icedtea-jtreg-colortest.patch | 10 patches/icedtea-jtreg-layoutextragap.patch | 137 patches/icedtea-jtreg-printjob-edgetest-manual.patch | 10 patches/icedtea-jtreg-printjob-multiple-end.patch | 37 patches/icedtea-lcms-2.patch | 55 patches/icedtea-no-bcopy.patch | 20 patches/icedtea-override-redirect-metacity.patch | 19 patches/icedtea-s390-serialize.patch | 15 patches/icedtea-signed-types-hot6.patch | 22 patches/icedtea-simpletimezone-relax.patch | 21 patches/icedtea-systemtap.patch | 66 patches/icedtea-toolkit.patch | 10 patches/icedtea-zero-build.patch | 275 patches/openjdk/6432567-debugger-socket-overflow.patch | 17 patches/openjdk/6648816.patch | 82 patches/openjdk/oj100103-debugger-socket-overflow.patch | 17 patches/openjdk/rename-execvpe.patch | 42 patches/security/icedtea-6588003.patch | 54 patches/security/icedtea-6656586.patch | 32 patches/security/icedtea-6656610.patch | 30 patches/security/icedtea-6656625.patch | 180 patches/security/icedtea-6657133.patch | 190 patches/security/icedtea-6657619.patch | 11 patches/security/icedtea-6657625.patch | 18 patches/security/icedtea-6657695.patch | 53 patches/security/icedtea-6660049.patch | 630 patches/security/icedtea-6660539.patch | 74 patches/security/icedtea-6736293.patch | 61 patches/security/icedtea-6738524.patch | 42 patches/security/icedtea-6777448.patch | 69 patches/security/icedtea-6777487.patch | 179 patches/security/icedtea-6801071.patch | 175 patches/security/icedtea-6801497.patch | 59 patches/security/icedtea-6813167.patch |168806 ---------- patches/security/icedtea-6823373.patch | 49 patches/security/icedtea-6824440.patch | 265 patches/security/icedtea-6830335.patch | 19 patches/security/icedtea-6845701.patch | 12 ports/hotspot/src/cpu/zero/vm/asm_helper.cpp | 8 ports/hotspot/src/cpu/zero/vm/bytecodes_arm.def | 283 ports/hotspot/src/cpu/zero/vm/bytecodes_zero.cpp | 7 ports/hotspot/src/cpu/zero/vm/bytecodes_zero.hpp | 1 ports/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S | 208 ports/hotspot/src/share/vm/shark/sharkCompiler.cpp | 21 ports/hotspot/src/share/vm/shark/shark_globals.hpp | 9 tapset/hotspot.stp.in | 11 diffs (truncated from 181795 to 500 lines): diff -r 66ad418c7b91 -r 2673464ac328 ChangeLog --- a/ChangeLog Thu Oct 01 11:24:55 2009 +0200 +++ b/ChangeLog Sun Oct 18 21:42:53 2009 +0100 @@ -1,3 +1,183 @@ 2009-10-01 Robert Schuster + + * Makefile.am: + Update to b17 tarball. + +2009-10-02 Andrew John Hughes + + Bump to b17 and use original HotSpot. + * patches/ecj/icedtea-hotspot-default.patch: + Moved to icedtea-hotspot-original.patch. + * patches/hotspot/default/icedtea-6791168.patch, + * patches/hotspot/default/icedtea-bytecodeInterpreter.patch, + * patches/hotspot/default/icedtea-core-build.patch, + * patches/hotspot/default/icedtea-debuginfo.patch, + * patches/hotspot/default/icedtea-format.patch, + * patches/hotspot/default/icedtea-gcc-4.3.patch, + * patches/hotspot/default/icedtea-gcc-stack-markings.patch, + * patches/hotspot/default/icedtea-gcc-suffix.patch, + * patches/hotspot/default/icedtea-headers.patch, + * patches/hotspot/default/icedtea-ignore-unrecognized-options.patch, + * patches/hotspot/default/icedtea-includedb.patch, + * patches/hotspot/default/icedtea-memory-limits.patch, + * patches/hotspot/default/icedtea-no-precompiled.patch, + * patches/hotspot/default/icedtea-params-cast-size_t.patch, + * patches/hotspot/default/icedtea-parisc-opt.patch, + * patches/hotspot/default/icedtea-shark-build.patch, + * patches/hotspot/default/icedtea-shark.patch, + * patches/hotspot/default/icedtea-sparc-buildfixes.patch, + * patches/hotspot/default/icedtea-sparc-ptracefix.patch, + * patches/hotspot/default/icedtea-sparc-trapsfix.patch, + * patches/hotspot/default/icedtea-sparc64-linux.patch, + * patches/hotspot/default/icedtea-static-libstdc++.patch, + * patches/hotspot/default/icedtea-text-relocations.patch, + * patches/hotspot/default/icedtea-use-idx_t.patch, + * patches/hotspot/default/icedtea-version.patch, + * patches/hotspot/default/icedtea-zero-build.patch: + Moved to patches/hotspot/original. + * patches/icedtea-6700047-loopopts.patch, + * patches/icedtea-6712835-ifnode.patch, + * patches/icedtea-6728542-epoll.patch, + * patches/icedtea-alsa-default-device.patch: + Removed, upstream. + * patches/icedtea-ant.patch: Moved to ecj subdirectory. + * patches/icedtea-debuginfo.patch, + * patches/icedtea-float-double-trailing-zeros.patch, + * patches/icedtea-format-warnings.patch, + * patches/icedtea-fortify-source.patch, + * patches/icedtea-graphics.patch, + * patches/icedtea-jar-misc.patch, + * patches/icedtea-java2d-mitre-join.patch, + * patches/icedtea-javac-debuginfo.patch, + * patches/icedtea-jtreg-colortest.patch, + * patches/icedtea-jtreg-layoutextragap.patch, + * patches/icedtea-jtreg-printjob-edgetest-manual.patch, + * patches/icedtea-jtreg-printjob-multiple-end.patch, + * patches/icedtea-lcms-2.patch, + * patches/icedtea-no-bcopy.patch, + * patches/icedtea-override-redirect-metacity.patch, + * patches/icedtea-signed-types-hot6.patch, + * patches/icedtea-simpletimezone-relax.patch, + * patches/icedtea-toolkit.patch, + * patches/openjdk/6648816.patch: + Removed, upstream. + * patches/openjdk/oj100103-debugger-socket-overflow.patch: + Renamed to include Sun bug ID. + * patches/openjdk/rename-execvpe.patch, + * patches/security/icedtea-6588003.patch, + * patches/security/icedtea-6656586.patch, + * patches/security/icedtea-6656610.patch, + * patches/security/icedtea-6656625.patch, + * patches/security/icedtea-6657133.patch, + * patches/security/icedtea-6657619.patch, + * patches/security/icedtea-6657625.patch, + * patches/security/icedtea-6657695.patch, + * patches/security/icedtea-6660049.patch, + * patches/security/icedtea-6660539.patch, + * patches/security/icedtea-6736293.patch, + * patches/security/icedtea-6738524.patch, + * patches/security/icedtea-6777448.patch, + * patches/security/icedtea-6777487.patch, + * patches/security/icedtea-6801071.patch, + * patches/security/icedtea-6801497.patch, + * patches/security/icedtea-6813167.patch, + * patches/security/icedtea-6823373.patch, + * patches/security/icedtea-6824440.patch, + * patches/security/icedtea-6830335.patch, + * patches/security/icedtea-6845701.patch: + Removed, upstream. + * Makefile.am: + Make WITH_ALT_HSBUILD conditionals the default, + set ANT rather than ANT, set DEBUG_CLASSFILES and + DEBUG_BINARIES to true, remove patches no longer + needed in b17. + * acinclude.m4: Use original HotSpot, not a download. + * patches/ecj/icedtea-ant.patch: Moved from patches, + and reduced to just add additional paths for bootstrap. + * patches/ecj/icedtea-hotspot-original.patch: Moved from + icedtea-hotspot-default, original hotspot-original patch removed. + * patches/ecj/icedtea.patch: Recreated. + * patches/hotspot/original/icedtea-6791168.patch, + * patches/hotspot/original/icedtea-bytecodeInterpreter.patch, + * patches/hotspot/original/icedtea-core-build.patch, + * patches/hotspot/original/icedtea-gcc-4.3.patch, + * patches/hotspot/original/icedtea-gcc-stack-markings.patch, + * patches/hotspot/original/icedtea-gcc-suffix.patch, + * patches/hotspot/original/icedtea-headers.patch, + * patches/hotspot/original/icedtea-includedb.patch, + * patches/hotspot/original/icedtea-no-precompiled.patch, + * patches/hotspot/original/icedtea-params-cast-size_t.patch, + * patches/hotspot/original/icedtea-parisc-opt.patch, + * patches/hotspot/original/icedtea-shark-build.patch, + * patches/hotspot/original/icedtea-shark.patch, + * patches/hotspot/original/icedtea-sparc-buildfixes.patch, + * patches/hotspot/original/icedtea-sparc-trapsfix.patch, + * patches/hotspot/original/icedtea-sparc64-linux.patch, + * patches/hotspot/original/icedtea-static-libstdc++.patch, + * patches/hotspot/original/icedtea-text-relocations.patch, + * patches/hotspot/original/icedtea-use-idx_t.patch, + * patches/hotspot/original/icedtea-version.patch, + * patches/hotspot/original/icedtea-zero-build.patch: + Moved from patches/hotspot/default. + * patches/icedtea-disable-cc-incompatible-sanity-checks.patch, + * patches/icedtea-zero-build.patch: Recreated. + * patches/openjdk/6432567-debugger-socket-overflow.patch: + Renamed from oj100013-debugger-socket-overflow.patch. + +2009-10-14 Mark Wielaard + + * configure.ac: When enabling systemtap support check sys/sdt.h + and g++ are recent enough to allow probes in class constructors + and destructors. + * patches/icedtea-systemtap.patch: Enable compiling probes in + jni.cpp. Rewrite SetField and SetStaticField macros + to use DTRACE_PROBE interface directly instead of generating + dtrace implementation calls. Clean up dtrace.hpp. + * tapset/hotspot.stp.in: Enable hotspot.monitor_notify. Fix up + comments. + +2009-10-13 Mark Wielaard + + * tapsets/hotspot.stp.in (hotspot.gc_end): Match gc__end, not begin. + +2009-10-12 Gary Benson + + * ports/hotspot/src/share/vm/shark/shark_globals.hpp: + Removed SharkStartAt, SharkStopAfter and SharkOnlyCompile. + * ports/hotspot/src/share/vm/shark/shark_globals.hpp + (SharkCompiler::compile_method): Likewise. + +2009-10-09 Edward Nevill + + * Added initial support for Shark + ARM asm + +2009-10-09 Edward Nevill + + * Bug fix to irem + * Stop icedtea-debug build falling over in test_gamma + +2009-10-08 Matthias Klose + + * Makefile.am (stamps/icedtea.stamp, stamps/icedtea-debug.stamp): + Add shark aliases to jvm.cfg. + (stamps/add-zero.stamp): Install as shark if default vm is zero. + * configure.ac: Allow shark as additional vm when default vm is zero. + * INSTALL, README: Document new build options. + +2009-10-06 Gary Benson + + * patches/icedtea-s390-serialize.patch: New file. + * Makefile.am: Apply the above. + * HACKING: Document the above. + +2009-10-05 Edward Nevill + + * Support for generation of native libraries for JCK on ARM + * Addition / updating of copyright notices + * Support for building icedteat-debug (incomplete) + * Minor performance optimisations + * Fix to stack overflow checking + 2009-10-01 Robert Schuster * configure.ac: Added --with-cacao-src-dir option. diff -r 66ad418c7b91 -r 2673464ac328 HACKING --- a/HACKING Thu Oct 01 11:24:55 2009 +0200 +++ b/HACKING Sun Oct 18 21:42:53 2009 +0100 @@ -106,6 +106,7 @@ The following patches are currently appl * icedtea-test-atomic-operations.patch: Add check to see if GCC's sync_lock_test works. * icedtea-zero.patch: Generalise architecture support, add ARM and #ifdef out non-zero applicable parts. * icedtea-shark.patch: Add support for the Shark JIT. +* icedtea-s390-serialize.patch: Correctly detect serialization segfaults on s390. The following patches are only applied to OpenJDK6 in IcedTea6: diff -r 66ad418c7b91 -r 2673464ac328 INSTALL --- a/INSTALL Thu Oct 01 11:24:55 2009 +0200 +++ b/INSTALL Sun Oct 18 21:42:53 2009 +0100 @@ -125,10 +125,13 @@ on architectures where only zero (or sha --with-additional-vms=cacao to build the additional VM's. It's not possible to build cacao as the default VM, and zero as additional VM. +To build zero as the default VM and shark as an additional VM, use + --enable-zero --with-additional-vms=shark The additional VM's are available by calling the java with the option -`-cacao' or `-zero' (for shark as well), or by calling the java tools with -`-J-'. +`-cacao', `-zero' or `-shark', or by calling the java tools with +`-J-'. If the build was configured with '--enable-shark', +use `-Xint' to just use the zero VM. Support for different versions of HotSpot ----------------------------------------- diff -r 66ad418c7b91 -r 2673464ac328 Makefile.am --- a/Makefile.am Thu Oct 01 11:24:55 2009 +0200 +++ b/Makefile.am Sun Oct 18 21:42:53 2009 +0100 @@ -1,6 +1,6 @@ OPENJDK_DATE = 24_apr_2009 -OPENJDK_DATE = 24_apr_2009 -OPENJDK_MD5SUM = 850a29b70206bc7fa083cd26acc781f3 -OPENJDK_VERSION = b16 +OPENJDK_DATE = 14_oct_2009 +OPENJDK_MD5SUM = 078fe0ab744c98694decc77f2456c560 +OPENJDK_VERSION = b17 CACAO_VERSION = 0.99.4 CACAO_MD5SUM = c5e6525c5212ddbb6026e4a7cde37ca6 @@ -58,11 +58,7 @@ PULSE_JAVA_CLASS_DIR = PULSE_JAVA_CLASS_DIR = endif -if WITH_ALT_HSBUILD HOTSPOT_MAKE_DIR = make -else -HOTSPOT_MAKE_DIR = build -endif # Top-Level Targets # ================= @@ -163,7 +159,7 @@ ICEDTEA_ENV = \ ICEDTEA_ENV = \ IMPORT_BINARY_PLUGS=true \ ALT_JDK_IMPORT_PATH="$(ICEDTEA_BOOT_DIR)" \ - ANT_HOME="$(SYSTEM_ANT_DIR)" \ + ANT="$(ANT)" \ BUILD_NUMBER="$(OPENJDK_VERSION)" \ JDK_UPDATE_VERSION="$(JDK_UPDATE_VERSION)" \ JRE_RELEASE_VERSION="1.6.0_$(COMBINED_VERSION)" \ @@ -201,7 +197,9 @@ ICEDTEA_ENV = \ JAVA_HOME="" \ JDK_HOME="" \ RHINO_JAR="$(RHINO_JAR)" \ - DISTRIBUTION_ID="$(DIST_ID)" + DISTRIBUTION_ID="$(DIST_ID)" \ + DEBUG_CLASSFILES="true" \ + DEBUG_BINARIES="true" if WITH_CACAO ICEDTEA_ENV += \ @@ -242,7 +240,7 @@ ICEDTEA_ENV_ECJ = \ ICEDTEA_ENV_ECJ = \ IMPORT_BINARY_PLUGS=true \ ALT_JDK_IMPORT_PATH="$(ICEDTEA_BOOT_DIR)" \ - ANT_HOME="$(SYSTEM_ANT_DIR)" \ + ANT="$(ANT)" \ BUILD_NUMBER="$(OPENJDK_VERSION)" \ JDK_UPDATE_VERSION="$(JDK_UPDATE_VERSION)" \ JRE_RELEASE_VERSION="1.6.0_$(COMBINED_VERSION)" \ @@ -286,7 +284,9 @@ ICEDTEA_ENV_ECJ = \ RHINO_JAR="$(RHINO_JAR)" \ JAR_KNOWS_ATFILE="$(JAR_KNOWS_ATFILE)" \ JAR_KNOWS_J_OPTIONS="$(JAR_KNOWS_J_OPTIONS)" \ - JAR_ACCEPTS_STDIN_LIST="$(JAR_ACCEPTS_STDIN_LIST)" + JAR_ACCEPTS_STDIN_LIST="$(JAR_ACCEPTS_STDIN_LIST)" \ + DEBUG_CLASSFILES="true" \ + DEBUG_BINARIES="true" if WITH_CACAO ICEDTEA_ENV_ECJ += \ @@ -504,8 +504,14 @@ ZERO_ASM_BC_ASM_COND = $(shell test -f $ # These options are provided mainly to assist debugging by returning the bytecode interpreter # to a 'vanilla' interpreter. # +if SHARK_BUILD +${ZERO_ASM_BC_ASM}: ${ZERO_ASM_BC_DEF} $(abs_top_srcdir)/mkbc + gcc -E -DDISABLE_NOTICE_SAFEPOINTS - < $< | $(abs_top_srcdir)/mkbc - $@ +else ${ZERO_ASM_BC_ASM}: ${ZERO_ASM_BC_DEF} $(abs_top_srcdir)/mkbc gcc -E - < $< | $(abs_top_srcdir)/mkbc - $@ +endif + # Link ports sources into tree stamps/ports.stamp: stamps/replace-hotspot.stamp @@ -537,19 +543,6 @@ else patches/hotspot/$(HSBUILD)/icedtea-gcc-4.3.patch endif -# Patches needed when not using the newer OpenJDK 7 HotSpot -OLD_HOTSPOT_PATCHES = \ - patches/icedtea-signed-types-hot6.patch \ - patches/icedtea-lucene-crash.patch \ - patches/icedtea-6700047-loopopts.patch \ - patches/icedtea-6712835-ifnode.patch - -if WITH_ALT_HSBUILD - OLD_HOTSPOT_PATCHES_COND = -else - OLD_HOTSPOT_PATCHES_COND = $(OLD_HOTSPOT_PATCHES) -endif - ICEDTEA_FSG_PATCHES = ICEDTEA_PATCHES = \ @@ -560,14 +553,11 @@ ICEDTEA_PATCHES = \ patches/icedtea-zero.patch \ patches/icedtea-ia64-bugfix.patch \ patches/hotspot/$(HSBUILD)/icedtea-parisc-opt.patch \ - $(OLD_HOTSPOT_PATCHES_COND) \ + patches/icedtea-lucene-crash.patch \ patches/icedtea-version.patch \ patches/hotspot/$(HSBUILD)/icedtea-version.patch \ patches/icedtea-copy-plugs.patch \ patches/hotspot/$(HSBUILD)/icedtea-text-relocations.patch \ - patches/icedtea-graphics.patch \ - patches/icedtea-debuginfo.patch \ - patches/hotspot/$(HSBUILD)/icedtea-debuginfo.patch \ patches/icedtea-ssl.patch \ $(PLUGIN_PATCH) \ patches/icedtea-webstart.patch \ @@ -576,15 +566,12 @@ ICEDTEA_PATCHES = \ patches/icedtea-tools.patch \ patches/icedtea-timezone.patch \ patches/icedtea-timezone-default-permission.patch \ - patches/icedtea-simpletimezone-relax.patch \ patches/icedtea-use-system-tzdata.patch \ patches/icedtea-headers.patch \ patches/hotspot/$(HSBUILD)/icedtea-headers.patch \ - patches/icedtea-ant.patch \ patches/icedtea-gcc-suffix.patch \ patches/hotspot/$(HSBUILD)/icedtea-gcc-suffix.patch \ patches/icedtea-bytebuffer-compact.patch \ - patches/icedtea-float-double-trailing-zeros.patch \ patches/hotspot/$(HSBUILD)/icedtea-memory-limits.patch \ patches/icedtea-sunsrc.patch \ patches/icedtea-libraries.patch \ @@ -592,7 +579,6 @@ ICEDTEA_PATCHES = \ patches/icedtea-core-build.patch \ patches/icedtea-jvmtiEnv.patch \ patches/icedtea-lcms.patch \ - patches/icedtea-lcms-2.patch \ patches/hotspot/$(HSBUILD)/icedtea-core-build.patch \ patches/icedtea-linker-options.patch \ patches/hotspot/$(HSBUILD)/icedtea-static-libstdc++.patch \ @@ -606,11 +592,8 @@ ICEDTEA_PATCHES = \ patches/icedtea-ia64-fdlibm.patch \ patches/icedtea-freetypeversion.patch \ patches/icedtea-fonts.patch \ - patches/icedtea-override-redirect-metacity.patch \ - patches/icedtea-no-bcopy.patch \ patches/icedtea-shark-build.patch \ patches/hotspot/$(HSBUILD)/icedtea-shark-build.patch \ - patches/icedtea-toolkit.patch \ patches/icedtea-jdk-docs-target.patch \ patches/icedtea-nomotif-6706121.patch \ patches/icedtea-nomotif.patch \ @@ -625,62 +608,22 @@ ICEDTEA_PATCHES = \ patches/icedtea-arch.patch \ patches/icedtea-lc_ctype.patch \ patches/icedtea-messageutils.patch \ - patches/icedtea-javac-debuginfo.patch \ patches/icedtea-xjc.patch \ patches/icedtea-renderer-crossing.patch \ patches/icedtea-stroker-finish.patch \ - patches/icedtea-alsa-default-device.patch \ patches/icedtea-linker-libs-order.patch \ patches/icedtea-f2i-overflow.patch \ patches/icedtea-6761856-freetypescaler.patch \ patches/icedtea-testenv.patch \ patches/icedtea-samejvm-safe.patch \ - pat